upnp: remove m_server_list_lock, p_server_list is already protected by s_lock
[vlc.git] / modules / video_filter / transform.c
index 5c2f1d1..cec6ebd 100644 (file)
@@ -1,26 +1,26 @@
 /*****************************************************************************
  * transform.c : transform image module for vlc
  *****************************************************************************
- * Copyright (C) 2000-2006 the VideoLAN team
+ * Copyright (C) 2000-2006 VLC authors and VideoLAN
  * Copyright (C) 2010 Laurent Aimar
  * Copyright (C) 2012 RĂ©mi Denis-Courmont
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -102,8 +102,8 @@ static void R90(int *sx, int *sy, int w, int h, int dx, int dy)
 }
 static void R180(int *sx, int *sy, int w, int h, int dx, int dy)
 {
-    *sx = w - dx;
-    *sy = h - dy;
+    *sx = w - 1 - dx;
+    *sy = h - 1 - dy;
 }
 static void R270(int *sx, int *sy, int w, int h, int dx, int dy)
 {
@@ -145,6 +145,22 @@ static void Plane_VFlip(plane_t *restrict dst, const plane_t *restrict src)
     }
 }
 
+#define I422(f) \
+static void Plane422_##f(plane_t *restrict dst, const plane_t *restrict src) \
+{ \
+    for (int y = 0; y < dst->i_visible_lines; y += 2) { \
+        for (int x = 0; x < dst->i_visible_pitch; x++) { \
+            int sx, sy, uv; \
+            (f)(&sx, &sy, dst->i_visible_pitch, dst->i_visible_lines / 2, \
+                x, y / 2); \
+            uv = (1 + src->p_pixels[2 * sy * src->i_pitch + sx] + \
+                src->p_pixels[(2 * sy + 1) * src->i_pitch + sx]) / 2; \
+            dst->p_pixels[y * dst->i_pitch + x] = uv; \
+            dst->p_pixels[(y + 1) * dst->i_pitch + x] = uv; \
+        } \
+    } \
+}
+
 #define YUY2(f) \
 static void PlaneYUY2_##f(plane_t *restrict dst, const plane_t *restrict src) \
 { \
@@ -193,6 +209,14 @@ PLANES(R90)
 PLANES(R180)
 PLANES(R270)
 
+#define Plane422_HFlip Plane16_HFlip
+#define Plane422_VFlip Plane_VFlip
+#define Plane422_R180  Plane16_R180
+I422(Transpose)
+I422(AntiTranspose)
+I422(R90)
+I422(R270)
+
 #define PlaneYUY2_HFlip Plane32_HFlip
 #define PlaneYUY2_VFlip Plane_VFlip
 #define PlaneYUY2_R180  Plane32_R180
@@ -205,23 +229,26 @@ typedef struct {
     char      name[16];
     convert_t convert;
     convert_t iconvert;
+    video_transform_t operation;
     void      (*plane8) (plane_t *dst, const plane_t *src);
     void      (*plane16)(plane_t *dst, const plane_t *src);
     void      (*plane32)(plane_t *dst, const plane_t *src);
+    void      (*i422)(plane_t *dst, const plane_t *src);
     void      (*yuyv)(plane_t *dst, const plane_t *src);
 } transform_description_t;
 
-#define DESC(str, f, invf) \
-    { str, f, invf, Plane8_##f, Plane16_##f, Plane32_##f, PlaneYUY2_##f }
+#define DESC(str, f, invf, op) \
+    { str, f, invf, op, Plane8_##f, Plane16_##f, Plane32_##f, \
+      Plane422_##f, PlaneYUY2_##f }
 
 static const transform_description_t descriptions[] = {
-    DESC("90",            R90,           R270),
-    DESC("180",           R180,          R180),
-    DESC("270",           R270,          R90),
-    DESC("hflip",         HFlip,         HFlip),
-    DESC("vflip",         VFlip,         VFlip),
-    DESC("transpose",     Transpose,     Transpose),
-    DESC("antitranspose", AntiTranspose, AntiTranspose),
+    DESC("90",            R90,           R270,          TRANSFORM_R90),
+    DESC("180",           R180,          R180,          TRANSFORM_R180),
+    DESC("270",           R270,          R90,           TRANSFORM_R270),
+    DESC("hflip",         HFlip,         HFlip,         TRANSFORM_HFLIP),
+    DESC("vflip",         VFlip,         VFlip,         TRANSFORM_VFLIP),
+    DESC("transpose",     Transpose,     Transpose,     TRANSFORM_TRANSPOSE),
+    DESC("antitranspose", AntiTranspose, AntiTranspose, TRANSFORM_ANTI_TRANSPOSE),
 };
 
 static bool dsc_is_rotated(const transform_description_t *dsc)
@@ -234,7 +261,7 @@ static const size_t n_transforms =
 
 struct filter_sys_t {
     const vlc_chroma_description_t *chroma;
-    void (*plane)(plane_t *, const plane_t *);
+    void (*plane[PICTURE_PLANE_MAX])(plane_t *, const plane_t *);
     convert_t convert;
 };
 
@@ -250,7 +277,7 @@ static picture_t *Filter(filter_t *filter, picture_t *src)
 
     const vlc_chroma_description_t *chroma = sys->chroma;
     for (unsigned i = 0; i < chroma->plane_count; i++)
-         sys->plane(&dst->p[i], &src->p[i]);
+         (sys->plane[i])(&dst->p[i], &src->p[i]);
 
     picture_CopyProperties(dst, src);
     picture_Release(src);
@@ -289,6 +316,12 @@ static int Open(vlc_object_t *object)
 
     sys->chroma = chroma;
 
+    static const char *const ppsz_filter_options[] = {
+        "type", NULL
+    };
+
+    config_ChainParse(filter, CFG_PREFIX, ppsz_filter_options,
+                      filter->p_cfg);
     char *type_name = var_InheritString(filter, CFG_PREFIX"type");
     const transform_description_t *dsc = NULL;
 
@@ -307,13 +340,13 @@ static int Open(vlc_object_t *object)
 
     switch (chroma->pixel_size) {
         case 1:
-            sys->plane = dsc->plane8;
+            sys->plane[0] = dsc->plane8;
             break;
         case 2:
-            sys->plane = dsc->plane16;
+            sys->plane[0] = dsc->plane16;
             break;
         case 4:
-            sys->plane = dsc->plane32;
+            sys->plane[0] = dsc->plane32;
             break;
         default:
             msg_Err(filter, "Unsupported pixel size %u (chroma %4.4s)",
@@ -321,28 +354,60 @@ static int Open(vlc_object_t *object)
             goto error;
     }
 
+    for (unsigned i = 1; i < PICTURE_PLANE_MAX; i++)
+        sys->plane[i] = sys->plane[0];
     sys->convert = dsc->convert;
+
     if (dsc_is_rotated(dsc)) {
-        for (unsigned i = 0; i < chroma->plane_count; i++) {
-            if (chroma->p[i].w.num * chroma->p[i].h.den
-             != chroma->p[i].h.num * chroma->p[i].w.den) {
-                msg_Err(filter, "Format rotation not possible (chroma %4.4s)",
-                        (char *)&src->i_chroma); /* I422... */
-                goto error;
+        switch (src->i_chroma) {
+            case VLC_CODEC_I422:
+            case VLC_CODEC_J422:
+                sys->plane[2] = sys->plane[1] = dsc->i422;
+                break;
+            default:
+                for (unsigned i = 0; i < chroma->plane_count; i++) {
+                    if (chroma->p[i].w.num * chroma->p[i].h.den
+                     != chroma->p[i].h.num * chroma->p[i].w.den) {
+                        msg_Err(filter, "Format rotation not possible "
+                                "(chroma %4.4s)", (char *)&src->i_chroma);
+                        goto error;
+                    }
             }
         }
+    }
+
+    /*
+     * Note: we neither compare nor set dst->orientation,
+     * the caller needs to do it manually (user might want
+     * to transform video without changing the orientation).
+     */
+
+    video_format_t src_trans = *src;
+    video_format_TransformBy(&src_trans, dsc->operation);
+
+    if (!filter->b_allow_fmt_out_change &&
+        (dst->i_width          != src_trans.i_width ||
+         dst->i_visible_width  != src_trans.i_visible_width ||
+         dst->i_height         != src_trans.i_height ||
+         dst->i_visible_height != src_trans.i_visible_height ||
+         dst->i_sar_num        != src_trans.i_sar_num ||
+         dst->i_sar_den        != src_trans.i_sar_den ||
+         dst->i_x_offset       != src_trans.i_x_offset ||
+         dst->i_y_offset       != src_trans.i_y_offset)) {
 
-        if (!filter->b_allow_fmt_out_change) {
             msg_Err(filter, "Format change is not allowed");
             goto error;
-        }
-
-        dst->i_width          = src->i_height;
-        dst->i_visible_width  = src->i_visible_height;
-        dst->i_height         = src->i_width;
-        dst->i_visible_height = src->i_visible_width;
-        dst->i_sar_num        = src->i_sar_den;
-        dst->i_sar_den        = src->i_sar_num;
+    }
+    else if(filter->b_allow_fmt_out_change) {
+
+        dst->i_width          = src_trans.i_width;
+        dst->i_visible_width  = src_trans.i_visible_width;
+        dst->i_height         = src_trans.i_height;
+        dst->i_visible_height = src_trans.i_visible_height;
+        dst->i_sar_num        = src_trans.i_sar_num;
+        dst->i_sar_den        = src_trans.i_sar_den;
+        dst->i_x_offset       = src_trans.i_x_offset;
+        dst->i_y_offset       = src_trans.i_y_offset;
     }
 
     /* Deal with weird packed formats */
@@ -357,24 +422,13 @@ static int Open(vlc_object_t *object)
             /* fallthrough */
         case VLC_CODEC_YUYV:
         case VLC_CODEC_YVYU:
-            sys->plane = dsc->yuyv; /* 32-bits, not 16-bits! */
+            sys->plane[0] = dsc->yuyv; /* 32-bits, not 16-bits! */
             break;
         case VLC_CODEC_NV12:
         case VLC_CODEC_NV21:
             goto error;
     }
 
-    dst->i_x_offset       = INT_MAX;
-    dst->i_y_offset       = INT_MAX;
-    for (int i = 0; i < 2; i++) {
-        int tx, ty;
-        dsc->iconvert(&tx, &ty, src->i_width, src->i_height,
-                      src->i_x_offset + i * (src->i_visible_width  - 1),
-                      src->i_y_offset + i * (src->i_visible_height - 1));
-        dst->i_x_offset = __MIN(dst->i_x_offset, (unsigned)(1 + tx));
-        dst->i_y_offset = __MIN(dst->i_y_offset, (unsigned)(1 + ty));
-    }
-
     filter->p_sys           = sys;
     filter->pf_video_filter = Filter;
     filter->pf_video_mouse  = Mouse;