No functionnal changes (es demuxer).

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

diff --git a/modules/demux/mpeg/m4v.c b/modules/demux/mpeg/m4v.c
index b86a5f7175e3b6773be490ccfc5ff13b91359809..55205826254a4bd19a1b05d4c5598c50cd07e376 100644 (file)
--- a/modules/demux/mpeg/m4v.c
+++ b/modules/demux/mpeg/m4v.c
@@ -25,9 +25,14 @@
  * Preamble
  *****************************************************************************/
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_demux.h>
-#include "vlc_codec.h"
+#include <vlc_codec.h>
 
 /*****************************************************************************
  * Module descriptor
@@ -39,16 +44,17 @@ static void Close( vlc_object_t * );
 #define FPS_LONGTEXT N_("This is the desired frame rate when " \
     "playing MPEG4 video elementary streams.")
 
-vlc_module_begin();
-    set_category( CAT_INPUT );
-    set_subcategory( SUBCAT_INPUT_DEMUX );
-    set_description( _("MPEG-4 video demuxer" ) );
-    set_capability( "demux2", 0 );
-    set_callbacks( Open, Close );
-    add_shortcut( "m4v" );
-    add_shortcut( "mp4v" );
-    add_float( "m4v-fps", 25, NULL, FPS_TEXT, FPS_LONGTEXT, VLC_FALSE );
-vlc_module_end();
+vlc_module_begin ()
+    set_category( CAT_INPUT )
+    set_subcategory( SUBCAT_INPUT_DEMUX )
+    set_description( N_("MPEG-4 video demuxer" ) )
+    set_shortname( N_("MPEG-4 V") )
+    set_capability( "demux", 0 )
+    set_callbacks( Open, Close )
+    add_shortcut( "m4v" )
+    add_shortcut( "mp4v" )
+    add_float( "m4v-fps", 25, NULL, FPS_TEXT, FPS_LONGTEXT, false )
+vlc_module_end ()
 
 /*****************************************************************************
  * Local prototypes
@@ -75,7 +81,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, 4 ) < 4 ) return VLC_EGENERIC;
 
@@ -95,20 +101,20 @@ static int Open( vlc_object_t * p_this )
     p_demux->pf_control= Control;
     p_demux->p_sys     = p_sys = malloc( sizeof( demux_sys_t ) );
     p_sys->p_es        = NULL;
-    p_sys->i_dts       = 1;
+    p_sys->i_dts       = 0;
 
     /*  Load the mpeg4video packetizer */
-    INIT_VPACKETIZER( p_sys->p_packetizer, 'm', 'p', '4', 'v' );
-    es_format_Init( &p_sys->p_packetizer->fmt_out, UNKNOWN_ES, 0 );
-
-    LOAD_PACKETIZER_OR_FAIL( p_sys->p_packetizer, "mpeg4 video" );
+    es_format_Init( &fmt, VIDEO_ES, VLC_FOURCC( 'm', 'p', '4', 'v' ) );
+    p_sys->p_packetizer = demux_PacketizerNew( p_demux, &fmt, "mpeg4 video" );
+    if( !p_sys->p_packetizer )
+    {
+        free( p_sys );
+        return VLC_EGENERIC;
+    }
 
     /* We need to wait until we get p_extra (VOL header) from the packetizer
      * before we create the output */
-
-    var_Create( p_demux, "m4v-fps", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );
-    var_Get( p_demux, "m4v-fps", &val );
-    p_sys->f_fps = val.f_float;
+    p_sys->f_fps = var_CreateGetFloat( p_demux, "m4v-fps" );
 
     return VLC_SUCCESS;
 }
@@ -121,8 +127,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 );
 }
 
@@ -142,8 +147,8 @@ static int Demux( demux_t *p_demux)
     }
 
     /* m4v demuxer doesn't set pts/dts at all */
-    p_block_in->i_dts = p_sys->i_dts;
-    p_block_in->i_pts = 0;
+    p_block_in->i_dts = VLC_TS_0 + p_sys->i_dts;
+    p_block_in->i_pts = VLC_TS_INVALID;
 
     while( (p_block_out = p_sys->p_packetizer->pf_packetize( p_sys->p_packetizer, &p_block_in )) )
     {
@@ -153,22 +158,22 @@ static int Demux( demux_t *p_demux)
 
             if( p_sys->p_es == NULL )
             {
-                p_sys->p_packetizer->fmt_out.b_packetized = VLC_TRUE;
+                p_sys->p_packetizer->fmt_out.b_packetized = true;
                 p_sys->p_es = es_out_Add( p_demux->out, &p_sys->p_packetizer->fmt_out);
             }
 
-            es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_dts );
+            es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_sys->i_dts );
 
             p_block_out->p_next = NULL;
             if( p_block_out->i_pts == p_block_out->i_dts )
             {
-                p_block_out->i_pts = p_sys->i_dts;
+                p_block_out->i_pts = VLC_TS_0 + p_sys->i_dts;
             }
             else
             {
-                p_block_out->i_pts = 0;
+                p_block_out->i_pts = VLC_TS_INVALID;
             }
-            p_block_out->i_dts = p_sys->i_dts;
+            p_block_out->i_dts = VLC_TS_0 + p_sys->i_dts;
 
             es_out_Send( p_demux->out, p_sys->p_es, p_block_out );
 
@@ -192,7 +197,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 );
 }