X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fdemux.c;h=9aa2105cf7835307ce2d8edec31b61206cb8a342;hb=d727c4590f83751a2f28fcdfd8af3886ebeb45d8;hp=1c168eb5faa924fa5d5e4cef2fe51f2448291267;hpb=c046c7392fe5e0c8fac0f605631aa4ef491f2a5a;p=vlc diff --git a/src/input/demux.c b/src/input/demux.c index 1c168eb5fa..9aa2105cf7 100644 --- a/src/input/demux.c +++ b/src/input/demux.c @@ -21,22 +21,29 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include #include "input_internal.h" -static void SkipID3Tag( demux_t * ); +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, +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, vlc_bool_t b_quick ) + stream_t *s, es_out_t *out, bool b_quick ) { - demux_t *p_demux = vlc_object_create( p_obj, VLC_OBJECT_DEMUX ); + 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; @@ -47,7 +54,7 @@ demux_t *__demux2_New( vlc_object_t *p_obj, p_demux->psz_path = strdup( psz_path ); /* Take into account "demux" to be able to do :demux=dump */ - if( *p_demux->psz_demux == '\0' ) + if( p_demux->psz_demux && *p_demux->psz_demux == '\0' ) { free( p_demux->psz_demux ); p_demux->psz_demux = var_GetNonEmptyString( p_obj, "demux" ); @@ -144,22 +151,23 @@ demux_t *__demux2_New( vlc_object_t *p_obj, if( s ) { - /* ID3 tags will mess-up demuxer probing so we skip it here. - * ID3 parsers will called later on in the demuxer to access the + /* 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. */ - SkipID3Tag( p_demux ); + 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 ) @@ -168,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; } @@ -176,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 ); @@ -187,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 ) @@ -213,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; @@ -222,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; @@ -256,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; @@ -314,14 +322,21 @@ stream_t *__stream_DemuxNew( vlc_object_t *p_obj, const char *psz_demux, if( psz_demux == NULL || *psz_demux == '\0' ) return 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 = VLC_FALSE; + 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; @@ -331,18 +346,19 @@ stream_t *__stream_DemuxNew( vlc_object_t *p_obj, const 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; } @@ -368,14 +384,14 @@ void stream_DemuxDelete( stream_t *s ) 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 ); } @@ -462,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 ) @@ -473,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: @@ -524,8 +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, - VLC_FALSE )) ) + if( !(p_demux = demux_New( s, "", p_sys->psz_name, "", s, p_sys->out, + false )) ) { return VLC_EGENERIC; } @@ -545,19 +561,22 @@ static int DStreamThread( stream_t *s ) /**************************************************************************** * Utility functions ****************************************************************************/ -static void SkipID3Tag( demux_t *p_demux ) +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; + if( !p_demux->s ) + return false; /* Get 10 byte id3 header */ - if( stream_Peek( p_demux->s, &p_peek, 10 ) < 10 ) return; + if( stream_Peek( p_demux->s, &p_peek, 10 ) < 10 ) + return false; - if( p_peek[0] != 'I' || p_peek[1] != 'D' || p_peek[2] != '3' ) return; + if( memcmp( p_peek, "ID3", 3 ) ) + return false; version = p_peek[3]; revision = p_peek[4]; @@ -572,6 +591,37 @@ static void SkipID3Tag( demux_t *p_demux ) 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; - return; + 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; } +