lua_playlist: Use the title of the item and fallback to the name if this one is empty...

[vlc] / modules / video_chroma / yuy2_i420.c

diff --git a/modules/video_chroma/yuy2_i420.c b/modules/video_chroma/yuy2_i420.c
index b0902bc6cbc311a9060315389aba67170562ab02..d5aef1178c3fec3380e3810e4ff7e9416688f98d 100644 (file)
--- a/modules/video_chroma/yuy2_i420.c
+++ b/modules/video_chroma/yuy2_i420.c
@@ -32,7 +32,6 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
-#include <vlc_vout.h>
 
 #define SRC_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422,cyuv"
 #define DEST_FOURCC  "I420"
@@ -47,14 +46,19 @@ static void YVYU_I420           ( filter_t *, picture_t *, picture_t * );
 static void UYVY_I420           ( filter_t *, picture_t *, picture_t * );
 static void cyuv_I420           ( filter_t *, picture_t *, picture_t * );
 
+static picture_t *YUY2_I420_Filter    ( filter_t *, picture_t * );
+static picture_t *YVYU_I420_Filter    ( filter_t *, picture_t * );
+static picture_t *UYVY_I420_Filter    ( filter_t *, picture_t * );
+static picture_t *cyuv_I420_Filter    ( filter_t *, picture_t * );
+
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-vlc_module_begin();
-    set_description( N_("Conversions from " SRC_FOURCC " to " DEST_FOURCC) );
-    set_capability( "chroma", 80 );
-    set_callbacks( Activate, NULL );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Conversions from " SRC_FOURCC " to " DEST_FOURCC) )
+    set_capability( "video filter2", 80 )
+    set_callbacks( Activate, NULL )
+vlc_module_end ()
 
 /*****************************************************************************
  * Activate: allocate a chroma function
@@ -71,28 +75,29 @@ static int Activate( vlc_object_t *p_this )
         return -1;
     }
 
+    if( p_filter->fmt_in.video.i_width != p_filter->fmt_out.video.i_width
+     || p_filter->fmt_in.video.i_height != p_filter->fmt_out.video.i_height )
+        return -1;
+
     switch( p_filter->fmt_out.video.i_chroma )
     {
-        case VLC_FOURCC('I','4','2','0'):
+        case VLC_CODEC_I420:
             switch( p_filter->fmt_in.video.i_chroma )
             {
-                case VLC_FOURCC('Y','U','Y','2'):
-                case VLC_FOURCC('Y','U','N','V'):
-                    p_filter->pf_video_filter_io = YUY2_I420;
+                case VLC_CODEC_YUYV:
+                    p_filter->pf_video_filter = YUY2_I420_Filter;
                     break;
 
-                case VLC_FOURCC('Y','V','Y','U'):
-                    p_filter->pf_video_filter_io = YVYU_I420;
+                case VLC_CODEC_YVYU:
+                    p_filter->pf_video_filter = YVYU_I420_Filter;
                     break;
 
-                case VLC_FOURCC('U','Y','V','Y'):
-                case VLC_FOURCC('U','Y','N','V'):
-                case VLC_FOURCC('Y','4','2','2'):
-                    p_filter->pf_video_filter_io = UYVY_I420;
+                case VLC_CODEC_UYVY:
+                    p_filter->pf_video_filter = UYVY_I420_Filter;
                     break;
 
-                case VLC_FOURCC('c','y','u','v'):
-                    p_filter->pf_video_filter_io = cyuv_I420;
+                case VLC_CODEC_CYUV:
+                    p_filter->pf_video_filter = cyuv_I420_Filter;
                     break;
 
                 default:
@@ -107,6 +112,10 @@ static int Activate( vlc_object_t *p_this )
 }
 
 /* Following functions are local */
+VIDEO_FILTER_WRAPPER( YUY2_I420 )
+VIDEO_FILTER_WRAPPER( YVYU_I420 )
+VIDEO_FILTER_WRAPPER( UYVY_I420 )
+VIDEO_FILTER_WRAPPER( cyuv_I420 )
 
 /*****************************************************************************
  * YUY2_I420: packed YUY2 4:2:2 to planar YUV 4:2:0