/*****************************************************************************
* wav.c : wav file input module for vlc
*****************************************************************************
- * Copyright (C) 2001-2008 the VideoLAN team
+ * Copyright (C) 2001-2008 VLC authors and VideoLAN
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
es_out_id_t *p_es;
int64_t i_data_pos;
- unsigned int i_data_size;
+ int64_t i_data_size;
unsigned int i_frame_size;
int i_frame_samples;
date_t pts;
uint32_t i_channel_mask;
- bool b_chan_reorder; /* do we need channel reordering */
- int pi_chan_table[AOUT_CHAN_MAX];
+ uint8_t i_chans_to_reorder; /* do we need channel reordering */
+ uint8_t pi_chan_table[AOUT_CHAN_MAX];
};
static int ChunkFind( demux_t *, const char *, unsigned int * );
demux_sys_t *p_sys;
const uint8_t *p_peek;
- unsigned int i_size;
- unsigned int i_extended;
- const char *psz_name;
+ bool b_is_rf64;
+ unsigned int i_size;
+ uint64_t i_data_size;
+ unsigned int i_extended;
+ const char *psz_name;
WAVEFORMATEXTENSIBLE *p_wf_ext = NULL;
WAVEFORMATEX *p_wf = NULL;
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 ) )
+ b_is_rf64 = ( memcmp( p_peek, "RF64", 4 ) == 0 );
+ if( ( !b_is_rf64 && memcmp( p_peek, "RIFF", 4 ) ) ||
+ memcmp( &p_peek[8], "WAVE", 4 ) )
{
return VLC_EGENERIC;
}
- p_demux->pf_demux = Demux;
- p_demux->pf_control = Control;
- p_demux->p_sys = p_sys = malloc( sizeof( *p_sys ) );
- if( p_sys == NULL )
+ p_demux->pf_demux = Demux;
+ p_demux->pf_control = Control;
+ p_demux->p_sys = p_sys = malloc( sizeof( *p_sys ) );
+ if( unlikely(!p_sys) )
return VLC_ENOMEM;
- p_sys->p_es = NULL;
- p_sys->b_chan_reorder = false;
+ p_sys->p_es = NULL;
+ p_sys->i_data_size = 0;
+ p_sys->i_chans_to_reorder = 0;
p_sys->i_channel_mask = 0;
/* skip riff header */
if( stream_Read( p_demux->s, NULL, 12 ) != 12 )
goto error;
+ if( b_is_rf64 )
+ {
+ /* search datasize64 chunk */
+ if( ChunkFind( p_demux, "ds64", &i_size ) )
+ {
+ msg_Err( p_demux, "cannot find 'ds64' chunk" );
+ goto error;
+ }
+ if( i_size < 24 )
+ {
+ msg_Err( p_demux, "invalid 'ds64' chunk" );
+ goto error;
+ }
+ if( stream_Read( p_demux->s, NULL, 8 ) != 8 )
+ goto error;
+ if( stream_Peek( p_demux->s, &p_peek, 24 ) < 24 )
+ goto error;
+ i_data_size = GetQWLE( &p_peek[8] );
+ if( i_data_size >> 62 )
+ p_sys->i_data_size = (int64_t)1 << 62;
+ else
+ p_sys->i_data_size = i_data_size;
+ if( stream_Read( p_demux->s, NULL, i_size ) != (int)i_size ||
+ ( (i_size & 1) && stream_Read( p_demux->s, NULL, 1 ) != 1 ) )
+ goto error;
+ }
+
/* search fmt chunk */
if( ChunkFind( p_demux, "fmt ", &i_size ) )
{
/* load waveformatex */
p_wf_ext = malloc( i_size );
- if( p_wf_ext == NULL )
+ if( unlikely( !p_wf_ext ) )
goto error;
- p_wf = &p_wf_ext->Format;
+ p_wf = &p_wf_ext->Format;
p_wf->cbSize = 0;
- i_size -= 2;
+ i_size -= 2;
if( stream_Read( p_demux->s, p_wf, i_size ) != (int)i_size ||
( ( i_size & 1 ) && stream_Read( p_demux->s, NULL, 1 ) != 1 ) )
{
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_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 );
if( i_size >= sizeof(WAVEFORMATEX) )
p_sys->fmt.i_extra = __MIN( GetWLE( &p_wf->cbSize ), i_size - sizeof(WAVEFORMATEX) );
( p_sys->fmt.i_extra + sizeof( WAVEFORMATEX )
>= sizeof( WAVEFORMATEXTENSIBLE ) ) )
{
- unsigned i, i_channel_mask;
+ unsigned i_channel_mask;
GUID guid_subformat;
guid_subformat = p_wf_ext->SubFormat;
if( i_channel_mask )
{
int i_match = 0;
- for( i = 0; i < sizeof(pi_channels_src)/sizeof(*pi_channels_src); i++ )
+ for( unsigned i = 0; i < sizeof(pi_channels_src)/sizeof(*pi_channels_src); i++ )
{
if( i_channel_mask & pi_channels_src[i] )
{
static const uint32_t pi_pair[] = { AOUT_CHAN_REARLEFT|AOUT_CHAN_REARRIGHT,
AOUT_CHAN_MIDDLELEFT|AOUT_CHAN_MIDDLERIGHT,
AOUT_CHAN_LEFT|AOUT_CHAN_RIGHT };
+ /* FIXME: Unused yet
static const uint32_t pi_center[] = { AOUT_CHAN_REARCENTER,
0,
- AOUT_CHAN_CENTER };
+ AOUT_CHAN_CENTER }; */
/* Try to complete with pair */
for( unsigned i = 0; i < sizeof(pi_pair)/sizeof(*pi_pair); i++ )
if( p_sys->i_channel_mask )
{
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 =
+ p_sys->i_chans_to_reorder =
aout_CheckChannelReorder( pi_channels_in, NULL,
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 );
+ msg_Dbg( p_demux, "channel mask: %x, reordering: %u",
+ p_sys->i_channel_mask, p_sys->i_chans_to_reorder );
}
p_sys->fmt.audio.i_physical_channels =
if( p_sys->fmt.i_extra > 0 )
{
p_sys->fmt.p_extra = malloc( p_sys->fmt.i_extra );
- if( !p_sys->fmt.p_extra )
+ if( unlikely(!p_sys->fmt.p_extra) )
{
p_sys->fmt.i_extra = 0;
goto error;
}
- memcpy( p_sys->fmt.p_extra, ((uint8_t *)p_wf) + i_extended,
+ memcpy( p_sys->fmt.p_extra, (uint8_t *)p_wf + sizeof( WAVEFORMATEX ) + i_extended,
p_sys->fmt.i_extra );
}
case VLC_FOURCC( 'u', 'l', 'a', 'w' ):
case VLC_CODEC_ALAW:
case VLC_CODEC_MULAW:
- case VLC_FOURCC( 'p', 'c', 'm', ' ' ):
if( FrameInfo_PCM( &p_sys->i_frame_size, &p_sys->i_frame_samples,
&p_sys->fmt ) )
goto error;
+ p_sys->fmt.i_codec =
+ vlc_fourcc_GetCodecAudio( p_sys->fmt.i_codec,
+ p_sys->fmt.audio.i_bitspersample );
break;
- case VLC_FOURCC( 'm', 's', 0x00, 0x02 ):
+ case VLC_CODEC_ADPCM_MS:
+ /* FIXME not sure at all FIXME */
+ case VLC_FOURCC( 'm', 's', 0x00, 0x61 ):
+ case VLC_FOURCC( 'm', 's', 0x00, 0x62 ):
if( FrameInfo_MS_ADPCM( &p_sys->i_frame_size, &p_sys->i_frame_samples,
&p_sys->fmt ) )
goto error;
break;
- case VLC_FOURCC( 'm', 's', 0x00, 0x11 ):
+ case VLC_CODEC_ADPCM_IMA_WAV:
if( FrameInfo_IMA_ADPCM( &p_sys->i_frame_size, &p_sys->i_frame_samples,
&p_sys->fmt ) )
goto error;
break;
- case VLC_FOURCC( 'm', 's', 0x00, 0x61 ):
- case VLC_FOURCC( 'm', 's', 0x00, 0x62 ):
- /* FIXME not sure at all FIXME */
- if( FrameInfo_MS_ADPCM( &p_sys->i_frame_size, &p_sys->i_frame_samples,
- &p_sys->fmt ) )
- goto error;
- break;
case VLC_CODEC_MPGA:
case VLC_CODEC_A52:
/* FIXME set end of area FIXME */
goto error;
case VLC_CODEC_GSM_MS:
+ case VLC_CODEC_ADPCM_G726:
+ case VLC_CODEC_TRUESPEECH:
+ case VLC_CODEC_ATRAC3:
+ case VLC_CODEC_G723_1:
+ case VLC_CODEC_WMA2:
if( FrameInfo_MSGSM( &p_sys->i_frame_size, &p_sys->i_frame_samples,
&p_sys->fmt ) )
goto error;
if( p_sys->i_frame_size <= 0 || p_sys->i_frame_samples <= 0 )
{
- msg_Dbg( p_demux, "invalid frame size" );
+ msg_Dbg( p_demux, "invalid frame size: %i %i", p_sys->i_frame_size,
+ p_sys->i_frame_samples );
goto error;
}
if( p_sys->fmt.audio.i_rate <= 0 )
{
- msg_Dbg( p_demux, "invalid sample rate" );
+ msg_Dbg( p_demux, "invalid sample rate: %i", p_sys->fmt.audio.i_rate );
goto error;
}
msg_Dbg( p_demux, "found %s audio format", psz_name );
- if( ChunkFind( p_demux, "data", &p_sys->i_data_size ) )
+ if( ChunkFind( p_demux, "data", &i_size ) )
{
msg_Err( p_demux, "cannot find 'data' chunk" );
goto error;
}
+ if( !b_is_rf64 || i_size < UINT32_MAX )
+ p_sys->i_data_size = i_size;
if( stream_Read( p_demux->s, NULL, 8 ) != 8 )
goto error;
p_sys->i_data_pos = stream_Tell( p_demux->s );
return VLC_SUCCESS;
error:
+ msg_Err( p_demux, "An error occurred during wav demuxing" );
free( p_wf );
free( p_sys );
return VLC_EGENERIC;
}
p_block->i_dts =
- p_block->i_pts = date_Increment( &p_sys->pts, p_sys->i_frame_samples );
+ p_block->i_pts = VLC_TS_0 + date_Get( &p_sys->pts );
/* 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 )
+ if( p_sys->i_chans_to_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 );
+ p_sys->pi_chan_table, p_sys->fmt.i_codec );
es_out_Send( p_demux->out, p_sys->p_es, p_block );
+ date_Increment( &p_sys->pts, p_sys->i_frame_samples );
+
return 1;
}
static void Close ( vlc_object_t * p_this )
{
demux_t *p_demux = (demux_t*)p_this;
- demux_sys_t *p_sys = p_demux->p_sys;
+ demux_sys_t *p_sys = p_demux->p_sys;
free( p_sys );
}
projects / vlc / blobdiff