X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fwav.c;h=915cd3e72e0da1cf805463b2c7bb4980b02e1de1;hb=b5c956997c8370a10ad89aff05ac6ec86117367e;hp=6a2c3070e8a82e7e1457975a20edb2c262b1fab2;hpb=b428dafd062b481cadcdfaf330d3f6140ab72bfd;p=vlc diff --git a/modules/demux/wav.c b/modules/demux/wav.c index 6a2c3070e8..915cd3e72e 100644 --- a/modules/demux/wav.c +++ b/modules/demux/wav.c @@ -1,8 +1,8 @@ /***************************************************************************** * wav.c : wav file input module for vlc ***************************************************************************** - * Copyright (C) 2001 VideoLAN - * $Id: wav.c,v 1.4 2003/08/18 00:17:44 fenrir Exp $ + * Copyright (C) 2001-2003 the VideoLAN team + * $Id$ * * Authors: Laurent Aimar * @@ -18,7 +18,7 @@ * * 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. *****************************************************************************/ /***************************************************************************** @@ -28,238 +28,264 @@ #include #include +#include #include -#include /***************************************************************************** * Module descriptor *****************************************************************************/ - -static int Open ( vlc_object_t * ); -static void Close ( vlc_object_t * ); +static int Open ( vlc_object_t * ); +static void Close( vlc_object_t * ); vlc_module_begin(); set_description( _("WAV demuxer") ); - set_capability( "demux", 142 ); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_DEMUX ); + set_capability( "demux2", 142 ); set_callbacks( Open, Close ); vlc_module_end(); /***************************************************************************** * Local prototypes *****************************************************************************/ - -static int Demux ( input_thread_t * ); +static int Demux ( demux_t * ); +static int Control( demux_t *, int i_query, va_list args ); struct demux_sys_t { - stream_t *s; - - WAVEFORMATEX *p_wf; - es_descriptor_t *p_es; + es_format_t fmt; + es_out_id_t *p_es; int64_t i_data_pos; unsigned int i_data_size; - mtime_t i_time; unsigned int i_frame_size; - mtime_t i_frame_length; -}; + int i_frame_samples; + date_t pts; -/***************************************************************************** - * Declaration of local function - *****************************************************************************/ -#define __EVEN( x ) ( ( (x)%2 != 0 ) ? ((x)+1) : (x) ) + uint32_t i_channel_mask; + vlc_bool_t b_chan_reorder; /* do we need channel reordering */ + int pi_chan_table[AOUT_CHAN_MAX]; +}; -static int ChunkFind( input_thread_t *, char *, unsigned int * ); +#define __EVEN( x ) ( ( (x)%2 != 0 ) ? ((x)+1) : (x) ) -static void FrameInfo_IMA_ADPCM( input_thread_t *, unsigned int *, mtime_t * ); -static void FrameInfo_MS_ADPCM ( input_thread_t *, unsigned int *, mtime_t * ); -static void FrameInfo_PCM ( input_thread_t *, unsigned int *, mtime_t * ); +static int ChunkFind( demux_t *, char *, unsigned int * ); + +static void FrameInfo_IMA_ADPCM( demux_t *, unsigned int *, int * ); +static void FrameInfo_MS_ADPCM ( demux_t *, unsigned int *, int * ); +static void FrameInfo_PCM ( demux_t *, unsigned int *, int * ); + +static const uint32_t pi_channels_src[] = + { WAVE_SPEAKER_FRONT_LEFT, WAVE_SPEAKER_FRONT_RIGHT, + WAVE_SPEAKER_FRONT_CENTER, WAVE_SPEAKER_LOW_FREQUENCY, + WAVE_SPEAKER_BACK_LEFT, WAVE_SPEAKER_BACK_RIGHT, + WAVE_SPEAKER_SIDE_LEFT, WAVE_SPEAKER_SIDE_RIGHT, 0 }; +static const uint32_t pi_channels_in[] = + { AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, + AOUT_CHAN_CENTER, AOUT_CHAN_LFE, + AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, + AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT, 0 }; +static const uint32_t pi_channels_out[] = + { AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, + AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT, + AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, + AOUT_CHAN_CENTER, AOUT_CHAN_LFE, 0 }; /***************************************************************************** * Open: check file and initializes structures *****************************************************************************/ static int Open( vlc_object_t * p_this ) { - input_thread_t *p_input = (input_thread_t *)p_this; - demux_sys_t *p_sys; + demux_t *p_demux = (demux_t*)p_this; + demux_sys_t *p_sys; - uint8_t *p_peek; - unsigned int i_size; - vlc_fourcc_t i_fourcc; - char *psz_name; + uint8_t *p_peek; + unsigned int i_size, i_extended; + char *psz_name; + + WAVEFORMATEXTENSIBLE *p_wf_ext; + WAVEFORMATEX *p_wf; /* Is it a wav file ? */ - if( input_Peek( p_input, &p_peek, 12 ) < 12 ) - { - msg_Warn( p_input, "WAV module discarded (cannot peek)" ); - return VLC_EGENERIC; - } - if( strncmp( p_peek, "RIFF", 4 ) || strncmp( &p_peek[8], "WAVE", 4 ) ) + if( stream_Peek( p_demux->s, &p_peek, 12 ) < 12 ) return VLC_EGENERIC; + + if( memcmp( p_peek, "RIFF", 4 ) || memcmp( &p_peek[8], "WAVE", 4 ) ) { - msg_Warn( p_input, "WAV module discarded (not a valid file)" ); return VLC_EGENERIC; } - p_input->pf_demux = Demux; - p_input->p_demux_data = p_sys = malloc( sizeof( demux_sys_t ) ); - p_sys->p_wf = NULL; - p_sys->p_es = NULL; - p_sys->i_time = 0; - - if( ( p_sys->s = stream_OpenInput( p_input ) ) == NULL ) - { - msg_Err( p_input, "cannot create stream" ); - goto error; - } + p_demux->pf_demux = Demux; + p_demux->pf_control = Control; + p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) ); + p_sys->p_es = NULL; + p_sys->b_chan_reorder = 0; + p_sys->i_channel_mask = 0; /* skip riff header */ - stream_Read( p_sys->s, NULL, 12 ); /* cannot fail as peek succeed */ + stream_Read( p_demux->s, NULL, 12 ); /* cannot fail as peek succeed */ /* search fmt chunk */ - if( ChunkFind( p_input, "fmt ", &i_size ) ) + if( ChunkFind( p_demux, "fmt ", &i_size ) ) { - msg_Err( p_input, "cannot find 'fmt ' chunk" ); + msg_Err( p_demux, "cannot find 'fmt ' chunk" ); goto error; } if( i_size < sizeof( WAVEFORMATEX ) - 2 ) /* XXX -2 isn't a typo */ { - msg_Err( p_input, "invalid 'fmt ' chunk" ); + msg_Err( p_demux, "invalid 'fmt ' chunk" ); goto error; } - stream_Read( p_sys->s, NULL, 8 ); /* cannot fail */ + stream_Read( p_demux->s, NULL, 8 ); /* Cannot fail */ /* load waveformatex */ - p_sys->p_wf = malloc( __EVEN( i_size ) + 2 ); /* +2, for raw audio -> no cbSize */ - p_sys->p_wf->cbSize = 0; - if( stream_Read( p_sys->s, p_sys->p_wf, __EVEN( i_size ) ) < (int)__EVEN( i_size ) ) + p_wf_ext = malloc( __EVEN( i_size ) + 2 ); + p_wf = (WAVEFORMATEX *)p_wf_ext; + p_wf->cbSize = 0; + if( stream_Read( p_demux->s, + p_wf, __EVEN( i_size ) ) < (int)__EVEN( i_size ) ) { - msg_Err( p_input, "cannot load 'fmt ' chunk" ); + msg_Err( p_demux, "cannot load 'fmt ' chunk" ); goto error; } - /* le->me */ - p_sys->p_wf->wFormatTag = GetWLE ( &p_sys->p_wf->wFormatTag ); - p_sys->p_wf->nChannels = GetWLE ( &p_sys->p_wf->nChannels ); - p_sys->p_wf->nSamplesPerSec = GetDWLE( &p_sys->p_wf->nSamplesPerSec ); - p_sys->p_wf->nAvgBytesPerSec = GetDWLE( &p_sys->p_wf->nAvgBytesPerSec ); - p_sys->p_wf->nBlockAlign = GetWLE ( &p_sys->p_wf->nBlockAlign ); - p_sys->p_wf->wBitsPerSample = GetWLE ( &p_sys->p_wf->wBitsPerSample ); - p_sys->p_wf->cbSize = GetWLE ( &p_sys->p_wf->cbSize ); - - msg_Dbg( p_input, "format:0x%4.4x channels:%d %dHz %dKo/s blockalign:%d bits/samples:%d extra size:%d", - p_sys->p_wf->wFormatTag, - p_sys->p_wf->nChannels, - p_sys->p_wf->nSamplesPerSec, - p_sys->p_wf->nAvgBytesPerSec / 1024, - p_sys->p_wf->nBlockAlign, - p_sys->p_wf->wBitsPerSample, - p_sys->p_wf->cbSize ); - - if( ChunkFind( p_input, "data", &p_sys->i_data_size ) ) + es_format_Init( &p_sys->fmt, AUDIO_ES, 0 ); + wf_tag_to_fourcc( GetWLE( &p_wf->wFormatTag ), &p_sys->fmt.i_codec, + &psz_name ); + p_sys->fmt.audio.i_channels = GetWLE ( &p_wf->nChannels ); + p_sys->fmt.audio.i_rate = GetDWLE( &p_wf->nSamplesPerSec ); + p_sys->fmt.audio.i_blockalign = GetWLE( &p_wf->nBlockAlign ); + p_sys->fmt.i_bitrate = GetDWLE( &p_wf->nAvgBytesPerSec ) * 8; + p_sys->fmt.audio.i_bitspersample = GetWLE( &p_wf->wBitsPerSample ); + p_sys->fmt.i_extra = GetWLE( &p_wf->cbSize ); + i_extended = 0; + + /* Handle new WAVE_FORMAT_EXTENSIBLE wav files */ + /* see the following link for more information: + * http://www.microsoft.com/whdc/device/audio/multichaud.mspx#EFAA */ + if( GetWLE( &p_wf->wFormatTag ) == WAVE_FORMAT_EXTENSIBLE && + i_size >= sizeof( WAVEFORMATEXTENSIBLE ) ) { - msg_Err( p_input, "cannot find 'data' chunk" ); - goto error; - } + unsigned i, i_channel_mask; + GUID guid_subformat; - stream_Control( p_sys->s, STREAM_GET_POSITION, &p_sys->i_data_pos ); + guid_subformat = p_wf_ext->SubFormat; + guid_subformat.Data1 = GetDWLE( &p_wf_ext->SubFormat.Data1 ); + guid_subformat.Data2 = GetWLE( &p_wf_ext->SubFormat.Data2 ); + guid_subformat.Data3 = GetWLE( &p_wf_ext->SubFormat.Data3 ); - stream_Read( p_sys->s, NULL, 8 ); /* cannot fail */ + sf_tag_to_fourcc( &guid_subformat, &p_sys->fmt.i_codec, &psz_name ); - wf_tag_to_fourcc( p_sys->p_wf->wFormatTag, &i_fourcc, &psz_name ); - if( i_fourcc == VLC_FOURCC( 'u', 'n', 'd', 'f' ) ) - { - msg_Err( p_input,"unrecognize audio format(0x%x)", - p_sys->p_wf->wFormatTag ); - goto error; + i_extended = sizeof( WAVEFORMATEXTENSIBLE ) - sizeof( WAVEFORMATEX ); + p_sys->fmt.i_extra -= i_extended; + + i_channel_mask = GetDWLE( &p_wf_ext->dwChannelMask ); + if( i_channel_mask ) + { + for( i = 0; i < sizeof(pi_channels_src)/sizeof(uint32_t); i++ ) + { + if( i_channel_mask & pi_channels_src[i] ) + p_sys->i_channel_mask |= pi_channels_in[i]; + } + + if( p_sys->fmt.i_codec == VLC_FOURCC('a','r','a','w') || + p_sys->fmt.i_codec == VLC_FOURCC('p','c','m',' ') || + p_sys->fmt.i_codec == VLC_FOURCC('a','f','l','t') ) + + p_sys->b_chan_reorder = + aout_CheckChannelReorder( pi_channels_in, pi_channels_out, + p_sys->i_channel_mask, + p_sys->fmt.audio.i_channels, + p_sys->pi_chan_table ); + + msg_Dbg( p_demux, "channel mask: %x, reordering: %i", + p_sys->i_channel_mask, (int)p_sys->b_chan_reorder ); + } + p_sys->fmt.audio.i_physical_channels = + p_sys->fmt.audio.i_original_channels = + p_sys->i_channel_mask; } - switch( i_fourcc ) + if( p_sys->fmt.i_extra > 0 ) { - case VLC_FOURCC( 'a', 'r', 'a', 'w' ): - case VLC_FOURCC( 'u', 'l', 'a', 'w' ): - case VLC_FOURCC( 'a', 'l', 'a', 'w' ): - FrameInfo_PCM( p_input, &p_sys->i_frame_size, &p_sys->i_frame_length ); - break; - case VLC_FOURCC( 'm', 's', 0x00, 0x02 ): - FrameInfo_MS_ADPCM( p_input, &p_sys->i_frame_size, &p_sys->i_frame_length ); - break; - case VLC_FOURCC( 'm', 's', 0x00, 0x11 ): - FrameInfo_IMA_ADPCM( p_input, &p_sys->i_frame_size, &p_sys->i_frame_length ); - break; - case VLC_FOURCC( 'm', 's', 0x00, 0x61 ): - case VLC_FOURCC( 'm', 's', 0x00, 0x62 ): - /* FIXME not sure at all FIXME */ - FrameInfo_MS_ADPCM( p_input, &p_sys->i_frame_size, &p_sys->i_frame_length ); - break; - case VLC_FOURCC( 'm', 'p', 'g', 'a' ): - case VLC_FOURCC( 'a', '5', '2', ' ' ): - /* FIXME set end of area FIXME */ - goto relay; - default: - msg_Err( p_input, "unsupported codec (%4.4s)", (char*)&i_fourcc ); - goto error; + p_sys->fmt.p_extra = malloc( p_sys->fmt.i_extra ); + memcpy( p_sys->fmt.p_extra, ((uint8_t *)p_wf) + i_extended, + p_sys->fmt.i_extra ); } - msg_Dbg( p_input, "found %s audio format", psz_name ); + msg_Dbg( p_demux, "format: 0x%4.4x, fourcc: %4.4s, channels: %d, " + "freq: %d Hz, bitrate: %dKo/s, blockalign: %d, bits/samples: %d, " + "extra size: %d", + GetWLE( &p_wf->wFormatTag ), (char *)&p_sys->fmt.i_codec, + p_sys->fmt.audio.i_channels, p_sys->fmt.audio.i_rate, + p_sys->fmt.i_bitrate / 8 / 1024, p_sys->fmt.audio.i_blockalign, + p_sys->fmt.audio.i_bitspersample, p_sys->fmt.i_extra ); - /* create one program */ - vlc_mutex_lock( &p_input->stream.stream_lock ); - if( input_InitStream( p_input, 0 ) == -1) + free( p_wf ); + + switch( p_sys->fmt.i_codec ) { - vlc_mutex_unlock( &p_input->stream.stream_lock ); - msg_Err( p_input, "cannot init stream" ); + case VLC_FOURCC( 'a', 'r', 'a', 'w' ): + case VLC_FOURCC( 'a', 'f', 'l', 't' ): + case VLC_FOURCC( 'u', 'l', 'a', 'w' ): + case VLC_FOURCC( 'a', 'l', 'a', 'w' ): + case VLC_FOURCC( 'm', 'l', 'a', 'w' ): + case VLC_FOURCC( 'p', 'c', 'm', ' ' ): + FrameInfo_PCM( p_demux, &p_sys->i_frame_size, + &p_sys->i_frame_samples ); + break; + case VLC_FOURCC( 'm', 's', 0x00, 0x02 ): + FrameInfo_MS_ADPCM( p_demux, &p_sys->i_frame_size, + &p_sys->i_frame_samples ); + break; + case VLC_FOURCC( 'm', 's', 0x00, 0x11 ): + FrameInfo_IMA_ADPCM( p_demux, &p_sys->i_frame_size, + &p_sys->i_frame_samples ); + break; + case VLC_FOURCC( 'm', 's', 0x00, 0x61 ): + case VLC_FOURCC( 'm', 's', 0x00, 0x62 ): + /* FIXME not sure at all FIXME */ + FrameInfo_MS_ADPCM( p_demux, &p_sys->i_frame_size, + &p_sys->i_frame_samples ); + break; + case VLC_FOURCC( 'm', 'p', 'g', 'a' ): + case VLC_FOURCC( 'a', '5', '2', ' ' ): + /* FIXME set end of area FIXME */ + goto relay; + default: + msg_Err( p_demux, "unsupported codec (%4.4s)", + (char*)&p_sys->fmt.i_codec ); goto error; } - if( input_AddProgram( p_input, 0, 0) == NULL ) + + msg_Dbg( p_demux, "found %s audio format", psz_name ); + + if( ChunkFind( p_demux, "data", &p_sys->i_data_size ) ) { - vlc_mutex_unlock( &p_input->stream.stream_lock ); - msg_Err( p_input, "cannot add program" ); + msg_Err( p_demux, "cannot find 'data' chunk" ); goto error; } - p_input->stream.p_selected_program = p_input->stream.pp_programs[0]; + stream_Read( p_demux->s, NULL, 8 ); /* Cannot fail */ + p_sys->i_data_pos = stream_Tell( p_demux->s ); - if( p_sys->i_data_size > 0 ) - { - p_input->stream.i_mux_rate = (mtime_t)p_sys->i_frame_size * - (mtime_t)1000000 / 50 / p_sys->i_frame_length; - } - else + if( p_sys->fmt.i_bitrate <= 0 ) { - p_input->stream.i_mux_rate = 0; + p_sys->fmt.i_bitrate = (mtime_t)p_sys->i_frame_size * + p_sys->fmt.audio.i_rate * 8 / p_sys->i_frame_samples; } - p_sys->p_es = input_AddES( p_input, - p_input->stream.p_selected_program, - 1, AUDIO_ES, NULL, 0 ); - p_sys->p_es->i_stream_id = 1; - p_sys->p_es->i_fourcc = i_fourcc; - p_sys->p_es->p_waveformatex = malloc( sizeof( WAVEFORMATEX ) + p_sys->p_wf->cbSize ); - memcpy( p_sys->p_es->p_waveformatex, - p_sys->p_wf, - sizeof( WAVEFORMATEX ) + p_sys->p_wf->cbSize ); + p_sys->p_es = es_out_Add( p_demux->out, &p_sys->fmt ); - input_SelectES( p_input, p_sys->p_es ); - - p_input->stream.p_selected_program->b_is_ok = 1; - vlc_mutex_unlock( &p_input->stream.stream_lock ); + date_Init( &p_sys->pts, p_sys->fmt.audio.i_rate, 1 ); + date_Set( &p_sys->pts, 1 ); return VLC_SUCCESS; error: relay: - if( p_sys->p_wf ) - { - free( p_sys->p_wf ); - } - if( p_sys->s ) - { - stream_Release( p_sys->s ); - } free( p_sys ); - return VLC_EGENERIC; } @@ -268,30 +294,13 @@ relay: ***************************************************************************** * Returns -1 in case of error, 0 in case of EOF, 1 otherwise *****************************************************************************/ -static int Demux( input_thread_t *p_input ) +static int Demux( demux_t *p_demux ) { - demux_sys_t *p_sys = p_input->p_demux_data; - int64_t i_pos; - pes_packet_t *p_pes; - - if( p_input->stream.p_selected_program->i_synchro_state == SYNCHRO_REINIT ) - { - stream_Control( p_sys->s, STREAM_GET_POSITION, &i_pos ); - if( p_sys->p_wf->nBlockAlign != 0 ) - { - i_pos += p_sys->p_wf->nBlockAlign - i_pos % p_sys->p_wf->nBlockAlign; - if( stream_Control( p_sys->s, STREAM_SET_POSITION, i_pos ) ) - { - msg_Err( p_input, "STREAM_SET_POSITION failed (cannot resync)" ); - } - } - } - - input_ClockManageRef( p_input, - p_input->stream.p_selected_program, - p_sys->i_time * 9 / 100 ); + demux_sys_t *p_sys = p_demux->p_sys; + int64_t i_pos; + block_t *p_block; - stream_Control( p_sys->s, STREAM_GET_POSITION, &i_pos ); + i_pos = stream_Tell( p_demux->s ); if( p_sys->i_data_size > 0 && i_pos >= p_sys->i_data_pos + p_sys->i_data_size ) @@ -300,26 +309,28 @@ static int Demux( input_thread_t *p_input ) return 0; } - if( ( p_pes = stream_PesPacket( p_sys->s, p_sys->i_frame_size ) ) == NULL ) + if( ( p_block = stream_Block( p_demux->s, p_sys->i_frame_size ) ) == NULL ) { - msg_Warn( p_input, "cannot read data" ); + msg_Warn( p_demux, "cannot read data" ); return 0; } - p_pes->i_dts = - p_pes->i_pts = input_ClockGetTS( p_input, - p_input->stream.p_selected_program, - p_sys->i_time * 9 / 100 ); - if( !p_sys->p_es->p_decoder_fifo ) - { - msg_Err( p_input, "no audio decoder" ); - input_DeletePES( p_input->p_method_data, p_pes ); - return( -1 ); - } + p_block->i_dts = p_block->i_pts = + date_Increment( &p_sys->pts, p_sys->i_frame_samples ); + + /* set PCR */ + es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block->i_pts ); + + /* Do the channel reordering */ + if( p_sys->b_chan_reorder ) + aout_ChannelReorder( p_block->p_buffer, p_block->i_buffer, + p_sys->fmt.audio.i_channels, + p_sys->pi_chan_table, + p_sys->fmt.audio.i_bitspersample ); - input_DecodePES( p_sys->p_es->p_decoder_fifo, p_pes ); - p_sys->i_time += p_sys->i_frame_length; - return( 1 ); + es_out_Send( p_demux->out, p_sys->p_es, p_block ); + + return 1; } /***************************************************************************** @@ -327,39 +338,53 @@ static int Demux( input_thread_t *p_input ) *****************************************************************************/ static void Close ( vlc_object_t * p_this ) { - input_thread_t *p_input = (input_thread_t *)p_this; - demux_sys_t *p_sys = p_input->p_demux_data; + demux_t *p_demux = (demux_t*)p_this; + demux_sys_t *p_sys = p_demux->p_sys; - stream_Release( p_sys->s ); - free( p_sys->p_wf ); free( p_sys ); } +/***************************************************************************** + * Control: + *****************************************************************************/ +static int Control( demux_t *p_demux, int i_query, va_list args ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + int64_t i_end = -1; + + if( p_sys->i_data_size > 0 ) + { + i_end = p_sys->i_data_pos + p_sys->i_data_size; + } + + return demux2_vaControlHelper( p_demux->s, p_sys->i_data_pos, i_end, + p_sys->fmt.i_bitrate, + p_sys->fmt.audio.i_blockalign, + i_query, args ); +} /***************************************************************************** * Local functions *****************************************************************************/ -static int ChunkFind( input_thread_t *p_input, - char *fcc, unsigned int *pi_size ) +static int ChunkFind( demux_t *p_demux, char *fcc, unsigned int *pi_size ) { - demux_sys_t *p_sys = p_input->p_demux_data; - uint8_t *p_peek; + uint8_t *p_peek; for( ;; ) { int i_size; - if( stream_Peek( p_sys->s, &p_peek, 8 ) < 8 ) + if( stream_Peek( p_demux->s, &p_peek, 8 ) < 8 ) { - msg_Err( p_input, "cannot peek()" ); + msg_Err( p_demux, "cannot peek()" ); return VLC_EGENERIC; } i_size = GetDWLE( p_peek + 4 ); - msg_Dbg( p_input, "Chunk: fcc=`%4.4s` size=%d", p_peek, i_size ); + msg_Dbg( p_demux, "chunk: fcc=`%4.4s` size=%d", p_peek, i_size ); - if( !strncmp( p_peek, fcc, 4 ) ) + if( !memcmp( p_peek, fcc, 4 ) ) { if( pi_size ) { @@ -369,74 +394,54 @@ static int ChunkFind( input_thread_t *p_input, } i_size = __EVEN( i_size ) + 8; - if( stream_Read( p_sys->s, NULL, i_size ) != i_size ) + if( stream_Read( p_demux->s, NULL, i_size ) != i_size ) { return VLC_EGENERIC; } } } -static void FrameInfo_PCM( input_thread_t *p_input, - unsigned int *pi_size, - mtime_t *pi_length ) +static void FrameInfo_PCM( demux_t *p_demux, unsigned int *pi_size, + int *pi_samples ) { - WAVEFORMATEX *p_wf = p_input->p_demux_data->p_wf; - int i_samples; - - int i_bytes; - int i_modulo; + demux_sys_t *p_sys = p_demux->p_sys; + int i_bytes, i_modulo; /* read samples for 50ms of */ - i_samples = __MAX( p_wf->nSamplesPerSec / 20, 1 ); - - - *pi_length = (mtime_t)1000000 * - (mtime_t)i_samples / - (mtime_t)p_wf->nSamplesPerSec; + *pi_samples = __MAX( p_sys->fmt.audio.i_rate / 20, 1 ); - i_bytes = i_samples * p_wf->nChannels * ( (p_wf->wBitsPerSample + 7) / 8 ); + i_bytes = *pi_samples * p_sys->fmt.audio.i_channels * + ( (p_sys->fmt.audio.i_bitspersample + 7) / 8 ); - if( p_wf->nBlockAlign > 0 ) + if( p_sys->fmt.audio.i_blockalign > 0 ) { - if( ( i_modulo = i_bytes % p_wf->nBlockAlign ) != 0 ) + if( ( i_modulo = i_bytes % p_sys->fmt.audio.i_blockalign ) != 0 ) { - i_bytes += p_wf->nBlockAlign - i_modulo; + i_bytes += p_sys->fmt.audio.i_blockalign - i_modulo; } } + *pi_size = i_bytes; } -static void FrameInfo_MS_ADPCM( input_thread_t *p_input, - unsigned int *pi_size, - mtime_t *pi_length ) +static void FrameInfo_MS_ADPCM( demux_t *p_demux, unsigned int *pi_size, + int *pi_samples ) { - WAVEFORMATEX *p_wf = p_input->p_demux_data->p_wf; - int i_samples; - - i_samples = 2 + 2 * ( p_wf->nBlockAlign - - 7 * p_wf->nChannels ) / p_wf->nChannels; + demux_sys_t *p_sys = p_demux->p_sys; - *pi_length = (mtime_t)1000000 * - (mtime_t)i_samples / - (mtime_t)p_wf->nSamplesPerSec; + *pi_samples = 2 + 2 * ( p_sys->fmt.audio.i_blockalign - + 7 * p_sys->fmt.audio.i_channels ) / p_sys->fmt.audio.i_channels; - *pi_size = p_wf->nBlockAlign; + *pi_size = p_sys->fmt.audio.i_blockalign; } -static void FrameInfo_IMA_ADPCM( input_thread_t *p_input, - unsigned int *pi_size, - mtime_t *pi_length ) +static void FrameInfo_IMA_ADPCM( demux_t *p_demux, unsigned int *pi_size, + int *pi_samples ) { - WAVEFORMATEX *p_wf = p_input->p_demux_data->p_wf; - int i_samples; + demux_sys_t *p_sys = p_demux->p_sys; - i_samples = 2 * ( p_wf->nBlockAlign - - 4 * p_wf->nChannels ) / p_wf->nChannels; + *pi_samples = 2 * ( p_sys->fmt.audio.i_blockalign - + 4 * p_sys->fmt.audio.i_channels ) / p_sys->fmt.audio.i_channels; - *pi_length = (mtime_t)1000000 * - (mtime_t)i_samples / - (mtime_t)p_wf->nSamplesPerSec; - - *pi_size = p_wf->nBlockAlign; + *pi_size = p_sys->fmt.audio.i_blockalign; } -