X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Faiff.c;h=a236582b10f77af91bd450a81b68baae88f6d24d;hb=3ebe37d27e97cafa647292eca25ee77c4c207501;hp=da98254d1cb2913b33495a04d3520fd274d3c1c5;hpb=d3fe7f28797d4dba65ffcdd60bf932e758a48a9e;p=vlc diff --git a/modules/demux/aiff.c b/modules/demux/aiff.c index da98254d1c..a236582b10 100644 --- a/modules/demux/aiff.c +++ b/modules/demux/aiff.c @@ -1,7 +1,7 @@ /***************************************************************************** * aiff.c: Audio Interchange File Format demuxer ***************************************************************************** - * Copyright (C) 2004 the VideoLAN team + * Copyright (C) 2004-2007 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -24,9 +24,13 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include /* TODO: @@ -39,14 +43,14 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -vlc_module_begin(); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_description( _("AIFF demuxer" ) ); - set_capability( "demux2", 10 ); - set_callbacks( Open, Close ); - add_shortcut( "aiff" ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_description( N_("AIFF demuxer" ) ) + set_capability( "demux", 10 ) + set_callbacks( Open, Close ) + add_shortcut( "aiff" ) +vlc_module_end () /***************************************************************************** * Local prototypes @@ -75,13 +79,13 @@ static int Demux ( demux_t *p_demux ); static int Control( demux_t *p_demux, int i_query, va_list args ); /* GetF80BE: read a 80 bits float in big endian */ -static unsigned int GetF80BE( uint8_t p[10] ) +static unsigned int GetF80BE( const uint8_t p[10] ) { unsigned int i_mantissa = GetDWBE( &p[2] ); int i_exp = 30 - p[1]; unsigned int i_last = 0; - while( i_exp-- ) + while( i_exp-- > 0 ) { i_last = i_mantissa; i_mantissa >>= 1; @@ -101,35 +105,38 @@ static int Open( vlc_object_t *p_this ) demux_t *p_demux = (demux_t*)p_this; demux_sys_t *p_sys; - uint8_t *p_peek; + const uint8_t *p_peek; - if( stream_Peek( p_demux->s, &p_peek, 12 ) < 12 ) return VLC_EGENERIC; - if( strncmp( (char *)&p_peek[0], "FORM", 4 ) || strncmp( (char *)&p_peek[8], "AIFF", 4 ) ) - { + if( stream_Peek( p_demux->s, &p_peek, 12 ) < 12 ) + return VLC_EGENERIC; + if( memcmp( p_peek, "FORM", 4 ) || memcmp( &p_peek[8], "AIFF", 4 ) ) return VLC_EGENERIC; - } /* skip aiff header */ stream_Read( p_demux->s, NULL, 12 ); /* Fill p_demux field */ - STANDARD_DEMUX_INIT; p_sys = p_demux->p_sys; + DEMUX_INIT_COMMON(); p_sys = p_demux->p_sys; es_format_Init( &p_sys->fmt, UNKNOWN_ES, 0 ); - p_sys->i_time = 1; + p_sys->i_time = 0; p_sys->i_ssnd_pos = -1; for( ;; ) { uint32_t i_size; - CHECK_PEEK_GOTO( p_peek, 8 ); + if( stream_Peek( p_demux->s, &p_peek, 8 ) < 8 ) + goto error; + i_size = GetDWBE( &p_peek[4] ); msg_Dbg( p_demux, "chunk fcc=%4.4s size=%d", p_peek, i_size ); - if( !strncmp( (char *)&p_peek[0], "COMM", 4 ) ) + if( !memcmp( p_peek, "COMM", 4 ) ) { - CHECK_PEEK_GOTO( p_peek, 18+8 ); + if( stream_Peek( p_demux->s, &p_peek, 18+8 ) < 18+8 ) + goto error; + es_format_Init( &p_sys->fmt, AUDIO_ES, VLC_FOURCC( 't', 'w', 'o', 's' ) ); p_sys->fmt.audio.i_channels = GetWBE( &p_peek[8] ); p_sys->fmt.audio.i_bitspersample = GetWBE( &p_peek[14] ); @@ -138,9 +145,11 @@ static int Open( vlc_object_t *p_this ) msg_Dbg( p_demux, "COMM: channels=%d samples_frames=%d bits=%d rate=%d", GetWBE( &p_peek[8] ), GetDWBE( &p_peek[10] ), GetWBE( &p_peek[14] ), GetF80BE( &p_peek[16] ) ); } - else if( !strncmp( (char *)&p_peek[0], "SSND", 4 ) ) + else if( !memcmp( p_peek, "SSND", 4 ) ) { - CHECK_PEEK_GOTO( p_peek, 8+8 ); + if( stream_Peek( p_demux->s, &p_peek, 8+8 ) < 8+8 ) + goto error; + p_sys->i_ssnd_pos = stream_Tell( p_demux->s ); p_sys->i_ssnd_size = i_size; p_sys->i_ssnd_offset = GetDWBE( &p_peek[8] ); @@ -157,6 +166,8 @@ static int Open( vlc_object_t *p_this ) /* Skip this chunk */ i_size += 8; + if( (i_size % 2) != 0 ) + i_size++; if( stream_Read( p_demux->s, NULL, i_size ) != (int)i_size ) { msg_Warn( p_demux, "incomplete file" ); @@ -168,7 +179,7 @@ static int Open( vlc_object_t *p_this ) p_sys->i_ssnd_end = p_sys->i_ssnd_start + p_sys->i_ssnd_size; p_sys->i_ssnd_fsize = p_sys->fmt.audio.i_channels * - ( p_sys->fmt.audio.i_bitspersample + 7 ) / 8; + ((p_sys->fmt.audio.i_bitspersample + 7) / 8); if( p_sys->i_ssnd_fsize <= 0 ) { @@ -229,7 +240,7 @@ static int Demux( demux_t *p_demux ) } /* Set PCR */ - es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_time); + es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_sys->i_time); /* we will read 100ms at once */ i_read = p_sys->i_ssnd_fsize * ( p_sys->fmt.audio.i_rate / 10 ); @@ -243,7 +254,7 @@ static int Demux( demux_t *p_demux ) } p_block->i_dts = - p_block->i_pts = p_sys->i_time; + p_block->i_pts = VLC_TS_0 + p_sys->i_time; p_sys->i_time += (int64_t)1000000 * p_block->i_buffer / @@ -298,7 +309,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) { return VLC_EGENERIC; } - p_sys->i_time = 1 + (int64_t)1000000 * i_frame / p_sys->fmt.audio.i_rate; + p_sys->i_time = (int64_t)1000000 * i_frame / p_sys->fmt.audio.i_rate; return VLC_SUCCESS; } return VLC_EGENERIC;