Merge commit 'origin/1.0-bugfix'

[vlc] / modules / demux / mpeg / h264.c

diff --git a/modules/demux/mpeg/h264.c b/modules/demux/mpeg/h264.c
index a50ef6a4bdb980853f97a9c70fa4cf18bc73a504..1bcf6f06c8a38c555d296c2fa32e9c934f297d9a 100644 (file)
--- a/modules/demux/mpeg/h264.c
+++ b/modules/demux/mpeg/h264.c
@@ -29,7 +29,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_demux.h>
 #include "vlc_codec.h"
 
@@ -43,16 +44,16 @@ static void Close( vlc_object_t * );
 #define FPS_LONGTEXT N_("Desired frame rate for the H264 stream.")
 
 
-vlc_module_begin();
-    set_shortname( "H264");
-    set_category( CAT_INPUT );
-    set_subcategory( SUBCAT_INPUT_DEMUX );
-    set_description( _("H264 video demuxer" ) );
-    set_capability( "demux2", 0 );
-    add_float( "h264-fps", 25.0, NULL, FPS_TEXT, FPS_LONGTEXT, true );
-    set_callbacks( Open, Close );
-    add_shortcut( "h264" );
-vlc_module_end();
+vlc_module_begin ()
+    set_shortname( "H264")
+    set_category( CAT_INPUT )
+    set_subcategory( SUBCAT_INPUT_DEMUX )
+    set_description( N_("H264 video demuxer" ) )
+    set_capability( "demux", 0 )
+    add_float( "h264-fps", 25.0, NULL, FPS_TEXT, FPS_LONGTEXT, true )
+    set_callbacks( Open, Close )
+    add_shortcut( "h264" )
+vlc_module_end ()
 
 /*****************************************************************************
  * Local prototypes
@@ -79,7 +80,7 @@ static int Open( vlc_object_t * p_this )
     demux_t     *p_demux = (demux_t*)p_this;
     demux_sys_t *p_sys;
     const uint8_t *p_peek;
-    vlc_value_t val;
+    es_format_t fmt;
 
     if( stream_Peek( p_demux->s, &p_peek, 5 ) < 5 ) return VLC_EGENERIC;
 
@@ -102,16 +103,19 @@ static int Open( vlc_object_t * p_this )
     p_demux->p_sys     = p_sys = malloc( sizeof( demux_sys_t ) );
     p_sys->p_es        = NULL;
     p_sys->i_dts       = 1;
-    var_Create( p_demux, "h264-fps", VLC_VAR_FLOAT|VLC_VAR_DOINHERIT );
-    var_Get( p_demux, "h264-fps", &val );
-    p_sys->f_fps = val.f_float;
-    if( val.f_float < 0.001 ) p_sys->f_fps = 0.001;
+    p_sys->f_fps       = var_CreateGetFloat( p_demux, "h264-fps" );
+    if( p_sys->f_fps < 0.001 )
+        p_sys->f_fps = 0.001;
     msg_Dbg( p_demux, "using %.2f fps", p_sys->f_fps );
 
     /* Load the mpegvideo packetizer */
-    INIT_VPACKETIZER( p_sys->p_packetizer,  'h', '2', '6', '4'  );
-    es_format_Init( &p_sys->p_packetizer->fmt_out, UNKNOWN_ES, 0 );
-    LOAD_PACKETIZER_OR_FAIL( p_sys->p_packetizer, "H264" );
+    es_format_Init( &fmt, VIDEO_ES, VLC_CODEC_H264 );
+    p_sys->p_packetizer = demux_PacketizerNew( p_demux, &fmt, "h264" );
+    if( !p_sys->p_packetizer )
+    {
+        free( p_sys );
+        return VLC_EGENERIC;
+    }
 
     return VLC_SUCCESS;
 }
@@ -124,8 +128,7 @@ static void Close( vlc_object_t * p_this )
     demux_t     *p_demux = (demux_t*)p_this;
     demux_sys_t *p_sys = p_demux->p_sys;
 
-    DESTROY_PACKETIZER( p_sys->p_packetizer );
-
+    demux_PacketizerDestroy( p_sys->p_packetizer );
     free( p_sys );
 }
 
@@ -186,7 +189,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
     if( i_query == DEMUX_SET_TIME )
         return VLC_EGENERIC;
     else
-        return demux2_vaControlHelper( p_demux->s,
+        return demux_vaControlHelper( p_demux->s,
                                        0, -1,
                                        0, 1, i_query, args );
 }