Replaced vout_InitPicture/Format with their equivalent.

[vlc] / modules / video_output / vmem.c

diff --git a/modules/video_output/vmem.c b/modules/video_output/vmem.c
index 76f7fd0500ab4e16efbbb3fd0bb17c2498a0168a..57e05303e5c39c35cc1954f9fc5d846b9a269571 100644 (file)
--- a/modules/video_output/vmem.c
+++ b/modules/video_output/vmem.c
@@ -71,24 +71,24 @@ static int  UnlockPicture ( vout_thread_t *, picture_t * );
 #define T_DATA N_( "Callback data" )
 #define LT_DATA N_( "Data for the locking and unlocking functions" )
 
-vlc_module_begin( );
-    set_description( N_( "Video memory module" ) );
-    set_shortname( N_("Video memory") );
+vlc_module_begin ()
+    set_description( N_( "Video memory output" ) )
+    set_shortname( N_("Video memory") )
 
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VOUT );
-    set_capability( "video output", 0 );
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VOUT )
+    set_capability( "video output", 0 )
 
-    add_integer( "vmem-width", 320, NULL, T_WIDTH, LT_WIDTH, false );
-    add_integer( "vmem-height", 200, NULL, T_HEIGHT, LT_HEIGHT, false );
-    add_integer( "vmem-pitch", 640, NULL, T_PITCH, LT_PITCH, false );
-    add_string( "vmem-chroma", "RV16", NULL, T_CHROMA, LT_CHROMA, true );
-    add_string( "vmem-lock", "0", NULL, T_LOCK, LT_LOCK, true );
-    add_string( "vmem-unlock", "0", NULL, T_UNLOCK, LT_UNLOCK, true );
-    add_string( "vmem-data", "0", NULL, T_DATA, LT_DATA, true );
+    add_integer( "vmem-width", 320, NULL, T_WIDTH, LT_WIDTH, false )
+    add_integer( "vmem-height", 200, NULL, T_HEIGHT, LT_HEIGHT, false )
+    add_integer( "vmem-pitch", 640, NULL, T_PITCH, LT_PITCH, false )
+    add_string( "vmem-chroma", "RV16", NULL, T_CHROMA, LT_CHROMA, true )
+    add_string( "vmem-lock", "0", NULL, T_LOCK, LT_LOCK, true )
+    add_string( "vmem-unlock", "0", NULL, T_UNLOCK, LT_UNLOCK, true )
+    add_string( "vmem-data", "0", NULL, T_DATA, LT_DATA, true )
 
-    set_callbacks( Create, Destroy );
-vlc_module_end();
+    set_callbacks( Create, Destroy )
+vlc_module_end ()
 
 /*****************************************************************************
  * vout_sys_t: video output descriptor
@@ -133,40 +133,38 @@ static int Init( vout_thread_t *p_vout )
     int i_index;
     picture_t *p_pic;
     char *psz_chroma, *psz_tmp;
-    int i_width, i_height, i_pitch, i_chroma;
+    int i_width, i_height, i_pitch;
+    vlc_fourcc_t i_chroma;
 
-    i_width = config_GetInt( p_vout, "vmem-width" );
-    i_height = config_GetInt( p_vout, "vmem-height" );
-    i_pitch = config_GetInt( p_vout, "vmem-pitch" );
+    i_width = var_CreateGetInteger( p_vout, "vmem-width" );
+    i_height = var_CreateGetInteger( p_vout, "vmem-height" );
+    i_pitch = var_CreateGetInteger( p_vout, "vmem-pitch" );
 
-    psz_chroma = config_GetPsz( p_vout, "vmem-chroma" );
-    if( psz_chroma )
+    psz_chroma = var_CreateGetString( p_vout, "vmem-chroma" );
+    if( !psz_chroma )
     {
-        if( strlen( psz_chroma ) < 4 )
-        {
-            msg_Err( p_vout, "vmem-chroma should be 4 characters long" );
-            free( psz_chroma );
-            return VLC_EGENERIC;
-        }
-        i_chroma = VLC_FOURCC( psz_chroma[0], psz_chroma[1],
-                               psz_chroma[2], psz_chroma[3] );
-        free( psz_chroma );
+        msg_Err( p_vout, "Cannot find chroma information." );
+        return VLC_EGENERIC;
     }
-    else
+
+    i_chroma = vlc_fourcc_GetCodecFromString( VIDEO_ES, psz_chroma );
+    free( psz_chroma );
+
+    if( !i_chroma )
     {
-        msg_Err( p_vout, "Cannot find chroma information." );
+        msg_Err( p_vout, "vmem-chroma should be 4 characters long" );
         return VLC_EGENERIC;
     }
 
-    psz_tmp = config_GetPsz( p_vout, "vmem-lock" );
-    p_vout->p_sys->pf_lock = (void * (*) (void *))(intptr_t)atoll( psz_tmp );
+    psz_tmp = var_CreateGetString( p_vout, "vmem-lock" );
+    p_vout->p_sys->pf_lock = (void (*) (void *, void **))(intptr_t)atoll( psz_tmp );
     free( psz_tmp );
 
-    psz_tmp = config_GetPsz( p_vout, "vmem-unlock" );
+    psz_tmp = var_CreateGetString( p_vout, "vmem-unlock" );
     p_vout->p_sys->pf_unlock = (void (*) (void *))(intptr_t)atoll( psz_tmp );
     free( psz_tmp );
 
-    psz_tmp = config_GetPsz( p_vout, "vmem-data" );
+    psz_tmp = var_CreateGetString( p_vout, "vmem-data" );
     p_vout->p_sys->p_data = (void *)(intptr_t)atoll( psz_tmp );
     free( psz_tmp );
 
@@ -189,25 +187,25 @@ static int Init( vout_thread_t *p_vout )
     /* Define the bitmasks */
     switch( i_chroma )
     {
-      case VLC_FOURCC( 'R','V','1','5' ):
+      case VLC_CODEC_RGB15:
         p_vout->output.i_rmask = 0x001f;
         p_vout->output.i_gmask = 0x03e0;
         p_vout->output.i_bmask = 0x7c00;
         break;
 
-      case VLC_FOURCC( 'R','V','1','6' ):
+      case VLC_CODEC_RGB16:
         p_vout->output.i_rmask = 0x001f;
         p_vout->output.i_gmask = 0x07e0;
         p_vout->output.i_bmask = 0xf800;
         break;
 
-      case VLC_FOURCC( 'R','V','2','4' ):
+      case VLC_CODEC_RGB24:
         p_vout->output.i_rmask = 0xff0000;
         p_vout->output.i_gmask = 0x00ff00;
         p_vout->output.i_bmask = 0x0000ff;
         break;
 
-      case VLC_FOURCC( 'R','V','3','2' ):
+      case VLC_CODEC_RGB32:
         p_vout->output.i_rmask = 0xff0000;
         p_vout->output.i_gmask = 0x00ff00;
         p_vout->output.i_bmask = 0x0000ff;
@@ -233,9 +231,13 @@ static int Init( vout_thread_t *p_vout )
         return VLC_SUCCESS;
     }
 
-    vout_InitPicture( VLC_OBJECT(p_vout), p_pic, p_vout->output.i_chroma,
-                      p_vout->output.i_width, p_vout->output.i_height,
-                      p_vout->output.i_aspect );
+    if( picture_Setup( p_pic, p_vout->output.i_chroma,
+                       p_vout->output.i_width, p_vout->output.i_height,
+                       p_vout->output.i_aspect ) )
+    {
+        free( p_pic );
+        return VLC_EGENERIC;
+    }
 
     p_pic->p->i_pitch = i_pitch;