X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fdemux.c;h=9aa2105cf7835307ce2d8edec31b61206cb8a342;hb=32b31e87d90967549e5cc8bef18d5aae7e3b98c6;hp=7b8e336a187292847d48bbcd38c9c3522d05a0c0;hpb=3d83c3d94b5f0f7def35aaa1bdd3222300c5bb13;p=vlc diff --git a/src/input/demux.c b/src/input/demux.c index 7b8e336a18..9aa2105cf7 100644 --- a/src/input/demux.c +++ b/src/input/demux.c @@ -1,7 +1,7 @@ /***************************************************************************** * demux.c ***************************************************************************** - * Copyright (C) 1999-2004 VideoLAN + * Copyright (C) 1999-2004 the VideoLAN team * $Id$ * * Author: Laurent Aimar @@ -18,45 +18,55 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include "input_internal.h" +static bool SkipID3Tag( demux_t * ); +static bool SkipAPETag( demux_t *p_demux ); + /***************************************************************************** - * demux2_New: + * demux_New: * if s is NULL then load a access_demux *****************************************************************************/ -demux_t *__demux2_New( vlc_object_t *p_obj, - char *psz_access, char *psz_demux, char *psz_path, - stream_t *s, es_out_t *out ) +demux_t *__demux_New( vlc_object_t *p_obj, + const char *psz_access, const char *psz_demux, + const char *psz_path, + stream_t *s, es_out_t *out, bool b_quick ) { - demux_t *p_demux = vlc_object_create( p_obj, VLC_OBJECT_DEMUX ); - char *psz_module; + static const char typename[] = "demux"; + demux_t *p_demux = vlc_custom_create( p_obj, sizeof( *p_demux ), + VLC_OBJECT_GENERIC, typename ); + const char *psz_module; - if( p_demux == NULL ) - { - return NULL; - } + if( p_demux == NULL ) return NULL; /* Parse URL */ p_demux->psz_access = strdup( psz_access ); p_demux->psz_demux = strdup( psz_demux ); p_demux->psz_path = strdup( psz_path ); - /* Take into account "demux" to be able to do :demux=demuxdump */ - if( *p_demux->psz_demux == '\0' ) + /* Take into account "demux" to be able to do :demux=dump */ + if( p_demux->psz_demux && *p_demux->psz_demux == '\0' ) { free( p_demux->psz_demux ); - p_demux->psz_demux = var_GetString( p_obj, "demux" ); + p_demux->psz_demux = var_GetNonEmptyString( p_obj, "demux" ); + if( p_demux->psz_demux == NULL ) + p_demux->psz_demux = strdup( "" ); } - msg_Dbg( p_obj, "demux2_New: access='%s' demux='%s' path='%s'", - p_demux->psz_access, p_demux->psz_demux, p_demux->psz_path ); + 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 ); + } p_demux->s = s; p_demux->out = out; @@ -68,19 +78,18 @@ demux_t *__demux2_New( vlc_object_t *p_obj, p_demux->info.i_title = 0; p_demux->info.i_seekpoint = 0; - if( s ) - psz_module = p_demux->psz_demux; - else - psz_module = p_demux->psz_access; + 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, '.' ) ) { - /* 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 anyway - * - wav can't be added 'cause of a52 and dts in them as raw audio + /* 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 + * anyway + * - wav can't be added 'cause of a52 and dts in them as raw audio */ - static struct { char *ext; char *demux; } exttodemux[] = - { + static const struct { char ext[5]; char demux[9]; } exttodemux[] = + { { "aac", "aac" }, { "aiff", "aiff" }, { "asf", "asf" }, { "wmv", "asf" }, { "wma", "asf" }, @@ -88,7 +97,7 @@ demux_t *__demux2_New( vlc_object_t *p_obj, { "au", "au" }, { "flac", "flac" }, { "dv", "dv" }, - { "m3u", "m3u" }, + { "m3u", "playlist" }, { "mkv", "mkv" }, { "mka", "mkv" }, { "mks", "mkv" }, { "mp4", "mp4" }, { "m4a", "mp4" }, { "mov", "mp4" }, { "moov", "mp4" }, { "mod", "mod" }, { "xm", "mod" }, @@ -96,19 +105,44 @@ demux_t *__demux2_New( vlc_object_t *p_obj, { "ogg", "ogg" }, { "ogm", "ogg" }, { "pva", "pva" }, { "rm", "rm" }, - { NULL, NULL }, + { "m4v", "m4v" }, + { "h264", "h264" }, + { "", "" }, + }; + /* Here, we don't mind if it does not work, it must be quick */ + static const struct { char ext[4]; char demux[5]; } exttodemux_quick[] = + { + { "mp3", "mpga" }, + { "ogg", "ogg" }, + { "wma", "asf" }, + { "", "" } }; - char *psz_ext = strrchr( p_demux->psz_path, '.' ) + 1; + const char *psz_ext = strrchr( p_demux->psz_path, '.' ) + 1; int i; - for( i = 0; exttodemux[i].ext != NULL; i++ ) + if( !b_quick ) + { + for( i = 0; exttodemux[i].ext[0]; i++ ) + { + if( !strcasecmp( psz_ext, exttodemux[i].ext ) ) + { + psz_module = exttodemux[i].demux; + break; + } + } + } + else { - if( !strcasecmp( psz_ext, exttodemux[i].ext ) ) + for( i = 0; exttodemux_quick[i].ext[0]; i++ ) { - psz_module = exttodemux[i].demux; - break; + if( !strcasecmp( psz_ext, exttodemux_quick[i].ext ) ) + { + psz_module = exttodemux_quick[i].demux; + break; + } } + } } @@ -117,17 +151,23 @@ demux_t *__demux2_New( vlc_object_t *p_obj, if( s ) { + /* ID3/APE tags will mess-up demuxer probing so we skip it here. + * ID3/APE parsers will called later on in the demuxer to access the + * skipped info. */ + if( !SkipID3Tag( p_demux ) ) + SkipAPETag( p_demux ); + p_demux->p_module = - module_Need( p_demux, "demux2", psz_module, + module_Need( p_demux, "demux", psz_module, !strcmp( psz_module, p_demux->psz_demux ) ? - VLC_TRUE : VLC_FALSE ); + true : false ); } else { p_demux->p_module = module_Need( p_demux, "access_demux", psz_module, !strcmp( psz_module, p_demux->psz_access ) ? - VLC_TRUE : VLC_FALSE ); + true : false ); } if( p_demux->p_module == NULL ) @@ -136,7 +176,7 @@ demux_t *__demux2_New( vlc_object_t *p_obj, free( p_demux->psz_path ); free( p_demux->psz_demux ); free( p_demux->psz_access ); - vlc_object_destroy( p_demux ); + vlc_object_release( p_demux ); return NULL; } @@ -144,9 +184,9 @@ demux_t *__demux2_New( vlc_object_t *p_obj, } /***************************************************************************** - * demux2_Delete: + * demux_Delete: *****************************************************************************/ -void demux2_Delete( demux_t *p_demux ) +void demux_Delete( demux_t *p_demux ) { module_Unneed( p_demux, p_demux->p_module ); vlc_object_detach( p_demux ); @@ -155,13 +195,13 @@ void demux2_Delete( demux_t *p_demux ) free( p_demux->psz_demux ); free( p_demux->psz_access ); - vlc_object_destroy( p_demux ); + vlc_object_release( p_demux ); } /***************************************************************************** - * demux2_vaControlHelper: + * demux_vaControlHelper: *****************************************************************************/ -int demux2_vaControlHelper( stream_t *s, +int demux_vaControlHelper( stream_t *s, int64_t i_start, int64_t i_end, int i_bitrate, int i_align, int i_query, va_list args ) @@ -181,7 +221,7 @@ int demux2_vaControlHelper( stream_t *s, pi64 = (int64_t*)va_arg( args, int64_t * ); if( i_bitrate > 0 && i_end > i_start ) { - *pi64 = I64C(8000000) * (i_end - i_start) / i_bitrate; + *pi64 = INT64_C(8000000) * (i_end - i_start) / i_bitrate; return VLC_SUCCESS; } return VLC_EGENERIC; @@ -190,7 +230,7 @@ int demux2_vaControlHelper( stream_t *s, pi64 = (int64_t*)va_arg( args, int64_t * ); if( i_bitrate > 0 && i_end > i_start ) { - *pi64 = I64C(8000000) * (i_tell - i_start) / i_bitrate; + *pi64 = INT64_C(8000000) * (i_tell - i_start) / i_bitrate; return VLC_SUCCESS; } return VLC_EGENERIC; @@ -224,7 +264,7 @@ int demux2_vaControlHelper( stream_t *s, i64 = (int64_t)va_arg( args, int64_t ); if( i_bitrate > 0 && i64 >= 0 ) { - int64_t i_block = i64 * i_bitrate / I64C(8000000) / i_align; + int64_t i_block = i64 * i_bitrate / INT64_C(8000000) / i_align; if( stream_Seek( s, i_start + i_block * i_align ) ) { return VLC_EGENERIC; @@ -235,9 +275,11 @@ int demux2_vaControlHelper( stream_t *s, case DEMUX_GET_FPS: case DEMUX_GET_META: + case DEMUX_HAS_UNSUPPORTED_META: case DEMUX_SET_NEXT_DEMUX_TIME: case DEMUX_GET_TITLE_INFO: case DEMUX_SET_GROUP: + case DEMUX_GET_ATTACHMENTS: return VLC_EGENERIC; default: @@ -265,12 +307,12 @@ typedef struct } d_stream_sys_t; static int DStreamRead ( stream_t *, void *p_read, int i_read ); -static int DStreamPeek ( stream_t *, uint8_t **pp_peek, int i_peek ); +static int DStreamPeek ( stream_t *, const uint8_t **pp_peek, int i_peek ); static int DStreamControl( stream_t *, int i_query, va_list ); static int DStreamThread ( stream_t * ); -stream_t *__stream_DemuxNew( vlc_object_t *p_obj, char *psz_demux, +stream_t *__stream_DemuxNew( vlc_object_t *p_obj, const char *psz_demux, es_out_t *out ) { /* We create a stream reader, and launch a thread */ @@ -279,13 +321,22 @@ stream_t *__stream_DemuxNew( vlc_object_t *p_obj, char *psz_demux, if( psz_demux == NULL || *psz_demux == '\0' ) return NULL; - s = vlc_object_create( p_obj, VLC_OBJECT_STREAM ); - s->pf_block = NULL; + s = vlc_stream_create( p_obj ); + if( s == NULL ) + return NULL; s->pf_read = DStreamRead; s->pf_peek = DStreamPeek; s->pf_control= DStreamControl; + s->i_char_width = 1; + s->b_little_endian = false; + s->p_sys = malloc( sizeof( d_stream_sys_t) ); + if( s->p_sys == NULL ) + { + vlc_object_release( s ); + return NULL; + } p_sys = (d_stream_sys_t*)s->p_sys; p_sys->i_pos = 0; @@ -295,18 +346,19 @@ stream_t *__stream_DemuxNew( vlc_object_t *p_obj, char *psz_demux, p_sys->psz_name = strdup( psz_demux ); /* decoder fifo */ - if( ( p_sys->p_fifo = block_FifoNew( s ) ) == NULL ) + if( ( p_sys->p_fifo = block_FifoNew() ) == NULL ) { - msg_Err( s, "out of memory" ); - vlc_object_destroy( s ); + vlc_object_release( s ); + free( p_sys->psz_name ); free( p_sys ); return NULL; } if( vlc_thread_create( s, "stream out", DStreamThread, - VLC_THREAD_PRIORITY_INPUT, VLC_FALSE ) ) + VLC_THREAD_PRIORITY_INPUT, false ) ) { - vlc_object_destroy( s ); + vlc_object_release( s ); + free( p_sys->psz_name ); free( p_sys ); return NULL; } @@ -323,18 +375,23 @@ void stream_DemuxSend( stream_t *s, block_t *p_block ) void stream_DemuxDelete( stream_t *s ) { d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys; + block_t *p_empty; - s->b_die = VLC_TRUE; - - if( p_sys->p_demux ) p_sys->p_demux->b_die = VLC_TRUE; + vlc_object_kill( s ); + if( p_sys->p_demux ) + vlc_object_kill( p_sys->p_demux ); + p_empty = block_New( s, 1 ); p_empty->i_buffer = 0; + block_FifoPut( p_sys->p_fifo, p_empty ); vlc_thread_join( s ); - if( p_sys->p_demux ) demux2_Delete( p_sys->p_demux ); + if( p_sys->p_demux ) demux_Delete( p_sys->p_demux ); if( p_sys->p_block ) block_Release( p_sys->p_block ); + + block_FifoRelease( p_sys->p_fifo ); free( p_sys->psz_name ); free( p_sys ); - vlc_object_destroy( s ); + vlc_object_release( s ); } @@ -379,7 +436,7 @@ static int DStreamRead( stream_t *s, void *p_read, int i_read ) return i_out; } -static int DStreamPeek( stream_t *s, uint8_t **pp_peek, int i_peek ) +static int DStreamPeek( stream_t *s, const uint8_t **pp_peek, int i_peek ) { d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys; block_t **pp_block = &p_sys->p_block; @@ -421,7 +478,7 @@ static int DStreamControl( stream_t *s, int i_query, va_list args ) { d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys; int64_t *p_i64; - vlc_bool_t *p_b; + bool *p_b; int *p_int; switch( i_query ) @@ -432,13 +489,13 @@ static int DStreamControl( stream_t *s, int i_query, va_list args ) return VLC_SUCCESS; case STREAM_CAN_SEEK: - p_b = (vlc_bool_t*) va_arg( args, vlc_bool_t * ); - *p_b = VLC_FALSE; + p_b = (bool*) va_arg( args, bool * ); + *p_b = false; return VLC_SUCCESS; case STREAM_CAN_FASTSEEK: - p_b = (vlc_bool_t*) va_arg( args, vlc_bool_t * ); - *p_b = VLC_FALSE; + p_b = (bool*) va_arg( args, bool * ); + *p_b = false; return VLC_SUCCESS; case STREAM_GET_POSITION: @@ -468,6 +525,7 @@ static int DStreamControl( stream_t *s, int i_query, va_list args ) return VLC_SUCCESS; case STREAM_CONTROL_ACCESS: + case STREAM_GET_CONTENT_TYPE: return VLC_EGENERIC; default: @@ -482,7 +540,8 @@ static int DStreamThread( stream_t *s ) demux_t *p_demux; /* Create the demuxer */ - if( !(p_demux = demux2_New( s, "", p_sys->psz_name, "", s, p_sys->out )) ) + if( !(p_demux = demux_New( s, "", p_sys->psz_name, "", s, p_sys->out, + false )) ) { return VLC_EGENERIC; } @@ -495,6 +554,74 @@ static int DStreamThread( stream_t *s ) if( p_demux->pf_demux( p_demux ) <= 0 ) break; } - p_demux->b_die = VLC_TRUE; + vlc_object_kill( p_demux ); return VLC_SUCCESS; } + +/**************************************************************************** + * Utility functions + ****************************************************************************/ +static bool SkipID3Tag( demux_t *p_demux ) +{ + const uint8_t *p_peek; + uint8_t version, revision; + int i_size; + int b_footer; + + if( !p_demux->s ) + return false; + + /* Get 10 byte id3 header */ + if( stream_Peek( p_demux->s, &p_peek, 10 ) < 10 ) + return false; + + if( memcmp( p_peek, "ID3", 3 ) ) + return false; + + version = p_peek[3]; + revision = p_peek[4]; + b_footer = p_peek[5] & 0x10; + i_size = (p_peek[6]<<21) + (p_peek[7]<<14) + (p_peek[8]<<7) + p_peek[9]; + + if( b_footer ) i_size += 10; + i_size += 10; + + /* Skip the entire tag */ + stream_Read( p_demux->s, NULL, i_size ); + + msg_Dbg( p_demux, "ID3v2.%d revision %d tag found, skipping %d bytes", + version, revision, i_size ); + return true; +} +static bool SkipAPETag( demux_t *p_demux ) +{ + const uint8_t *p_peek; + int i_version; + int i_size; + uint32_t flags; + + if( !p_demux->s ) + return false; + + /* Get 32 byte ape header */ + if( stream_Peek( p_demux->s, &p_peek, 32 ) < 32 ) + return false; + + if( memcmp( p_peek, "APETAGEX", 8 ) ) + return false; + + i_version = GetDWLE( &p_peek[8] ); + flags = GetDWLE( &p_peek[8+4+4] ); + if( ( i_version != 1000 && i_version != 2000 ) || !( flags & (1<<29) ) ) + return false; + + i_size = GetDWLE( &p_peek[8+4] ) + ( (flags&(1<<30)) ? 32 : 0 ); + + /* Skip the entire tag */ + stream_Read( p_demux->s, NULL, i_size ); + + msg_Dbg( p_demux, "AP2 v%d tag found, skipping %d bytes", + i_version/1000, i_size ); + return true; +} +