* wav.c : wav file input module for vlc
*****************************************************************************
* Copyright (C) 2001-2003 VideoLAN
- * $Id: wav.c,v 1.12 2004/02/05 22:56:11 gbazin Exp $
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
vlc_module_begin();
set_description( _("WAV demuxer") );
- set_capability( "demux", 142 );
+ 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
{
mtime_t i_frame_length;
};
-/*****************************************************************************
- * Declaration of local function
- *****************************************************************************/
#define __EVEN( x ) ( ( (x)%2 != 0 ) ? ((x)+1) : (x) )
-static int ChunkFind( input_thread_t *, char *, unsigned int * );
+static int ChunkFind( demux_t *, 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 void FrameInfo_IMA_ADPCM( demux_t *, unsigned int *, mtime_t * );
+static void FrameInfo_MS_ADPCM ( demux_t *, unsigned int *, mtime_t * );
+static void FrameInfo_PCM ( demux_t *, unsigned int *, mtime_t * );
/*****************************************************************************
* 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, i_extended;
+ char *psz_name;
- uint8_t *p_peek;
- WAVEFORMATEX *p_wf;
- unsigned int i_size;
- char *psz_name;
+ WAVEFORMATEXTENSIBLE *p_wf_ext;
+ WAVEFORMATEX *p_wf;
/* Is it a wav file ? */
- if( input_Peek( p_input, &p_peek, 12 ) < 12 )
+ if( stream_Peek( p_demux->s, &p_peek, 12 ) < 12 )
{
- msg_Warn( p_input, "WAV module discarded (cannot peek)" );
+ msg_Warn( p_demux, "WAV module discarded (cannot peek)" );
return VLC_EGENERIC;
}
if( strncmp( p_peek, "RIFF", 4 ) || strncmp( &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->pf_demux_control = demux_vaControlDefault;
- p_input->p_demux_data = p_sys = malloc( sizeof( demux_sys_t ) );
- 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( demux_sys_t ) );
+ p_sys->p_es = NULL;
+ p_sys->i_time = 1;
/* skip riff header */
- stream_Read( p_input->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_input->s, NULL, 8 ); /* cannot fail */
+ stream_Read( p_demux->s, NULL, 8 ); /* Cannot fail */
/* load waveformatex */
- p_wf = malloc( __EVEN( i_size ) + 2 ); /* +2, for raw audio -> no cbSize */
+ p_wf_ext = malloc( __EVEN( i_size ) + 2 );
+ p_wf = (WAVEFORMATEX *)p_wf_ext;
p_wf->cbSize = 0;
- if( stream_Read( p_input->s,
+ 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;
}
&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.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.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 */
+ if( GetWLE( &p_wf->wFormatTag ) == WAVE_FORMAT_EXTENSIBLE &&
+ i_size >= sizeof( WAVEFORMATEXTENSIBLE ) )
+ {
+ wf_tag_to_fourcc( GetWLE( &p_wf_ext->SubFormat ),
+ &p_sys->fmt.i_codec, &psz_name );
+ i_extended = sizeof( WAVEFORMATEXTENSIBLE ) - sizeof( WAVEFORMATEX );
+ p_sys->fmt.i_extra -= i_extended;
+ }
- p_sys->fmt.i_extra = GetWLE ( &p_wf->cbSize );
if( p_sys->fmt.i_extra > 0 )
{
p_sys->fmt.p_extra = malloc( p_sys->fmt.i_extra );
- memcpy( p_sys->fmt.p_extra, &p_wf[1], 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, "format:0x%4.4x channels:%d %dHz %dKo/s "
- "blockalign:%d bits/samples:%d extra size:%d",
- GetWLE( &p_wf->wFormatTag ), 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 );
+ 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 );
free( p_wf );
switch( p_sys->fmt.i_codec )
{
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' ):
- FrameInfo_PCM( p_input, &p_sys->i_frame_size, &p_sys->i_frame_length );
+ FrameInfo_PCM( p_demux, &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,
+ FrameInfo_MS_ADPCM( p_demux, &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,
+ FrameInfo_IMA_ADPCM( p_demux, &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,
+ FrameInfo_MS_ADPCM( p_demux, &p_sys->i_frame_size,
&p_sys->i_frame_length );
break;
case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
/* FIXME set end of area FIXME */
goto relay;
default:
- msg_Err( p_input, "unsupported codec (%4.4s)",
+ msg_Err( p_demux, "unsupported codec (%4.4s)",
(char*)&p_sys->fmt.i_codec );
goto error;
}
- msg_Dbg( p_input, "found %s audio format", psz_name );
+ msg_Dbg( p_demux, "found %s audio format", psz_name );
- if( ChunkFind( p_input, "data", &p_sys->i_data_size ) )
+ if( ChunkFind( p_demux, "data", &p_sys->i_data_size ) )
{
- msg_Err( p_input, "cannot find 'data' chunk" );
+ msg_Err( p_demux, "cannot find 'data' chunk" );
goto error;
}
+ stream_Read( p_demux->s, NULL, 8 ); /* Cannot fail */
+ p_sys->i_data_pos = stream_Tell( p_demux->s );
- p_sys->i_data_pos = stream_Tell( p_input->s );
-
- stream_Read( p_input->s, NULL, 8 ); /* cannot fail */
-
- /* Create one program */
- vlc_mutex_lock( &p_input->stream.stream_lock );
- if( input_InitStream( p_input, 0 ) == -1)
+ if( p_sys->fmt.i_bitrate <= 0 )
{
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- msg_Err( p_input, "cannot init stream" );
- goto error;
+ p_sys->fmt.i_bitrate = (mtime_t)p_sys->i_frame_size *
+ I64C(8000000) / p_sys->i_frame_length;
}
- p_input->stream.i_mux_rate = 0;
- if( p_sys->fmt.i_bitrate )
- {
- p_input->stream.i_mux_rate = p_sys->fmt.i_bitrate / 50 / 8;
- }
- else 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;
- }
- vlc_mutex_unlock( &p_input->stream.stream_lock );
-
- p_sys->p_es = es_out_Add( p_input->p_es_out, &p_sys->fmt );
+ p_sys->p_es = es_out_Add( p_demux->out, &p_sys->fmt );
return VLC_SUCCESS;
error:
*****************************************************************************
* 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;
+ demux_sys_t *p_sys = p_demux->p_sys;
int64_t i_pos;
block_t *p_block;
- if( p_input->stream.p_selected_program->i_synchro_state == SYNCHRO_REINIT )
- {
- i_pos = stream_Tell( p_input->s );
- if( p_sys->fmt.audio.i_blockalign != 0 &&
- i_pos % p_sys->fmt.audio.i_blockalign )
- {
- i_pos = p_sys->fmt.audio.i_blockalign -
- i_pos % p_sys->fmt.audio.i_blockalign;
-
- /* Skip some data to realign the stream */
- if( stream_Read( p_input->s, NULL, i_pos ) != 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_input->s );
+ 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_block = stream_Block( p_input->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_block->i_dts =
- p_block->i_pts = input_ClockGetTS( p_input,
- p_input->stream.p_selected_program,
- p_sys->i_time * 9 / 100 );
+ p_block->i_dts = p_block->i_pts = p_sys->i_time;
- es_out_Send( p_input->p_es_out, p_sys->p_es, p_block );
+ /* set PCR */
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_time );
+
+ es_out_Send( p_demux->out, p_sys->p_es, p_block );
p_sys->i_time += p_sys->i_frame_length;
*****************************************************************************/
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;
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,
+static int ChunkFind( demux_t *p_demux,
char *fcc, unsigned int *pi_size )
{
uint8_t *p_peek;
{
int i_size;
- if( stream_Peek( p_input->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 ) )
{
}
i_size = __EVEN( i_size ) + 8;
- if( stream_Read( p_input->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,
+ mtime_t *pi_length )
{
- demux_sys_t *p_sys = p_input->p_demux_data;
+ demux_sys_t *p_sys = p_demux->p_sys;
int i_samples;
*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,
+ mtime_t *pi_length )
{
- demux_sys_t *p_sys = p_input->p_demux_data;
+ demux_sys_t *p_sys = p_demux->p_sys;
int i_samples;
*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,
+ mtime_t *pi_length )
{
- demux_sys_t *p_sys = p_input->p_demux_data;
+ demux_sys_t *p_sys = p_demux->p_sys;
int i_samples;
*pi_size = p_sys->fmt.audio.i_blockalign;
}
+
+
projects / vlc / blobdiff