* 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 )
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 );
{ "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" }, { "xm", "mod" },
{ "nsv", "nsv" },
- { "ogg", "ogg" }, { "ogm", "ogg" },
+ { "ogg", "ogg" }, { "ogm", "ogg" }, /* legacy Ogg */
+ { "oga", "ogg" }, { "spx", "ogg" }, { "ogv", "ogg" },
+ { "ogx", "ogg" }, /*RFC5334*/
{ "pva", "pva" },
{ "rm", "rm" },
{ "m4v", "m4v" },
{ "h264", "h264" },
{ "voc", "voc" },
- { "mid", "smf" },
- { "rmi", "smf" },
+ { "mid", "smf" }, { "rmi", "smf" },
{ "", "" },
};
/* Here, we don't mind if it does not work, it must be quick */
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 );
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 );
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:
*****************************************************************************/
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;
****************************************************************************/
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;
p_packetizer->fmt_in = *p_fmt;
es_format_Init( &p_packetizer->fmt_out, UNKNOWN_ES, 0 );
- p_packetizer->p_module = module_need( p_packetizer, "packetizer", NULL, 0 );
+ vlc_object_attach( p_packetizer, p_demux );
+ p_packetizer->p_module = module_need( p_packetizer, "packetizer", NULL, false );
if( !p_packetizer->p_module )
{
es_format_Clean( p_fmt );
return p_packetizer;
}
+
void demux_PacketizerDestroy( decoder_t *p_packetizer )
{
if( p_packetizer->p_module )