Add vlclua_dir_list_free to free list created by vlclua_dir_list and use it.

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

diff --git a/modules/demux/mpeg/m4v.c b/modules/demux/mpeg/m4v.c
index 2be0fb177bdc925eb60547f2209478fe7a4bfe5b..e98e2596194488674f85031499b86e3e46823e0a 100644 (file)
--- a/modules/demux/mpeg/m4v.c
+++ b/modules/demux/mpeg/m4v.c
@@ -24,10 +24,14 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
 
-#include <vlc/vlc.h>
-#include <vlc/input.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"
 
 /*****************************************************************************
@@ -36,14 +40,19 @@
 static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
+#define FPS_TEXT N_("Frames per Second")
+#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_description( N_("MPEG-4 video demuxer" ) );
+    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();
 
 /*****************************************************************************
@@ -53,6 +62,7 @@ struct demux_sys_t
 {
     mtime_t     i_dts;
     es_out_id_t *p_es;
+    float       f_fps;
 
     decoder_t *p_packetizer;
 };
@@ -69,7 +79,8 @@ static int Open( vlc_object_t * p_this )
 {
     demux_t     *p_demux = (demux_t*)p_this;
     demux_sys_t *p_sys;
-    uint8_t     *p_peek;
+    const uint8_t *p_peek;
+    vlc_value_t val;
 
     if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
 
@@ -100,6 +111,10 @@ static int Open( vlc_object_t * p_this )
     /* 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;
+
     return VLC_SUCCESS;
 }
 
@@ -143,7 +158,7 @@ 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);
             }
 
@@ -165,7 +180,7 @@ static int Demux( demux_t *p_demux)
             p_block_out = p_next;
 
             /* FIXME FIXME FIXME FIXME */
-            p_sys->i_dts += (mtime_t)1000000 / 25;
+            p_sys->i_dts += (mtime_t)1000000 / p_sys->f_fps;
             /* FIXME FIXME FIXME FIXME */
         }
     }
@@ -182,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 );
 }