X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fdemux.c;h=458e162b99e85b16e8b5f0fbf787999d3ce2481f;hb=59117b28623d003c2bf3374bf551f126da4322dc;hp=d3e16d94752960356ec6efaf24b304ab6014fd13;hpb=07a61eae0b43acf1a0312689f5a70f738893326e;p=vlc diff --git a/src/input/demux.c b/src/input/demux.c index d3e16d9475..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, 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"; @@ -54,7 +74,8 @@ demux_t *__demux_New( vlc_object_t *p_obj, input_thread_t *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' ) @@ -66,10 +87,10 @@ demux_t *__demux_New( vlc_object_t *p_obj, input_thread_t *p_parent_input, } 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; @@ -84,7 +105,11 @@ demux_t *__demux_New( vlc_object_t *p_obj, input_thread_t *p_parent_input, 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 @@ -101,7 +126,8 @@ demux_t *__demux_New( vlc_object_t *p_obj, input_thread_t *p_parent_input, { "flac", "flac" }, { "dv", "dv" }, { "drc", "dirac" }, - { "m3u", "playlist" }, + { "m3u", "m3u" }, + { "m3u8", "m3u8" }, { "mkv", "mkv" }, { "mka", "mkv" }, { "mks", "mkv" }, { "mp4", "mp4" }, { "m4a", "mp4" }, { "mov", "mp4" }, { "moov", "mp4" }, { "nsv", "nsv" }, @@ -125,12 +151,11 @@ demux_t *__demux_New( vlc_object_t *p_obj, input_thread_t *p_parent_input, { "", "" } }; - 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 ) ) { @@ -141,7 +166,7 @@ demux_t *__demux_New( vlc_object_t *p_obj, input_thread_t *p_parent_input, } 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 ) ) { @@ -154,7 +179,6 @@ demux_t *__demux_New( vlc_object_t *p_obj, input_thread_t *p_parent_input, } /* Before module_need (for var_Create...) */ - vlc_object_set_name( p_demux, psz_module ); vlc_object_attach( p_demux, p_obj ); if( s ) @@ -167,21 +191,19 @@ demux_t *__demux_New( vlc_object_t *p_obj, input_thread_t *p_parent_input, 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 ); @@ -197,9 +219,9 @@ demux_t *__demux_New( vlc_object_t *p_obj, input_thread_t *p_parent_input, 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 ); @@ -312,8 +334,9 @@ 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_DECODER ); - + 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 ); @@ -329,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 ) {