X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fdemux.c;h=458e162b99e85b16e8b5f0fbf787999d3ce2481f;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=026ad4b2d55d320dd38243d470c69f01cad00398;hpb=ffbbecfb7ae45598ce967a828ee778316f515089;p=vlc diff --git a/src/input/demux.c b/src/input/demux.c index 026ad4b2d5..458e162b99 100644 --- a/src/input/demux.c +++ b/src/input/demux.c @@ -29,17 +29,37 @@ #include #include #include +#include +#include static bool SkipID3Tag( demux_t * ); static bool SkipAPETag( demux_t *p_demux ); +/* Decode URL (which has had its scheme stripped earlier) to a file path. */ +/* XXX: evil code duplication from access.c */ +static char *get_path(const char *location) +{ + char *url, *path; + + /* Prepending "file://" is a bit hackish. But then again, we do not want + * to hard-code the list of schemes that use file paths in make_path(). + */ + if (asprintf(&url, "file://%s", location) == -1) + return NULL; + + path = make_path (url); + free (url); + return path; +} + + /***************************************************************************** * 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, + const char *psz_location, stream_t *s, es_out_t *out, bool b_quick ) { static const char typename[] = "demux"; @@ -49,10 +69,13 @@ 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 ); - p_demux->psz_path = strdup( psz_path ); + p_demux->psz_location = strdup( psz_location ); + p_demux->psz_file = get_path( psz_location ); /* Take into account "demux" to be able to do :demux=dump */ if( p_demux->psz_demux && *p_demux->psz_demux == '\0' ) @@ -64,10 +87,10 @@ demux_t *__demux_New( vlc_object_t *p_obj, } if( !b_quick ) - { - msg_Dbg( p_obj, "creating demux: access='%s' demux='%s' path='%s'", - p_demux->psz_access, p_demux->psz_demux, p_demux->psz_path ); - } + msg_Dbg( p_obj, "creating demux: access='%s' demux='%s' " + "location='%s' file='%s'", + p_demux->psz_access, p_demux->psz_demux, + p_demux->psz_location, p_demux->psz_file ); p_demux->s = s; p_demux->out = out; @@ -82,7 +105,11 @@ demux_t *__demux_New( vlc_object_t *p_obj, if( s ) psz_module = p_demux->psz_demux; else psz_module = p_demux->psz_access; - if( s && *psz_module == '\0' && strrchr( p_demux->psz_path, '.' ) ) + const char *psz_ext; + + if( s && *psz_module == '\0' + && p_demux->psz_file != NULL + && (psz_ext = strrchr( p_demux->psz_file, '.' )) ) { /* XXX: add only file without any problem here and with strong detection. * - no .mp3, .a52, ... (aac is added as it works only by file ext @@ -98,19 +125,21 @@ 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" }, { "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 */ @@ -122,12 +151,11 @@ demux_t *__demux_New( vlc_object_t *p_obj, { "", "" } }; - const char *psz_ext = strrchr( p_demux->psz_path, '.' ) + 1; - int i; + psz_ext++; // skip '.' if( !b_quick ) { - for( i = 0; exttodemux[i].ext[0]; i++ ) + for( unsigned i = 0; exttodemux[i].ext[0]; i++ ) { if( !strcasecmp( psz_ext, exttodemux[i].ext ) ) { @@ -138,7 +166,7 @@ demux_t *__demux_New( vlc_object_t *p_obj, } else { - for( i = 0; exttodemux_quick[i].ext[0]; i++ ) + for( unsigned i = 0; exttodemux_quick[i].ext[0]; i++ ) { if( !strcasecmp( psz_ext, exttodemux_quick[i].ext ) ) { @@ -163,21 +191,19 @@ 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_file ); + free( p_demux->psz_location ); free( p_demux->psz_demux ); free( p_demux->psz_access ); vlc_object_release( p_demux ); @@ -193,15 +219,24 @@ 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_file ); + free( p_demux->psz_location ); free( p_demux->psz_demux ); free( p_demux->psz_access ); 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: *****************************************************************************/ @@ -232,7 +267,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; @@ -299,13 +334,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; @@ -315,6 +352,7 @@ decoder_t *demux_PacketizerNew( demux_t *p_demux, es_format_t *p_fmt, const char p_packetizer->fmt_in = *p_fmt; es_format_Init( &p_packetizer->fmt_out, UNKNOWN_ES, 0 ); + vlc_object_attach( p_packetizer, p_demux ); p_packetizer->p_module = module_need( p_packetizer, "packetizer", NULL, false ); if( !p_packetizer->p_module ) { @@ -326,6 +364,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 )