X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fdemux.c;h=41441f998eecfd640c856ead977fc9bb8b494539;hb=27cdd6eb494feb8da6ea6fd4112b1b066b5f4f3a;hp=dfbcb62a5ac2d16ca6b7405de6987329e4e66175;hpb=4d700eb73b7890bb36c1deb7d903c3d03f79dda2;p=vlc

diff --git a/src/input/demux.c b/src/input/demux.c
index dfbcb62a5a..41441f998e 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -37,7 +37,7 @@ static bool SkipAPETag( demux_t *p_demux );
  * demux_New:
  *  if s is NULL then load a access_demux
  *****************************************************************************/
-demux_t *__demux_New( vlc_object_t *p_obj,
+demux_t *__demux_New( vlc_object_t *p_obj, input_thread_t *p_parent_input,
                        const char *psz_access, const char *psz_demux,
                        const char *psz_path,
                        stream_t *s, es_out_t *out, bool b_quick )
@@ -49,6 +49,8 @@ demux_t *__demux_New( vlc_object_t *p_obj,
 
     if( p_demux == NULL ) return NULL;
 
+    p_demux->p_input = p_parent_input;
+
     /* Parse URL */
     p_demux->psz_access = strdup( psz_access );
     p_demux->psz_demux  = strdup( psz_demux );
@@ -98,10 +100,11 @@ demux_t *__demux_New( vlc_object_t *p_obj,
             { "au",   "au" },
             { "flac", "flac" },
             { "dv",   "dv" },
-            { "m3u",  "playlist" },
+            { "drc",  "dirac" },
+            { "m3u",  "m3u" },
+            { "m3u8", "m3u8" },
             { "mkv",  "mkv" }, { "mka",  "mkv" }, { "mks",  "mkv" },
             { "mp4",  "mp4" }, { "m4a",  "mp4" }, { "mov",  "mp4" }, { "moov", "mp4" },
-            { "mod",  "mod" }, { "it",  "mod" }, { "s3m",  "mod" }, { "xm",   "mod" },
             { "nsv",  "nsv" },
             { "ogg",  "ogg" }, { "ogm",  "ogg" }, /* legacy Ogg */
             { "oga",  "ogg" }, { "spx",  "ogg" }, { "ogv", "ogg" },
@@ -164,20 +167,17 @@ demux_t *__demux_New( vlc_object_t *p_obj,
 
         p_demux->p_module =
             module_need( p_demux, "demux", psz_module,
-                         !strcmp( psz_module, p_demux->psz_demux ) ?
-                         true : false );
+                         !strcmp( psz_module, p_demux->psz_demux ) );
     }
     else
     {
         p_demux->p_module =
             module_need( p_demux, "access_demux", psz_module,
-                         !strcmp( psz_module, p_demux->psz_access ) ?
-                         true : false );
+                         !strcmp( psz_module, p_demux->psz_access ) );
     }
 
     if( p_demux->p_module == NULL )
     {
-        vlc_object_detach( p_demux );
         free( p_demux->psz_path );
         free( p_demux->psz_demux );
         free( p_demux->psz_access );
@@ -194,7 +194,6 @@ demux_t *__demux_New( vlc_object_t *p_obj,
 void demux_Delete( demux_t *p_demux )
 {
     module_unneed( p_demux, p_demux->p_module );
-    vlc_object_detach( p_demux );
 
     free( p_demux->psz_path );
     free( p_demux->psz_demux );
@@ -203,6 +202,15 @@ void demux_Delete( demux_t *p_demux )
     vlc_object_release( p_demux );
 }
 
+/*****************************************************************************
+ * demux_GetParentInput:
+ *****************************************************************************/
+input_thread_t * demux_GetParentInput( demux_t *p_demux )
+{
+    return p_demux->p_input ? vlc_object_hold((vlc_object_t*)p_demux->p_input) : NULL;
+}
+
+
 /*****************************************************************************
  * demux_vaControlHelper:
  *****************************************************************************/
@@ -233,7 +241,7 @@ int demux_vaControlHelper( stream_t *s,
 
         case DEMUX_GET_TIME:
             pi64 = (int64_t*)va_arg( args, int64_t * );
-            if( i_bitrate > 0 && i_end > i_start )
+            if( i_bitrate > 0 && i_tell >= i_start )
             {
                 *pi64 = INT64_C(8000000) * (i_tell - i_start) / i_bitrate;
                 return VLC_SUCCESS;
@@ -300,13 +308,15 @@ int demux_vaControlHelper( stream_t *s,
  ****************************************************************************/
 decoder_t *demux_PacketizerNew( demux_t *p_demux, es_format_t *p_fmt, const char *psz_msg )
 {
-    decoder_t *p_packetizer = vlc_object_create( p_demux, VLC_OBJECT_PACKETIZER );
-
+    decoder_t *p_packetizer;
+    p_packetizer = vlc_custom_create( p_demux, sizeof( *p_packetizer ),
+                                      VLC_OBJECT_GENERIC, "demux packetizer" );
     if( !p_packetizer )
     {
         es_format_Clean( p_fmt );
         return NULL;
     }
+    p_fmt->b_packetized = false;
 
     p_packetizer->pf_decode_audio = NULL;
     p_packetizer->pf_decode_video = NULL;
@@ -327,6 +337,7 @@ decoder_t *demux_PacketizerNew( demux_t *p_demux, es_format_t *p_fmt, const char
 
     return p_packetizer;
 }
+
 void demux_PacketizerDestroy( decoder_t *p_packetizer )
 {
     if( p_packetizer->p_module )