upnp: remove m_server_list_lock, p_server_list is already protected by s_lock
[vlc.git] / modules / video_filter / transform.c
index 12949a5..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
- * $Id$
+ * 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.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -45,10 +45,12 @@ static void Close(vlc_object_t *);
 #define CFG_PREFIX "transform-"
 
 #define TYPE_TEXT N_("Transform type")
-static const char * const type_list[] = { "90", "180", "270", "hflip", "vflip" };
+static const char * const type_list[] = { "90", "180", "270",
+    "hflip", "vflip", "transpose", "antitranspose" };
 static const char * const type_list_text[] = { N_("Rotate by 90 degrees"),
-  N_("Rotate by 180 degrees"), N_("Rotate by 270 degrees"),
-  N_("Flip horizontally"), N_("Flip vertically") };
+    N_("Rotate by 180 degrees"), N_("Rotate by 270 degrees"),
+    N_("Flip horizontally"), N_("Flip vertically"),
+    N_("Transpose"), N_("Anti-transpose") };
 
 vlc_module_begin()
     set_description(N_("Video transformation filter"))
@@ -59,7 +61,8 @@ vlc_module_begin()
     set_subcategory(SUBCAT_VIDEO_VFILTER)
 
     add_string(CFG_PREFIX "type", "90", TYPE_TEXT, TYPE_TEXT, false)
-        change_string_list(type_list, type_list_text, 0)
+        change_string_list(type_list, type_list_text)
+        change_safe()
 
     add_shortcut("transform")
     set_callbacks(Open, Close)
@@ -80,6 +83,17 @@ static void VFlip(int *sx, int *sy, int w, int h, int dx, int dy)
     *sx = dx;
     *sy = h - 1 - dy;
 }
+static void Transpose(int *sx, int *sy, int w, int h, int dx, int dy)
+{
+    VLC_UNUSED( h ); VLC_UNUSED( w );
+    *sx = dy;
+    *sy = dx;
+}
+static void AntiTranspose(int *sx, int *sy, int w, int h, int dx, int dy)
+{
+    *sx = h - 1 - dy;
+    *sy = w - 1 - dx;
+}
 static void R90(int *sx, int *sy, int w, int h, int dx, int dy)
 {
     VLC_UNUSED( h );
@@ -88,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)
 {
@@ -99,88 +113,155 @@ static void R270(int *sx, int *sy, int w, int h, int dx, int dy)
 }
 typedef void (*convert_t)(int *, int *, int, int, int, int);
 
-#define PLANAR(f) \
-static void Plane8_##f(plane_t *restrict dst, const plane_t *restrict src) \
+#define PLANE(f,bits) \
+static void Plane##bits##_##f(plane_t *restrict dst, const plane_t *restrict src) \
 { \
+    const uint##bits##_t *src_pixels = (const void *)src->p_pixels; \
+    uint##bits##_t *restrict dst_pixels = (void *)dst->p_pixels; \
+    const unsigned src_width = src->i_pitch / sizeof (*src_pixels); \
+    const unsigned dst_width = dst->i_pitch / sizeof (*dst_pixels); \
+    const unsigned dst_visible_width = dst->i_visible_pitch / sizeof (*dst_pixels); \
+ \
     for (int y = 0; y < dst->i_visible_lines; y++) { \
-        for (int x = 0; x < dst->i_visible_pitch; x++) { \
+        for (unsigned x = 0; x < dst_visible_width; x++) { \
             int sx, sy; \
-            (f)(&sx, &sy, dst->i_visible_pitch, dst->i_visible_lines, x, y); \
-            dst->p_pixels[y * dst->i_pitch + x] = \
-                src->p_pixels[sy * src->i_pitch + sx]; \
+            (f)(&sx, &sy, dst_visible_width, dst->i_visible_lines, x, y); \
+            dst_pixels[y * dst_width + x] = \
+                src_pixels[sy * src_width + sx]; \
         } \
     } \
-} \
- \
-static void Plane16_##f(plane_t *restrict dst, const plane_t *restrict src) \
+}
+
+static void Plane_VFlip(plane_t *restrict dst, const plane_t *restrict src)
+{
+    const uint8_t *src_pixels = src->p_pixels;
+    uint8_t *restrict dst_pixels = dst->p_pixels;
+
+    dst_pixels += dst->i_pitch * dst->i_visible_lines;
+    for (int y = 0; y < dst->i_visible_lines; y++) {
+        dst_pixels -= dst->i_pitch;
+        memcpy(dst_pixels, src_pixels, dst->i_visible_pitch);
+        src_pixels += src->i_pitch;
+    }
+}
+
+#define I422(f) \
+static void Plane422_##f(plane_t *restrict dst, const plane_t *restrict src) \
 { \
-    const uint16_t *src_pixels = (const uint16_t *)src->p_pixels; \
-    uint16_t *restrict dst_pixels = (uint16_t *)dst->p_pixels; \
-    unsigned src_pitch = src->i_pitch / 2; \
-    unsigned dst_pitch = dst->i_pitch / 2; \
-    unsigned dst_visible_width = dst->i_visible_pitch / 2; \
- \
-    for (int y = 0; y < dst->i_visible_lines; y++) { \
-        for (unsigned x = 0; x < dst_visible_width; x++) { \
-            int sx, sy; \
-            (f)(&sx, &sy, dst_visible_width, dst->i_visible_lines, x, y);\
-            dst_pixels[y * dst_pitch + x] = \
-                src_pixels[sy * src_pitch + sx]; \
+    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; \
         } \
     } \
-} \
- \
-static void Plane32_##f(plane_t *restrict dst, const plane_t *restrict src) \
+}
+
+#define YUY2(f) \
+static void PlaneYUY2_##f(plane_t *restrict dst, const plane_t *restrict src) \
 { \
-    const uint32_t *src_pixels = (const uint32_t *)src->p_pixels; \
-    uint32_t *restrict dst_pixels = (uint32_t *)dst->p_pixels; \
-    unsigned src_pitch = src->i_pitch / 4; \
-    unsigned dst_pitch = dst->i_pitch / 4; \
-    unsigned dst_visible_width = dst->i_visible_pitch / 4; \
+    unsigned dst_visible_width = dst->i_visible_pitch / 2; \
  \
-    for (int y = 0; y < dst->i_visible_lines; y++) { \
-        for (unsigned x = 0; x < dst_visible_width; x++) { \
-            int sx, sy; \
-            (f)(&sx, &sy, dst_visible_width, dst->i_visible_lines, x, y);\
-            dst_pixels[y * dst_pitch + x] = \
-                src_pixels[sy * src_pitch + sx]; \
+    for (int y = 0; y < dst->i_visible_lines; y += 2) { \
+        for (unsigned x = 0; x < dst_visible_width; x+= 2) { \
+            int sx0, sy0, sx1, sy1; \
+            (f)(&sx0, &sy0, dst_visible_width, dst->i_visible_lines, x, y); \
+            (f)(&sx1, &sy1, dst_visible_width, dst->i_visible_lines, \
+                x + 1, y + 1); \
+            dst->p_pixels[(y + 0) * dst->i_pitch + 2 * (x + 0)] = \
+                src->p_pixels[sy0 * src->i_pitch + 2 * sx0]; \
+            dst->p_pixels[(y + 0) * dst->i_pitch + 2 * (x + 1)] = \
+                src->p_pixels[sy1 * src->i_pitch + 2 * sx0]; \
+            dst->p_pixels[(y + 1) * dst->i_pitch + 2 * (x + 0)] = \
+                src->p_pixels[sy0 * src->i_pitch + 2 * sx1]; \
+            dst->p_pixels[(y + 1) * dst->i_pitch + 2 * (x + 1)] = \
+                src->p_pixels[sy1 * src->i_pitch + 2 * sx1]; \
+ \
+            int sx, sy, u, v; \
+            (f)(&sx, &sy, dst_visible_width / 2, dst->i_visible_lines / 2, \
+                x / 2, y / 2); \
+            u = (1 + src->p_pixels[2 * sy * src->i_pitch + 4 * sx + 1] + \
+                src->p_pixels[(2 * sy + 1) * src->i_pitch + 4 * sx + 1]) / 2; \
+            v = (1 + src->p_pixels[2 * sy * src->i_pitch + 4 * sx + 3] + \
+                src->p_pixels[(2 * sy + 1) * src->i_pitch + 4 * sx + 3]) / 2; \
+            dst->p_pixels[(y + 0) * dst->i_pitch + 2 * x + 1] = u; \
+            dst->p_pixels[(y + 0) * dst->i_pitch + 2 * x + 3] = v; \
+            dst->p_pixels[(y + 1) * dst->i_pitch + 2 * x + 1] = u; \
+            dst->p_pixels[(y + 1) * dst->i_pitch + 2 * x + 3] = v; \
         } \
     } \
 }
 
-PLANAR(HFlip)
-PLANAR(VFlip)
-PLANAR(R90)
-PLANAR(R180)
-PLANAR(R270)
+#define PLANES(f) \
+PLANE(f,8) PLANE(f,16) PLANE(f,32)
+
+PLANES(HFlip)
+#define Plane8_VFlip Plane_VFlip
+#define Plane16_VFlip Plane_VFlip
+#define Plane32_VFlip Plane_VFlip
+PLANES(Transpose)
+PLANES(AntiTranspose)
+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
+YUY2(Transpose)
+YUY2(AntiTranspose)
+YUY2(R90)
+YUY2(R270)
 
 typedef struct {
-    char      name[8];
-    bool      is_rotated;
+    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, rotated, f, invf) \
-    { str, rotated, f, invf, Plane8_##f, Plane16_##f, Plane32_##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",    true,  R90,   R270),
-    DESC("180",   false, R180,  R180),
-    DESC("270",   true,  R270,  R90),
-    DESC("hflip", false, HFlip, HFlip),
-    DESC("vflip", false, VFlip, VFlip),
+    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)
+{
+    return dsc->plane32 != dsc->yuyv;
+}
+
 static const size_t n_transforms =
     sizeof (descriptions) / sizeof (descriptions[0]);
 
 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;
 };
 
@@ -196,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);
@@ -235,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;
 
@@ -253,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)",
@@ -267,59 +354,81 @@ 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) {
-        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;
+
+    if (dsc_is_rotated(dsc)) {
+        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 */
     switch (src->i_chroma) {
-        case VLC_CODEC_YUYV:
         case VLC_CODEC_UYVY:
-        case VLC_CODEC_YVYU:
         case VLC_CODEC_VYUY:
-            if (dsc->is_rotated) {
+            if (dsc_is_rotated(dsc)) {
                 msg_Err(filter, "Format rotation not possible (chroma %4.4s)",
                         (char *)&src->i_chroma);
                 goto error;
             }
-            sys->plane = dsc->plane32; /* 32-bits, not 16-bits! */
+            /* fallthrough */
+        case VLC_CODEC_YUYV:
+        case VLC_CODEC_YVYU:
+            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;
@@ -336,329 +445,3 @@ static void Close(vlc_object_t *object)
 
     free(sys);
 }
-
-#if 0
-static void FilterI422( vout_thread_t *p_vout,
-                        const picture_t *p_pic, picture_t *p_outpic )
-{
-    int i_index;
-    switch( p_vout->p_sys->i_mode )
-    {
-        case TRANSFORM_MODE_180:
-        case TRANSFORM_MODE_HFLIP:
-        case TRANSFORM_MODE_VFLIP:
-            /* Fall back on the default implementation */
-            FilterPlanar( p_vout, p_pic, p_outpic );
-            return;
-
-        case TRANSFORM_MODE_90:
-            for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ )
-            {
-                int i_pitch = p_pic->p[i_index].i_pitch;
-
-                uint8_t *p_in = p_pic->p[i_index].p_pixels;
-
-                uint8_t *p_out = p_outpic->p[i_index].p_pixels;
-                uint8_t *p_out_end = p_out +
-                    p_outpic->p[i_index].i_visible_lines *
-                    p_outpic->p[i_index].i_pitch;
-
-                if( i_index == 0 )
-                {
-                    for( ; p_out < p_out_end ; )
-                    {
-                        uint8_t *p_line_end;
-
-                        p_out_end -= p_outpic->p[i_index].i_pitch
-                                      - p_outpic->p[i_index].i_visible_pitch;
-                        p_line_end = p_in + p_pic->p[i_index].i_visible_lines *
-                            i_pitch;
-
-                        for( ; p_in < p_line_end ; )
-                        {
-                            p_line_end -= i_pitch;
-                            *(--p_out_end) = *p_line_end;
-                        }
-
-                        p_in++;
-                    }
-                }
-                else /* i_index == 1 or 2 */
-                {
-                    for( ; p_out < p_out_end ; )
-                    {
-                        uint8_t *p_line_end, *p_out_end2;
-
-                        p_out_end -= p_outpic->p[i_index].i_pitch
-                                      - p_outpic->p[i_index].i_visible_pitch;
-                        p_out_end2 = p_out_end - p_outpic->p[i_index].i_pitch;
-                        p_line_end = p_in + p_pic->p[i_index].i_visible_lines *
-                            i_pitch;
-
-                        for( ; p_in < p_line_end ; )
-                        {
-                            uint8_t p1, p2;
-
-                            p_line_end -= i_pitch;
-                            p1 = *p_line_end;
-                            p_line_end -= i_pitch;
-                            p2 = *p_line_end;
-
-                            /* Trick for (x+y)/2 without overflow, based on
-                             *   x + y == (x ^ y) + 2 * (x & y) */
-                            *(--p_out_end) = (p1 & p2) + ((p1 ^ p2) / 2);
-                            *(--p_out_end2) = (p1 & p2) + ((p1 ^ p2) / 2);
-                        }
-
-                        p_out_end = p_out_end2;
-                        p_in++;
-                    }
-                }
-            }
-            break;
-
-        case TRANSFORM_MODE_270:
-            for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ )
-            {
-                int i_pitch = p_pic->p[i_index].i_pitch;
-
-                uint8_t *p_in = p_pic->p[i_index].p_pixels;
-
-                uint8_t *p_out = p_outpic->p[i_index].p_pixels;
-                uint8_t *p_out_end = p_out +
-                    p_outpic->p[i_index].i_visible_lines *
-                    p_outpic->p[i_index].i_pitch;
-
-                if( i_index == 0 )
-                {
-                    for( ; p_out < p_out_end ; )
-                    {
-                        uint8_t *p_in_end;
-
-                        p_in_end = p_in + p_pic->p[i_index].i_visible_lines *
-                            i_pitch;
-
-                        for( ; p_in < p_in_end ; )
-                        {
-                            p_in_end -= i_pitch;
-                            *p_out++ = *p_in_end;
-                        }
-
-                        p_out += p_outpic->p[i_index].i_pitch
-                                  - p_outpic->p[i_index].i_visible_pitch;
-                        p_in++;
-                    }
-                }
-                else /* i_index == 1 or 2 */
-                {
-                    for( ; p_out < p_out_end ; )
-                    {
-                        uint8_t *p_in_end, *p_out2;
-
-                        p_in_end = p_in + p_pic->p[i_index].i_visible_lines *
-                            i_pitch;
-                        p_out2 = p_out + p_outpic->p[i_index].i_pitch;
-
-                        for( ; p_in < p_in_end ; )
-                        {
-                            uint8_t p1, p2;
-
-                            p_in_end -= i_pitch;
-                            p1 = *p_in_end;
-                            p_in_end -= i_pitch;
-                            p2 = *p_in_end;
-
-                            /* Trick for (x+y)/2 without overflow, based on
-                             *   x + y == (x ^ y) + 2 * (x & y) */
-                            *p_out++ = (p1 & p2) + ((p1 ^ p2) / 2);
-                            *p_out2++ = (p1 & p2) + ((p1 ^ p2) / 2);
-                        }
-
-                        p_out2 += p_outpic->p[i_index].i_pitch
-                                   - p_outpic->p[i_index].i_visible_pitch;
-                        p_out = p_out2;
-                        p_in++;
-                    }
-                }
-            }
-            break;
-
-        default:
-            break;
-    }
-}
-
-static void FilterYUYV( vout_thread_t *p_vout,
-                        const picture_t *p_pic, picture_t *p_outpic )
-{
-    int i_index;
-    int i_y_offset, i_u_offset, i_v_offset;
-    if( GetPackedYuvOffsets( p_pic->format.i_chroma, &i_y_offset,
-                             &i_u_offset, &i_v_offset ) != VLC_SUCCESS )
-        return;
-
-    switch( p_vout->p_sys->i_mode )
-    {
-        case TRANSFORM_MODE_VFLIP:
-            /* Fall back on the default implementation */
-            FilterPlanar( p_vout, p_pic, p_outpic );
-            return;
-
-        case TRANSFORM_MODE_90:
-            for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ )
-            {
-                int i_pitch = p_pic->p[i_index].i_pitch;
-
-                uint8_t *p_in = p_pic->p[i_index].p_pixels;
-
-                uint8_t *p_out = p_outpic->p[i_index].p_pixels;
-                uint8_t *p_out_end = p_out +
-                    p_outpic->p[i_index].i_visible_lines *
-                    p_outpic->p[i_index].i_pitch;
-
-                int i_offset  = i_u_offset;
-                int i_offset2 = i_v_offset;
-                for( ; p_out < p_out_end ; )
-                {
-                    uint8_t *p_line_end;
-
-                    p_out_end -= p_outpic->p[i_index].i_pitch
-                                  - p_outpic->p[i_index].i_visible_pitch;
-                    p_line_end = p_in + p_pic->p[i_index].i_visible_lines *
-                        i_pitch;
-
-                    for( ; p_in < p_line_end ; )
-                    {
-                        p_line_end -= i_pitch;
-                        p_out_end -= 4;
-                        p_out_end[i_y_offset+2] = p_line_end[i_y_offset];
-                        p_out_end[i_u_offset] = p_line_end[i_offset];
-                        p_line_end -= i_pitch;
-                        p_out_end[i_y_offset] = p_line_end[i_y_offset];
-                        p_out_end[i_v_offset] = p_line_end[i_offset2];
-                    }
-
-                    p_in += 2;
-
-                    {
-                        int a = i_offset;
-                        i_offset = i_offset2;
-                        i_offset2 = a;
-                    }
-                }
-            }
-            break;
-
-        case TRANSFORM_MODE_180:
-            for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ )
-            {
-                uint8_t *p_in = p_pic->p[i_index].p_pixels;
-                uint8_t *p_in_end = p_in + p_pic->p[i_index].i_visible_lines
-                                            * p_pic->p[i_index].i_pitch;
-
-                uint8_t *p_out = p_outpic->p[i_index].p_pixels;
-
-                for( ; p_in < p_in_end ; )
-                {
-                    uint8_t *p_line_start = p_in_end
-                                             - p_pic->p[i_index].i_pitch;
-                    p_in_end -= p_pic->p[i_index].i_pitch
-                                 - p_pic->p[i_index].i_visible_pitch;
-
-                    for( ; p_line_start < p_in_end ; )
-                    {
-                        p_in_end -= 4;
-                        p_out[i_y_offset] = p_in_end[i_y_offset+2];
-                        p_out[i_u_offset] = p_in_end[i_u_offset];
-                        p_out[i_y_offset+2] = p_in_end[i_y_offset];
-                        p_out[i_v_offset] = p_in_end[i_v_offset];
-                        p_out += 4;
-                    }
-
-                    p_out += p_outpic->p[i_index].i_pitch
-                              - p_outpic->p[i_index].i_visible_pitch;
-                }
-            }
-            break;
-
-        case TRANSFORM_MODE_270:
-            for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ )
-            {
-                int i_pitch = p_pic->p[i_index].i_pitch;
-
-                uint8_t *p_in = p_pic->p[i_index].p_pixels;
-
-                uint8_t *p_out = p_outpic->p[i_index].p_pixels;
-                uint8_t *p_out_end = p_out +
-                    p_outpic->p[i_index].i_visible_lines *
-                    p_outpic->p[i_index].i_pitch;
-
-                int i_offset  = i_u_offset;
-                int i_offset2 = i_v_offset;
-                for( ; p_out < p_out_end ; )
-                {
-                    uint8_t *p_in_end;
-
-                    p_in_end = p_in
-                             + p_pic->p[i_index].i_visible_lines * i_pitch;
-
-                    for( ; p_in < p_in_end ; )
-                    {
-                        p_in_end -= i_pitch;
-                        p_out[i_y_offset] = p_in_end[i_y_offset];
-                        p_out[i_u_offset] = p_in_end[i_offset];
-                        p_in_end -= i_pitch;
-                        p_out[i_y_offset+2] = p_in_end[i_y_offset];
-                        p_out[i_v_offset] = p_in_end[i_offset2];
-                        p_out += 4;
-                    }
-
-                    p_out += p_outpic->p[i_index].i_pitch
-                           - p_outpic->p[i_index].i_visible_pitch;
-                    p_in += 2;
-
-                    {
-                        int a = i_offset;
-                        i_offset = i_offset2;
-                        i_offset2 = a;
-                    }
-                }
-            }
-            break;
-
-        case TRANSFORM_MODE_HFLIP:
-            for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ )
-            {
-                uint8_t *p_in = p_pic->p[i_index].p_pixels;
-                uint8_t *p_in_end = p_in + p_pic->p[i_index].i_visible_lines
-                                         * p_pic->p[i_index].i_pitch;
-
-                uint8_t *p_out = p_outpic->p[i_index].p_pixels;
-
-                for( ; p_in < p_in_end ; )
-                {
-                    uint8_t *p_line_end = p_in
-                                        + p_pic->p[i_index].i_visible_pitch;
-
-                    for( ; p_in < p_line_end ; )
-                    {
-                        p_line_end -= 4;
-                        p_out[i_y_offset] = p_line_end[i_y_offset+2];
-                        p_out[i_u_offset] = p_line_end[i_u_offset];
-                        p_out[i_y_offset+2] = p_line_end[i_y_offset];
-                        p_out[i_v_offset] = p_line_end[i_v_offset];
-                        p_out += 4;
-                    }
-
-                    p_in += p_pic->p[i_index].i_pitch;
-                    p_out += p_outpic->p[i_index].i_pitch
-                                - p_outpic->p[i_index].i_visible_pitch;
-                }
-            }
-            break;
-
-        default:
-            break;
-    }
-}
-#endif