/*****************************************************************************
* wav.c : wav file input module for vlc
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: wav.c,v 1.5 2003/08/22 20:32:27 fenrir Exp $
+ * Copyright (C) 2001-2008 the VideoLAN team
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
*
* 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.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <vlc/vlc.h>
-#include <vlc/input.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include <codecs.h>
-#include <ninput.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_demux.h>
+#include <vlc_aout.h>
+#include <vlc_codecs.h>
/*****************************************************************************
* 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_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+ set_description( N_("WAV demuxer") )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_DEMUX )
+ set_capability( "demux", 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;
+ bool b_chan_reorder; /* do we need channel reordering */
+ int pi_chan_table[AOUT_CHAN_MAX];
+};
-static int ChunkFind( input_thread_t *, char *, unsigned int * );
+static int ChunkFind( demux_t *, const char *, unsigned int * );
-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 FrameInfo_IMA_ADPCM( unsigned int *, int *, const es_format_t * );
+static int FrameInfo_MS_ADPCM ( unsigned int *, int *, const es_format_t * );
+static int FrameInfo_PCM ( unsigned int *, int *, const es_format_t * );
+static int FrameInfo_MSGSM ( unsigned int *, int *, const es_format_t * );
+
+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_BACK_CENTER,
+ 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_REARCENTER,
+ AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT, 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;
+
+ const uint8_t *p_peek;
+ unsigned int i_size;
+ unsigned int i_extended;
+ const char *psz_name;
- uint8_t *p_peek;
- unsigned int i_size;
- vlc_fourcc_t i_fourcc;
- char *psz_name;
+ WAVEFORMATEXTENSIBLE *p_wf_ext = NULL;
+ WAVEFORMATEX *p_wf = NULL;
/* Is it a wav file ? */
- if( input_Peek( p_input, &p_peek, 12 ) < 12 )
- {
- msg_Warn( p_input, "WAV module discarded (cannot peek)" );
+ if( stream_Peek( p_demux->s, &p_peek, 12 ) < 12 )
return VLC_EGENERIC;
- }
- if( strncmp( p_peek, "RIFF", 4 ) || strncmp( &p_peek[8], "WAVE", 4 ) )
+
+ 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;
+ p_demux->pf_demux = Demux;
+ p_demux->pf_control = Control;
+ p_demux->p_sys = p_sys = malloc( sizeof( *p_sys ) );
+ if( p_sys == NULL )
+ return VLC_ENOMEM;
- if( ( p_sys->s = stream_OpenInput( p_input ) ) == NULL )
- {
- msg_Err( p_input, "cannot create stream" );
- goto error;
- }
+ p_sys->p_es = NULL;
+ p_sys->b_chan_reorder = false;
+ p_sys->i_channel_mask = 0;
/* skip riff header */
- stream_Read( p_sys->s, NULL, 12 ); /* cannot fail as peek succeed */
+ if( stream_Read( p_demux->s, NULL, 12 ) != 12 )
+ goto error;
/* 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 */
+ i_size += 2;
+ if( i_size < sizeof( WAVEFORMATEX ) )
{
- 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 */
+ if( stream_Read( p_demux->s, NULL, 8 ) != 8 )
+ goto error;
+
/* 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( i_size );
+ if( p_wf_ext == NULL )
+ goto error;
+
+ p_wf = &p_wf_ext->Format;
+ p_wf->cbSize = 0;
+ 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 ) )
{
- 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 );
+ if( i_size >= sizeof(WAVEFORMATEX) )
+ p_sys->fmt.i_extra = __MIN( GetWLE( &p_wf->cbSize ), i_size - sizeof(WAVEFORMATEX) );
+ 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 ) &&
+ ( p_sys->fmt.i_extra + sizeof( WAVEFORMATEX )
+ >= sizeof( WAVEFORMATEXTENSIBLE ) ) )
{
- msg_Err( p_input, "cannot find 'data' chunk" );
- goto error;
- }
+ unsigned i, i_channel_mask;
+ GUID guid_subformat;
+
+ 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 );
+
+ sf_tag_to_fourcc( &guid_subformat, &p_sys->fmt.i_codec, &psz_name );
+
+ 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 )
+ {
+ int i_match = 0;
+ for( i = 0; i < sizeof(pi_channels_src)/sizeof(*pi_channels_src); i++ )
+ {
+ if( i_channel_mask & pi_channels_src[i] )
+ {
+ if( !( p_sys->i_channel_mask & pi_channels_in[i] ) )
+ i_match++;
- p_sys->i_data_pos = stream_Tell( p_sys->s );
+ i_channel_mask &= ~pi_channels_src[i];
+ p_sys->i_channel_mask |= pi_channels_in[i];
- stream_Read( p_sys->s, NULL, 8 ); /* cannot fail */
+ if( i_match >= p_sys->fmt.audio.i_channels )
+ break;
+ }
+ }
+ if( i_channel_mask )
+ msg_Warn( p_demux, "Some channels are unrecognized or uselessly specified (0x%x)", i_channel_mask );
+ if( i_match < p_sys->fmt.audio.i_channels )
+ {
+ int i_missing = p_sys->fmt.audio.i_channels - i_match;
+ msg_Warn( p_demux, "Trying to fill up unspecified position for %d channels", p_sys->fmt.audio.i_channels - i_match );
+
+ 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 }; */
+
+ /* Try to complete with pair */
+ for( unsigned i = 0; i < sizeof(pi_pair)/sizeof(*pi_pair); i++ )
+ {
+ if( i_missing >= 2 && !(p_sys->i_channel_mask & pi_pair[i] ) )
+ {
+ i_missing -= 2;
+ p_sys->i_channel_mask |= pi_pair[i];
+ }
+ }
+ /* Well fill up with what we can */
+ for( unsigned i = 0; i < sizeof(pi_channels_in)/sizeof(*pi_channels_in) && i_missing > 0; i++ )
+ {
+ if( !( p_sys->i_channel_mask & pi_channels_in[i] ) )
+ {
+ p_sys->i_channel_mask |= pi_channels_in[i];
+ i_missing--;
+
+ if( i_missing <= 0 )
+ break;
+ }
+ }
+
+ i_match = p_sys->fmt.audio.i_channels - i_missing;
+ }
+ if( i_match < p_sys->fmt.audio.i_channels )
+ {
+ msg_Err( p_demux, "Invalid/unsupported channel mask" );
+ p_sys->i_channel_mask = 0;
+ }
+ }
+ }
+ else if( GetWLE( &p_wf->wFormatTag ) == WAVE_FORMAT_PCM &&
+ p_sys->fmt.audio.i_channels > 2 && p_sys->fmt.audio.i_channels <= 9 )
+ {
+ for( int i = 0; i < p_sys->fmt.audio.i_channels; i++ )
+ p_sys->i_channel_mask |= pi_channels_in[i];
+ }
- wf_tag_to_fourcc( p_sys->p_wf->wFormatTag, &i_fourcc, &psz_name );
- if( i_fourcc == VLC_FOURCC( 'u', 'n', 'd', 'f' ) )
+ if( p_sys->i_channel_mask )
{
- msg_Err( p_input,"unrecognize audio format(0x%x)",
- p_sys->p_wf->wFormatTag );
- goto error;
+ 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, 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 );
}
- switch( i_fourcc )
+ p_sys->fmt.audio.i_physical_channels =
+ p_sys->fmt.audio.i_original_channels = p_sys->i_channel_mask;
+
+ 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 );
+ p_sys->fmt.p_extra = malloc( p_sys->fmt.i_extra );
+ if( !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,
+ 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: %u Hz, bitrate: %uKo/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 );
+ p_wf = NULL;
+
+ 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_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;
+ break;
+ case VLC_CODEC_ADPCM_MS:
+ if( FrameInfo_MS_ADPCM( &p_sys->i_frame_size, &p_sys->i_frame_samples,
+ &p_sys->fmt ) )
+ goto error;
+ break;
+ 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:
+ if( FrameInfo_MSGSM( &p_sys->i_frame_size, &p_sys->i_frame_samples,
+ &p_sys->fmt ) )
+ goto error;
+ break;
+ 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 )
+
+ if( p_sys->i_frame_size <= 0 || p_sys->i_frame_samples <= 0 )
{
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- msg_Err( p_input, "cannot add program" );
+ msg_Dbg( p_demux, "invalid frame size: %i %i", p_sys->i_frame_size,
+ p_sys->i_frame_samples );
goto error;
}
- p_input->stream.p_selected_program = p_input->stream.pp_programs[0];
-
- if( p_sys->i_data_size > 0 )
+ if( p_sys->fmt.audio.i_rate <= 0 )
{
- p_input->stream.i_mux_rate = (mtime_t)p_sys->i_frame_size *
- (mtime_t)1000000 / 50 / p_sys->i_frame_length;
+ msg_Dbg( p_demux, "invalid sample rate: %i", p_sys->fmt.audio.i_rate );
+ goto error;
}
- else
+
+ msg_Dbg( p_demux, "found %s audio format", psz_name );
+
+ if( ChunkFind( p_demux, "data", &p_sys->i_data_size ) )
{
- p_input->stream.i_mux_rate = 0;
+ msg_Err( p_demux, "cannot find 'data' chunk" );
+ goto error;
}
+ if( stream_Read( p_demux->s, NULL, 8 ) != 8 )
+ goto error;
+ p_sys->i_data_pos = stream_Tell( p_demux->s );
- 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 );
+ if( p_sys->fmt.i_bitrate <= 0 )
+ {
+ p_sys->fmt.i_bitrate = (int64_t)p_sys->i_frame_size *
+ p_sys->fmt.audio.i_rate * 8 / p_sys->i_frame_samples;
+ }
- input_SelectES( p_input, p_sys->p_es );
+ p_sys->p_es = es_out_Add( p_demux->out, &p_sys->fmt );
- 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 );
- }
+ msg_Err( p_demux, "An error occured during wav demuxing" );
+ free( p_wf );
free( p_sys );
-
return VLC_EGENERIC;
}
*****************************************************************************
* 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 )
- {
- i_pos = stream_Tell( p_sys->s );
- if( p_sys->p_wf->nBlockAlign != 0 )
- {
- i_pos += p_sys->p_wf->nBlockAlign - i_pos % p_sys->p_wf->nBlockAlign;
- if( stream_Seek( p_sys->s, i_pos ) )
- {
- msg_Err( p_input, "stream_Sekk failed (cannot resync)" );
- }
- }
- }
-
- input_ClockManageRef( p_input,
- p_input->stream.p_selected_program,
- p_sys->i_time * 9 / 100 );
-
- i_pos = stream_Tell( p_sys->s );
+ demux_sys_t *p_sys = p_demux->p_sys;
+ block_t *p_block;
+ const int64_t 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 )
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 = VLC_TS_0 + date_Get( &p_sys->pts );
- input_DecodePES( p_sys->p_es->p_decoder_fifo, p_pes );
- p_sys->i_time += p_sys->i_frame_length;
- return( 1 );
+ /* 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 );
+
+ 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 )
{
- 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 demux_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, const char *fcc, unsigned int *pi_size )
{
- demux_sys_t *p_sys = p_input->p_demux_data;
- uint8_t *p_peek;
+ const uint8_t *p_peek;
for( ;; )
{
- int i_size;
+ uint32_t 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=%"PRIu32, p_peek, i_size );
- if( !strncmp( p_peek, fcc, 4 ) )
+ if( !memcmp( p_peek, fcc, 4 ) )
{
if( pi_size )
{
return VLC_SUCCESS;
}
- i_size = __EVEN( i_size ) + 8;
- if( stream_Read( p_sys->s, NULL, i_size ) != i_size )
- {
+ /* Skip chunk */
+ if( stream_Read( p_demux->s, NULL, 8 ) != 8 ||
+ stream_Read( p_demux->s, NULL, i_size ) != (int)i_size ||
+ ( (i_size & 1) && stream_Read( p_demux->s, NULL, 1 ) != 1 ) )
return VLC_EGENERIC;
- }
}
}
-static void FrameInfo_PCM( input_thread_t *p_input,
- unsigned int *pi_size,
- mtime_t *pi_length )
+static int FrameInfo_PCM( unsigned int *pi_size, int *pi_samples,
+ const es_format_t *p_fmt )
{
- WAVEFORMATEX *p_wf = p_input->p_demux_data->p_wf;
- int i_samples;
-
int i_bytes;
- int 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_fmt->audio.i_rate / 20, 1 );
- i_bytes = i_samples * p_wf->nChannels * ( (p_wf->wBitsPerSample + 7) / 8 );
+ i_bytes = *pi_samples * p_fmt->audio.i_channels *
+ ( (p_fmt->audio.i_bitspersample + 7) / 8 );
- if( p_wf->nBlockAlign > 0 )
+ if( p_fmt->audio.i_blockalign > 0 )
{
- if( ( i_modulo = i_bytes % p_wf->nBlockAlign ) != 0 )
- {
- i_bytes += p_wf->nBlockAlign - i_modulo;
- }
+ const int i_modulo = i_bytes % p_fmt->audio.i_blockalign;
+ if( i_modulo > 0 )
+ i_bytes += p_fmt->audio.i_blockalign - i_modulo;
}
+
*pi_size = i_bytes;
+ return VLC_SUCCESS;
}
-static void FrameInfo_MS_ADPCM( input_thread_t *p_input,
- unsigned int *pi_size,
- mtime_t *pi_length )
+static int FrameInfo_MS_ADPCM( unsigned int *pi_size, int *pi_samples,
+ const es_format_t *p_fmt )
{
- 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;
+ if( p_fmt->audio.i_channels <= 0 )
+ return VLC_EGENERIC;
- *pi_length = (mtime_t)1000000 *
- (mtime_t)i_samples /
- (mtime_t)p_wf->nSamplesPerSec;
+ *pi_samples = 2 + 2 * ( p_fmt->audio.i_blockalign -
+ 7 * p_fmt->audio.i_channels ) / p_fmt->audio.i_channels;
+ *pi_size = p_fmt->audio.i_blockalign;
- *pi_size = p_wf->nBlockAlign;
+ return VLC_SUCCESS;
}
-static void FrameInfo_IMA_ADPCM( input_thread_t *p_input,
- unsigned int *pi_size,
- mtime_t *pi_length )
+static int FrameInfo_IMA_ADPCM( unsigned int *pi_size, int *pi_samples,
+ const es_format_t *p_fmt )
{
- WAVEFORMATEX *p_wf = p_input->p_demux_data->p_wf;
- int i_samples;
+ if( p_fmt->audio.i_channels <= 0 )
+ return VLC_EGENERIC;
+
+ *pi_samples = 2 * ( p_fmt->audio.i_blockalign -
+ 4 * p_fmt->audio.i_channels ) / p_fmt->audio.i_channels;
+ *pi_size = p_fmt->audio.i_blockalign;
- i_samples = 2 * ( p_wf->nBlockAlign -
- 4 * p_wf->nChannels ) / p_wf->nChannels;
+ return VLC_SUCCESS;
+}
+
+static int FrameInfo_MSGSM( unsigned int *pi_size, int *pi_samples,
+ const es_format_t *p_fmt )
+{
+ if( p_fmt->i_bitrate <= 0 )
+ return VLC_EGENERIC;
- *pi_length = (mtime_t)1000000 *
- (mtime_t)i_samples /
- (mtime_t)p_wf->nSamplesPerSec;
+ *pi_samples = ( p_fmt->audio.i_blockalign * p_fmt->audio.i_rate * 8)
+ / p_fmt->i_bitrate;
+ *pi_size = p_fmt->audio.i_blockalign;
- *pi_size = p_wf->nBlockAlign;
+ return VLC_SUCCESS;
}