X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_chroma%2Fi422_yuy2.c;h=81b8beb9a38503b7cd2d548de6bb3686c9760af6;hb=98ad3f3cb54dba78cb1b5d2f5d84052b5274c430;hp=931a1f222bc10250df230cefaabb0c2146c6eb34;hpb=174f75debc6ff4b0b3a7037bc21e7b77bfe2a9d8;p=vlc

diff --git a/modules/video_chroma/i422_yuy2.c b/modules/video_chroma/i422_yuy2.c
index 931a1f222b..81b8beb9a3 100644
--- a/modules/video_chroma/i422_yuy2.c
+++ b/modules/video_chroma/i422_yuy2.c
@@ -33,7 +33,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
-#include <vlc_vout.h>
+#include <vlc_cpu.h>
 
 #include "i422_yuy2.h"
 
@@ -71,14 +71,18 @@ vlc_module_begin ()
 #if defined (MODULE_NAME_IS_i422_yuy2)
     set_description( N_("Conversions from " SRC_FOURCC " to " DEST_FOURCC) )
     set_capability( "video filter2", 80 )
+# define CPU_CAPABILITY 0
+# define VLC_TARGET
 #elif defined (MODULE_NAME_IS_i422_yuy2_mmx)
     set_description( N_("MMX conversions from " SRC_FOURCC " to " DEST_FOURCC) )
     set_capability( "video filter2", 100 )
-    add_requirement( MMX )
+# define CPU_CAPABILITY CPU_CAPABILITY_MMX
+# define VLC_TARGET VLC_MMX
 #elif defined (MODULE_NAME_IS_i422_yuy2_sse2)
     set_description( N_("SSE2 conversions from " SRC_FOURCC " to " DEST_FOURCC) )
     set_capability( "video filter2", 120 )
-    add_requirement( SSE2 )
+# define CPU_CAPABILITY CPU_CAPABILITY_SSE2
+# define VLC_TARGET VLC_SSE
 #endif
     set_callbacks( Activate, NULL )
 vlc_module_end ()
@@ -92,6 +96,10 @@ static int Activate( vlc_object_t *p_this )
 {
     filter_t *p_filter = (filter_t *)p_this;
 
+#if CPU_CAPABILITY
+    if( !(vlc_CPU() & CPU_CAPABILITY) )
+        return VLC_EGENERIC;
+#endif
     if( p_filter->fmt_in.video.i_width & 1
      || p_filter->fmt_in.video.i_height & 1 )
     {
@@ -115,6 +123,7 @@ static int Activate( vlc_object_t *p_this )
                     p_filter->pf_video_filter = I422_UYVY_Filter;
                     break;
 
+                case VLC_FOURCC('I','U','Y','V'):
                     p_filter->pf_video_filter = I422_IUYV_Filter;
                     break;
 
@@ -153,6 +162,7 @@ VIDEO_FILTER_WRAPPER( I422_Y211 )
 /*****************************************************************************
  * I422_YUY2: planar YUV 4:2:2 to packed YUY2 4:2:2
  *****************************************************************************/
+VLC_TARGET
 static void I422_YUY2( filter_t *p_filter, picture_t *p_source,
                                            picture_t *p_dest )
 {
@@ -246,6 +256,7 @@ static void I422_YUY2( filter_t *p_filter, picture_t *p_source,
 /*****************************************************************************
  * I422_YVYU: planar YUV 4:2:2 to packed YVYU 4:2:2
  *****************************************************************************/
+VLC_TARGET
 static void I422_YVYU( filter_t *p_filter, picture_t *p_source,
                                            picture_t *p_dest )
 {
@@ -339,6 +350,7 @@ static void I422_YVYU( filter_t *p_filter, picture_t *p_source,
 /*****************************************************************************
  * I422_UYVY: planar YUV 4:2:2 to packed UYVY 4:2:2
  *****************************************************************************/
+VLC_TARGET
 static void I422_UYVY( filter_t *p_filter, picture_t *p_source,
                                            picture_t *p_dest )
 {
@@ -443,6 +455,7 @@ static void I422_IUYV( filter_t *p_filter, picture_t *p_source,
 /*****************************************************************************
  * I422_cyuv: planar YUV 4:2:2 to upside-down packed UYVY 4:2:2
  *****************************************************************************/
+VLC_TARGET
 static void I422_cyuv( filter_t *p_filter, picture_t *p_source,
                                            picture_t *p_dest )
 {