/*****************************************************************************
* wav.c : wav file input module for vlc
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: wav.c,v 1.2 2003/08/01 00:40:05 fenrir Exp $
+ * Copyright (C) 2001-2003 VideoLAN
+ * $Id: wav.c,v 1.12 2004/02/05 22:56:11 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
#include <vlc/input.h>
#include <codecs.h>
-#include <ninput.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") );
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-
-static int Demux ( input_thread_t * );
+static int Demux( input_thread_t * );
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_frame_length;
};
-
/*****************************************************************************
* Declaration of local function
*****************************************************************************/
#define __EVEN( x ) ( ( (x)%2 != 0 ) ? ((x)+1) : (x) )
-#define GetWLE( p ) __GetWLE( (uint8_t*)(p) )
-static inline uint32_t __GetWLE( uint8_t *p )
-{
- return( p[0] + ( p[1] << 8 ) );
-}
-#define GetDWLE( p ) __GetDWLE( (uint8_t*)(p) )
-static inline uint32_t __GetDWLE( uint8_t *p )
-{
- return( p[0] + ( p[1] << 8 ) + ( p[2] << 16 ) + ( p[3] << 24 ) );
-}
-
static int ChunkFind( input_thread_t *, char *, unsigned int * );
static void FrameInfo_IMA_ADPCM( input_thread_t *, unsigned int *, mtime_t * );
demux_sys_t *p_sys;
uint8_t *p_peek;
+ WAVEFORMATEX *p_wf;
unsigned int i_size;
- vlc_fourcc_t i_fourcc;
+ char *psz_name;
/* Is it a wav file ? */
if( input_Peek( p_input, &p_peek, 12 ) < 12 )
}
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_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;
- }
-
/* skip riff header */
- stream_Read( p_sys->s, NULL, 12 ); /* cannot fail as peek succeed */
+ stream_Read( p_input->s, NULL, 12 ); /* cannot fail as peek succeed */
/* search fmt chunk */
if( ChunkFind( p_input, "fmt ", &i_size ) )
msg_Err( p_input, "invalid 'fmt ' chunk" );
goto error;
}
- stream_Read( p_sys->s, NULL, 8 ); /* cannot fail */
+ stream_Read( p_input->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 = malloc( __EVEN( i_size ) + 2 ); /* +2, for raw audio -> no cbSize */
+ p_wf->cbSize = 0;
+ if( stream_Read( p_input->s,
+ p_wf, __EVEN( i_size ) ) < (int)__EVEN( i_size ) )
{
msg_Err( p_input, "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 );
+ 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 );
+ 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 );
+ }
+
+ 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 );
- if( ChunkFind( p_input, "data", &p_sys->i_data_size ) )
+ free( p_wf );
+
+ switch( p_sys->fmt.i_codec )
{
- msg_Err( p_input, "cannot find 'data' chunk" );
+ 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*)&p_sys->fmt.i_codec );
goto error;
}
- stream_Control( p_sys->s, STREAM_GET_POSITION, &p_sys->i_data_pos );
-
- stream_Read( p_sys->s, NULL, 8 ); /* cannot fail */
+ msg_Dbg( p_input, "found %s audio format", psz_name );
- /* XXX p_sys->psz_demux shouldn't be NULL ! */
- switch( p_sys->p_wf->wFormatTag )
+ if( ChunkFind( p_input, "data", &p_sys->i_data_size ) )
{
- case( WAVE_FORMAT_PCM ):
- msg_Dbg( p_input,"found raw pcm audio format" );
- i_fourcc = VLC_FOURCC( 'a', 'r', 'a', 'w' );
- FrameInfo_PCM( p_input, &p_sys->i_frame_size, &p_sys->i_frame_length );
- break;
- case( WAVE_FORMAT_MULAW ):
- msg_Dbg( p_input,"found mulaw pcm audio format" );
- i_fourcc = VLC_FOURCC( 'u', 'l', 'a', 'w' );
- FrameInfo_PCM( p_input, &p_sys->i_frame_size, &p_sys->i_frame_length );
- break;
- case( WAVE_FORMAT_ALAW ):
- msg_Dbg( p_input,"found alaw pcm audio format" );
- i_fourcc = VLC_FOURCC( 'a', 'l', 'a', 'w' );
- FrameInfo_PCM( p_input, &p_sys->i_frame_size, &p_sys->i_frame_length );
- break;
- case( WAVE_FORMAT_ADPCM ):
- msg_Dbg( p_input, "found ms adpcm audio format" );
- i_fourcc = VLC_FOURCC( 'm', 's', 0x00, 0x02 );
- FrameInfo_MS_ADPCM( p_input, &p_sys->i_frame_size, &p_sys->i_frame_length );
- break;
- case( WAVE_FORMAT_IMA_ADPCM ):
- msg_Dbg( p_input, "found ima adpcm audio format" );
- i_fourcc = VLC_FOURCC( 'm', 's', 0x00, 0x11 );
- FrameInfo_IMA_ADPCM( p_input, &p_sys->i_frame_size, &p_sys->i_frame_length );
- break;
-
- case( WAVE_FORMAT_MPEG ):
- case( WAVE_FORMAT_MPEGLAYER3 ):
- msg_Dbg( p_input, "found mpeg audio format (relaying to another demux)" );
- /* FIXME set end of area FIXME */
- goto relay;
- case( WAVE_FORMAT_A52 ):
- msg_Dbg( p_input,"found a52 audio format (relaying to another demux)" );
- /* FIXME set end of area FIXME */
- goto relay;
-
- default:
- msg_Err( p_input,"unrecognize audio format(0x%x)",
- p_sys->p_wf->wFormatTag );
- goto error;
+ msg_Err( p_input, "cannot find 'data' chunk" );
+ goto error;
}
+ p_sys->i_data_pos = stream_Tell( p_input->s );
- /* create one program */
+ 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)
{
msg_Err( p_input, "cannot init stream" );
goto error;
}
- if( input_AddProgram( p_input, 0, 0) == NULL )
- {
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- msg_Err( p_input, "cannot add program" );
- goto error;
- }
- p_input->stream.p_selected_program = p_input->stream.pp_programs[0];
- if( p_sys->i_data_size > 0 )
+ p_input->stream.i_mux_rate = 0;
+ if( p_sys->fmt.i_bitrate )
{
- p_input->stream.i_mux_rate = (mtime_t)p_sys->i_frame_size * (mtime_t)1000000 / 50 / p_sys->i_frame_length;
+ p_input->stream.i_mux_rate = p_sys->fmt.i_bitrate / 50 / 8;
}
- else
+ else if( p_sys->i_data_size > 0 )
{
- p_input->stream.i_mux_rate = 0;
+ p_input->stream.i_mux_rate = (mtime_t)p_sys->i_frame_size *
+ (mtime_t)1000000 / 50 / p_sys->i_frame_length;
}
-
- 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 );
-
- 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 );
+ p_sys->p_es = es_out_Add( p_input->p_es_out, &p_sys->fmt );
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;
}
*****************************************************************************/
static int Demux( input_thread_t *p_input )
{
- demux_sys_t *p_sys = p_input->p_demux_data;
- int64_t i_pos;
- pes_packet_t *p_pes;
+ demux_sys_t *p_sys = p_input->p_demux_data;
+ int64_t i_pos;
+ block_t *p_block;
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 = 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->p_wf->nBlockAlign - i_pos % p_sys->p_wf->nBlockAlign;
- if( stream_Control( p_sys->s, STREAM_SET_POSITION, i_pos ) )
+ 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_SET_POSITION failed (cannot resync)" );
+ msg_Err( p_input, "stream_Sekk failed (cannot resync)" );
}
}
}
- input_ClockManageRef( p_input,
- p_input->stream.p_selected_program,
+ input_ClockManageRef( p_input, p_input->stream.p_selected_program,
p_sys->i_time * 9 / 100 );
- stream_Control( p_sys->s, STREAM_GET_POSITION, &i_pos );
+ i_pos = stream_Tell( p_input->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_input->s, p_sys->i_frame_size ) ) == NULL )
{
msg_Warn( p_input, "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 );
+ p_block->i_dts =
+ p_block->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 );
- }
+ es_out_Send( p_input->p_es_out, p_sys->p_es, p_block );
- input_DecodePES( p_sys->p_es->p_decoder_fifo, p_pes );
p_sys->i_time += p_sys->i_frame_length;
- return( 1 );
+
+ return 1;
}
/*****************************************************************************
input_thread_t *p_input = (input_thread_t *)p_this;
demux_sys_t *p_sys = p_input->p_demux_data;
- stream_Release( p_sys->s );
- free( p_sys->p_wf );
free( p_sys );
}
-
/*****************************************************************************
* Local functions
*****************************************************************************/
static int ChunkFind( input_thread_t *p_input,
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_input->s, &p_peek, 8 ) < 8 )
{
msg_Err( p_input, "cannot peek()" );
return VLC_EGENERIC;
}
i_size = __EVEN( i_size ) + 8;
- if( stream_Read( p_sys->s, NULL, i_size ) != i_size )
+ if( stream_Read( p_input->s, NULL, i_size ) != i_size )
{
return VLC_EGENERIC;
}
unsigned int *pi_size,
mtime_t *pi_length )
{
- WAVEFORMATEX *p_wf = p_input->p_demux_data->p_wf;
+ demux_sys_t *p_sys = p_input->p_demux_data;
+
int i_samples;
int i_bytes;
int i_modulo;
/* read samples for 50ms of */
- i_samples = __MAX( p_wf->nSamplesPerSec / 20, 1 );
+ i_samples = __MAX( p_sys->fmt.audio.i_rate / 20, 1 );
*pi_length = (mtime_t)1000000 *
(mtime_t)i_samples /
- (mtime_t)p_wf->nSamplesPerSec;
+ (mtime_t)p_sys->fmt.audio.i_rate;
- i_bytes = i_samples * p_wf->nChannels * ( (p_wf->wBitsPerSample + 7) / 8 );
+ i_bytes = i_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 )
+ unsigned int *pi_size,
+ mtime_t *pi_length )
{
- WAVEFORMATEX *p_wf = p_input->p_demux_data->p_wf;
+ demux_sys_t *p_sys = p_input->p_demux_data;
+
int i_samples;
- i_samples = 2 + 2 * ( p_wf->nBlockAlign -
- 7 * p_wf->nChannels ) / p_wf->nChannels;
+ i_samples = 2 + 2 * ( p_sys->fmt.audio.i_blockalign -
+ 7 * 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_length = (mtime_t)1000000 * (mtime_t)i_samples /
+ (mtime_t)p_sys->fmt.audio.i_rate;
- *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 )
+ unsigned int *pi_size,
+ mtime_t *pi_length )
{
- WAVEFORMATEX *p_wf = p_input->p_demux_data->p_wf;
+ demux_sys_t *p_sys = p_input->p_demux_data;
+
int i_samples;
- i_samples = 2 * ( p_wf->nBlockAlign -
- 4 * p_wf->nChannels ) / p_wf->nChannels;
+ i_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_length = (mtime_t)1000000 * (mtime_t)i_samples /
+ (mtime_t)p_sys->fmt.audio.i_rate;
- *pi_size = p_wf->nBlockAlign;
+ *pi_size = p_sys->fmt.audio.i_blockalign;
}
-
projects / vlc / blobdiff