Changeset 37becd478f7fa51e8aebd595d7aebb205dfc1951

Timestamp:

25/11/07 14:32:20 (1 year ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1195997540 +0000

git-parent:

[1689169ec7248d0e18de86baf790d3ad86a1478d]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1195997540 +0000

Message:

Split i422->packed YUV and i422->planar YUV. Add i422->YUVA. This still needs some testing.

Files:

• configure.ac (modified) (1 diff)
• modules/video_chroma/Modules.am (modified) (1 diff)
• modules/video_chroma/i422_i420.c (added)
• modules/video_chroma/i422_yuy2.c (modified) (4 diffs)

configure.ac

@@ -1263 +1263 @@
-  VLC_ADD_PLUGINS([gestures rc telnet hotkeys showintf marq podcast shout sap fake folder])
-  VLC_ADD_PLUGINS([rss mosaic wall motiondetect clone crop erase bluescreen alphamask gaussianblur])
-
+ i422_i420
-  VLC_ADD_PLUGINS([aout_file linear_resampler bandlimited_resampler])
-  VLC_ADD_PLUGINS([float32_mixer spdif_mixer simple_channel_mixer])

modules/video_chroma/Modules.am

@@ -56 +56 @@
-    $(NULL)
-
+SOURCES_i422_i420 = \
+    i422_i420.c \
+    $(NULL)
+
-SOURCES_i420_ymga = \
-    i420_ymga.c \

modules/video_chroma/i422_yuy2.c

@@ -1 +1 @@
-/*****************************************************************************
-YUV to
+Planar YUV 4:2:2 to Packed
- *****************************************************************************
- * Copyright (C) 2000, 2001 the VideoLAN team
@@ -52 +52 @@
-static void I422_Y211           ( vout_thread_t *, picture_t *, picture_t * );
-static void I422_Y211           ( vout_thread_t *, picture_t *, picture_t * );
-static void I422_YV12           ( vout_thread_t *, picture_t *, picture_t * );
-#endif
-
@@ -120 +119 @@
-                    p_vout->chroma.pf_convert = I422_Y211;
-                    break;
-
-                case VLC_FOURCC('Y','V','1','2'):
-                    p_vout->chroma.pf_convert = I422_YV12;
-                    break;
-#endif
-
@@ -549 +544 @@
-}
-#endif
-
-
-/*****************************************************************************
- * I422_YV12: planar YUV 4:2:2 to planar YV12
- *****************************************************************************/
-#if defined (MODULE_NAME_IS_i422_yuy2)
-static void I422_YV12( vout_thread_t *p_vout, picture_t *p_source,
-                                              picture_t *p_dest )
-{
-    uint16_t i_dpy = p_dest->p[Y_PLANE].i_pitch;
-    uint16_t i_spy = p_source->p[Y_PLANE].i_pitch;
-    uint16_t i_dpuv = p_dest->p[U_PLANE].i_pitch;
-    uint16_t i_spuv = p_source->p[U_PLANE].i_pitch;
-    uint16_t i_width = p_vout->render.i_width;
-    uint16_t i_y = p_vout->render.i_height;
-    uint8_t *p_dy = p_dest->Y_PIXELS + (i_y-1)*i_dpy;
-    uint8_t *p_y = p_source->Y_PIXELS + (i_y-1)*i_spy;
-    uint8_t *p_du = p_dest->U_PIXELS + (i_y/2-1)*i_dpuv;
-    uint8_t *p_u = p_source->U_PIXELS + (i_y-1)*i_spuv;
-    uint8_t *p_dv = p_dest->V_PIXELS + (i_y/2-1)*i_dpuv;
-    uint8_t *p_v = p_source->V_PIXELS + (i_y-1)*i_spuv;
-    i_y /= 2;
-
-    for ( ; i_y--; )
-    {
-        memcpy(p_dy, p_y, i_width); p_dy -= i_dpy; p_y -= i_spy;
-        memcpy(p_dy, p_y, i_width); p_dy -= i_dpy; p_y -= i_spy;
-        memcpy(p_du, p_u, i_width/2); p_du -= i_dpuv; p_u -= 2*i_spuv;
-        memcpy(p_dv, p_v, i_width/2); p_dv -= i_dpuv; p_v -= 2*i_spuv;
-    }
-
-}
-#endif