[vlc-commits] transform: special cases for packed YUV

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Mar 17 20:39:11 2012 +0200| [de0bf007ea2fee4a6062a0616e0ca77dae50e3a7] | committer: Rémi Denis-Courmont

transform: special cases for packed YUV

This fixes the smurf effect on YUY2. Unsupported quarter rotations are
black-listed.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=de0bf007ea2fee4a6062a0616e0ca77dae50e3a7
---

 modules/video_filter/transform.c |   45 +++++++++++++++++++++++--------------
 1 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/modules/video_filter/transform.c b/modules/video_filter/transform.c
index be055c3..12949a5 100644
--- a/modules/video_filter/transform.c
+++ b/modules/video_filter/transform.c
@@ -218,19 +218,6 @@ static int Mouse(filter_t *filter, vlc_mouse_t *mouse,
     return VLC_SUCCESS;
 }
 
-static bool SupportedChroma(const vlc_chroma_description_t *chroma)
-{
-    if (chroma == NULL)
-        return false;
-
-    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)
-            return false;
-
-    return true;
-}
-
 static int Open(vlc_object_t *object)
 {
     filter_t *filter = (filter_t *)object;
@@ -239,11 +226,8 @@ static int Open(vlc_object_t *object)
 
     const vlc_chroma_description_t *chroma =
         vlc_fourcc_GetChromaDescription(src->i_chroma);
-    if (!SupportedChroma(chroma)) {
-        msg_Err(filter, "Unsupported chroma (%4.4s)", (char*)&src->i_chroma);
-        /* TODO support I422 ?! */
+    if (chroma == NULL)
         return VLC_EGENERIC;
-    }
 
     filter_sys_t *sys = malloc(sizeof(*sys));
     if (!sys)
@@ -285,6 +269,15 @@ static int Open(vlc_object_t *object)
 
     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 (!filter->b_allow_fmt_out_change) {
             msg_Err(filter, "Format change is not allowed");
             goto error;
@@ -298,6 +291,24 @@ static int Open(vlc_object_t *object)
         dst->i_sar_den        = src->i_sar_num;
     }
 
+    /* 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) {
+                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! */
+            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++) {