Merge branch '1.0-bugfix'

[vlc] / modules / video_chroma / i420_rgb.c

diff --git a/modules/video_chroma/i420_rgb.c b/modules/video_chroma/i420_rgb.c
index b948ea5ef81744e00fe13148dba38c804e622f0a..28303f79a9eb5aa7f1a7929a944c0ada617064c2 100644 (file)
--- a/modules/video_chroma/i420_rgb.c
+++ b/modules/video_chroma/i420_rgb.c
@@ -25,16 +25,16 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <math.h>                                            /* exp(), pow() */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <math.h>                                            /* exp(), pow() */
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_filter.h>
-#include <vlc_vout.h>
 
 #include "i420_rgb.h"
 #if defined (MODULE_NAME_IS_i420_rgb)
@@ -67,24 +67,24 @@ static void Set8bppPalette      ( filter_t *, uint8_t * );
 /*****************************************************************************
  * Module descriptor.
  *****************************************************************************/
-vlc_module_begin();
+vlc_module_begin ()
 #if defined (MODULE_NAME_IS_i420_rgb)
     set_description( N_("I420,IYUV,YV12 to "
-                       "RGB2,RV15,RV16,RV24,RV32 conversions") );
-    set_capability( "chroma", 80 );
+                       "RGB2,RV15,RV16,RV24,RV32 conversions") )
+    set_capability( "video filter2", 80 )
 #elif defined (MODULE_NAME_IS_i420_rgb_mmx)
     set_description( N_( "MMX I420,IYUV,YV12 to "
-                        "RV15,RV16,RV24,RV32 conversions") );
-    set_capability( "chroma", 100 );
-    add_requirement( MMX );
+                        "RV15,RV16,RV24,RV32 conversions") )
+    set_capability( "video filter2", 100 )
+    add_requirement( MMX )
 #elif defined (MODULE_NAME_IS_i420_rgb_sse2)
     set_description( N_( "SSE2 I420,IYUV,YV12 to "
-                        "RV15,RV16,RV24,RV32 conversions") );
-    set_capability( "chroma", 120 );
-    add_requirement( SSE2 );
+                        "RV15,RV16,RV24,RV32 conversions") )
+    set_capability( "video filter2", 120 )
+    add_requirement( SSE2 )
 #endif
-    set_callbacks( Activate, Deactivate );
-vlc_module_end();
+    set_callbacks( Activate, Deactivate )
+vlc_module_end ()
 
 /*****************************************************************************
  * Activate: allocate a chroma function
@@ -106,18 +106,17 @@ static int Activate( vlc_object_t *p_this )
 
     switch( p_filter->fmt_in.video.i_chroma )
     {
-        case VLC_FOURCC('Y','V','1','2'):
-        case VLC_FOURCC('I','4','2','0'):
-        case VLC_FOURCC('I','Y','U','V'):
+        case VLC_CODEC_YV12:
+        case VLC_CODEC_I420:
             switch( p_filter->fmt_out.video.i_chroma )
             {
 #if defined (MODULE_NAME_IS_i420_rgb)
-                case VLC_FOURCC('R','G','B','2'):
-                    p_filter->pf_video_filter_io = I420_RGB8;
+                case VLC_CODEC_RGB8:
+                    p_filter->pf_video_filter = I420_RGB8_Filter;
                     break;
 #endif
-                case VLC_FOURCC('R','V','1','5'):
-                case VLC_FOURCC('R','V','1','6'):
+                case VLC_CODEC_RGB15:
+                case VLC_CODEC_RGB16:
 #if ! defined (MODULE_NAME_IS_i420_rgb)
                     /* If we don't have support for the bitmasks, bail out */
                     if( ( p_filter->fmt_out.video.i_rmask == 0x7c00
@@ -126,7 +125,7 @@ static int Activate( vlc_object_t *p_this )
                     {
                         /* R5G5B6 pixel format */
                         msg_Dbg(p_this, "RGB pixel format is R5G5B5");
-                        p_filter->pf_video_filter_io = I420_R5G5B5;
+                        p_filter->pf_video_filter = I420_R5G5B5_Filter;
                     }
                     else if( ( p_filter->fmt_out.video.i_rmask == 0xf800
                             && p_filter->fmt_out.video.i_gmask == 0x07e0
@@ -134,22 +133,22 @@ static int Activate( vlc_object_t *p_this )
                     {
                         /* R5G6B5 pixel format */
                         msg_Dbg(p_this, "RGB pixel format is R5G6B5");
-                        p_filter->pf_video_filter_io = I420_R5G6B5;
+                        p_filter->pf_video_filter = I420_R5G6B5_Filter;
                     }
                     else
                         return VLC_EGENERIC;
 #else
                     // generic C chroma converter */
-                    p_filter->pf_video_filter_io = I420_RGB16;
+                    p_filter->pf_video_filter = I420_RGB16_Filter;
 #endif
                     break;
 
 #if 0
                 /* Hmmm, is there only X11 using 32bits per pixel for RV24 ? */
-                case VLC_FOURCC('R','V','2','4'):
+                case VLC_CODEC_RGB24:
 #endif
 
-                case VLC_FOURCC('R','V','3','2'):
+                case VLC_CODEC_RGB32:
 #if ! defined (MODULE_NAME_IS_i420_rgb)
                     /* If we don't have support for the bitmasks, bail out */
                     if( p_filter->fmt_out.video.i_rmask == 0x00ff0000
@@ -158,7 +157,7 @@ static int Activate( vlc_object_t *p_this )
                     {
                         /* A8R8G8B8 pixel format */
                         msg_Dbg(p_this, "RGB pixel format is A8R8G8B8");
-                        p_filter->pf_video_filter_io = I420_A8R8G8B8;
+                        p_filter->pf_video_filter = I420_A8R8G8B8_Filter;
                     }
                     else if( p_filter->fmt_out.video.i_rmask == 0xff000000
                           && p_filter->fmt_out.video.i_gmask == 0x00ff0000
@@ -166,7 +165,7 @@ static int Activate( vlc_object_t *p_this )
                     {
                         /* R8G8B8A8 pixel format */
                         msg_Dbg(p_this, "RGB pixel format is R8G8B8A8");
-                        p_filter->pf_video_filter_io = I420_R8G8B8A8;
+                        p_filter->pf_video_filter = I420_R8G8B8A8_Filter;
                     }
                     else if( p_filter->fmt_out.video.i_rmask == 0x0000ff00
                           && p_filter->fmt_out.video.i_gmask == 0x00ff0000
@@ -174,7 +173,7 @@ static int Activate( vlc_object_t *p_this )
                     {
                         /* B8G8R8A8 pixel format */
                         msg_Dbg(p_this, "RGB pixel format is B8G8R8A8");
-                        p_filter->pf_video_filter_io = I420_B8G8R8A8;
+                        p_filter->pf_video_filter = I420_B8G8R8A8_Filter;
                     }
                     else if( p_filter->fmt_out.video.i_rmask == 0x000000ff
                           && p_filter->fmt_out.video.i_gmask == 0x0000ff00
@@ -182,13 +181,13 @@ static int Activate( vlc_object_t *p_this )
                     {
                         /* A8B8G8R8 pixel format */
                         msg_Dbg(p_this, "RGB pixel format is A8B8G8R8");
-                        p_filter->pf_video_filter_io = I420_A8B8G8R8;
+                        p_filter->pf_video_filter = I420_A8B8G8R8_Filter;
                     }
                     else
                         return VLC_EGENERIC;
 #else
                     /* generic C chroma converter */
-                    p_filter->pf_video_filter_io = I420_RGB32;
+                    p_filter->pf_video_filter = I420_RGB32_Filter;
 #endif
                     break;
 
@@ -210,18 +209,18 @@ static int Activate( vlc_object_t *p_this )
     switch( p_filter->fmt_out.video.i_chroma )
     {
 #if defined (MODULE_NAME_IS_i420_rgb)
-        case VLC_FOURCC('R','G','B','2'):
+        case VLC_CODEC_RGB8:
             p_filter->p_sys->p_buffer = malloc( VOUT_MAX_WIDTH );
             break;
 #endif
 
-        case VLC_FOURCC('R','V','1','5'):
-        case VLC_FOURCC('R','V','1','6'):
+        case VLC_CODEC_RGB15:
+        case VLC_CODEC_RGB16:
             p_filter->p_sys->p_buffer = malloc( VOUT_MAX_WIDTH * 2 );
             break;
 
-        case VLC_FOURCC('R','V','2','4'):
-        case VLC_FOURCC('R','V','3','2'):
+        case VLC_CODEC_RGB24:
+        case VLC_CODEC_RGB32:
             p_filter->p_sys->p_buffer = malloc( VOUT_MAX_WIDTH * 4 );
             break;
 
@@ -238,7 +237,7 @@ static int Activate( vlc_object_t *p_this )
 
     p_filter->p_sys->p_offset = malloc( p_filter->fmt_out.video.i_width
                     * ( ( p_filter->fmt_out.video.i_chroma
-                           == VLC_FOURCC('R','G','B','2') ) ? 2 : 1 )
+                           == VLC_CODEC_RGB8 ) ? 2 : 1 )
                     * sizeof( int ) );
     if( p_filter->p_sys->p_offset == NULL )
     {
@@ -250,11 +249,11 @@ static int Activate( vlc_object_t *p_this )
 #if defined (MODULE_NAME_IS_i420_rgb)
     switch( p_filter->fmt_out.video.i_chroma )
     {
-    case VLC_FOURCC('R','G','B','2'):
+    case VLC_CODEC_RGB8:
         i_tables_size = sizeof( uint8_t ) * PALETTE_TABLE_SIZE;
         break;
-    case VLC_FOURCC('R','V','1','5'):
-    case VLC_FOURCC('R','V','1','6'):
+    case VLC_CODEC_RGB15:
+    case VLC_CODEC_RGB16:
         i_tables_size = sizeof( uint16_t ) * RGB_TABLE_SIZE;
         break;
     default: /* RV24, RV32 */
@@ -294,6 +293,19 @@ static void Deactivate( vlc_object_t *p_this )
     free( p_filter->p_sys );
 }
 
+#if defined (MODULE_NAME_IS_i420_rgb)
+VIDEO_FILTER_WRAPPER( I420_RGB8 )
+VIDEO_FILTER_WRAPPER( I420_RGB16 )
+VIDEO_FILTER_WRAPPER( I420_RGB32 )
+#else
+VIDEO_FILTER_WRAPPER( I420_R5G5B5 )
+VIDEO_FILTER_WRAPPER( I420_R5G6B5 )
+VIDEO_FILTER_WRAPPER( I420_A8R8G8B8 )
+VIDEO_FILTER_WRAPPER( I420_R8G8B8A8 )
+VIDEO_FILTER_WRAPPER( I420_B8G8R8A8 )
+VIDEO_FILTER_WRAPPER( I420_A8B8G8R8 )
+#endif
+
 #if defined (MODULE_NAME_IS_i420_rgb)
 /*****************************************************************************
  * SetGammaTable: return intensity table transformed by gamma curve.
@@ -334,13 +346,13 @@ static void SetYUV( filter_t *p_filter )
     /* Color: build red, green and blue tables */
     switch( p_filter->fmt_out.video.i_chroma )
     {
-    case VLC_FOURCC('R','G','B','2'):
+    case VLC_CODEC_RGB8:
         p_filter->p_sys->p_rgb8 = (uint8_t *)p_filter->p_sys->p_base;
         Set8bppPalette( p_filter, p_filter->p_sys->p_rgb8 );
         break;
 
-    case VLC_FOURCC('R','V','1','5'):
-    case VLC_FOURCC('R','V','1','6'):
+    case VLC_CODEC_RGB15:
+    case VLC_CODEC_RGB16:
         p_filter->p_sys->p_rgb16 = (uint16_t *)p_filter->p_sys->p_base;
         for( i_index = 0; i_index < RED_MARGIN; i_index++ )
         {
@@ -365,8 +377,8 @@ static void SetYUV( filter_t *p_filter )
         }
         break;
 
-    case VLC_FOURCC('R','V','2','4'):
-    case VLC_FOURCC('R','V','3','2'):
+    case VLC_CODEC_RGB24:
+    case VLC_CODEC_RGB32:
         p_filter->p_sys->p_rgb32 = (uint32_t *)p_filter->p_sys->p_base;
         for( i_index = 0; i_index < RED_MARGIN; i_index++ )
         {