X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fau.c;h=58da050f6175464eaebb058ac23be30221b76a0f;hb=b541f09e5c9a38b8bf4d87cac4ed39cfa0564fb9;hp=e1e4a226fb72a9a8ec20a5c018c068e8e826dc28;hpb=05ca109431cf7084040b099a4132b6012f706091;p=vlc diff --git a/modules/demux/au.c b/modules/demux/au.c index e1e4a226fb..58da050f61 100644 --- a/modules/demux/au.c +++ b/modules/demux/au.c @@ -1,8 +1,8 @@ /***************************************************************************** * au.c : au file input module for vlc ***************************************************************************** - * Copyright (C) 2001-2003 VideoLAN - * $Id: au.c,v 1.7 2003/09/12 16:26:40 fenrir Exp $ + * Copyright (C) 2001-2007 the VideoLAN team + * $Id$ * * Authors: Laurent Aimar * @@ -18,42 +18,44 @@ * * 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 /* malloc(), free() */ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include +#include +#include +#include + +/* TODO: + * - all adpcm things (I _NEED_ samples) + * - ... + */ /***************************************************************************** * 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( _("AU demuxer") ); - set_capability( "demux", 142 ); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_DEMUX ); + set_description( N_("AU demuxer") ); + set_capability( "demux", 10 ); set_callbacks( Open, Close ); + add_shortcut( "au" ); vlc_module_end(); -/* - * TODO: - * - all adpcm things (I _NEED_ samples) - */ - /***************************************************************************** * Local prototypes *****************************************************************************/ -static int DemuxPCM ( input_thread_t * ); -/* TODO static int DemuxADPCM ( input_thread_t * ); */ - enum AuType_e { AU_UNKNOWN = 0, @@ -78,328 +80,236 @@ enum AuCat_e AU_CAT_ADPCM = 2 }; -typedef struct -#ifdef HAVE_ATTRIBUTE_PACKED - __attribute__((__packed__)) -#endif -{ - uint32_t i_header_size; - uint32_t i_data_size; - uint32_t i_encoding; - uint32_t i_sample_rate; - uint32_t i_channels; -} au_t; - struct demux_sys_t { - au_t au; - WAVEFORMATEX wf; + es_format_t fmt; + es_out_id_t *es; mtime_t i_time; - es_descriptor_t *p_es; - int i_frame_size; mtime_t i_frame_length; + + int i_header_size; }; +static int Demux( demux_t * ); +static int Control ( demux_t *, int i_query, va_list args ); /***************************************************************************** * Open: check file and initializes structures *****************************************************************************/ -static int Open( vlc_object_t * p_this ) +static int Open( vlc_object_t *p_this ) { - input_thread_t *p_input = (input_thread_t *)p_this; - demux_sys_t *p_sys; - - uint8_t *p_peek; + demux_t *p_demux = (demux_t*)p_this; + demux_sys_t *p_sys; - vlc_fourcc_t i_fourcc; + uint8_t hdr[20]; + const uint8_t *p_peek; + int i_cat; + int i_samples, i_modulo; - int i_cat; + CHECK_PEEK( p_peek, 4 ); - /* a little test to see if it's a au file */ - if( input_Peek( p_input, &p_peek, 4 ) < 4 ) + if( memcmp( p_peek, ".snd", 4 ) ) { - msg_Warn( p_input, "AU module discarded (cannot peek)" ); return VLC_EGENERIC; } - if( strncmp( p_peek, ".snd", 4 ) ) - { - msg_Warn( p_input, "AU module discarded (not a valid file)" ); - return VLC_EGENERIC; - } - - p_input->p_demux_data = p_sys = malloc( sizeof( demux_sys_t ) ); - p_sys->i_time = 0; /* skip signature */ - stream_Read( p_input->s, NULL, 4 ); /* cannot fail */ + stream_Read( p_demux->s, NULL, 4 ); /* cannot fail */ /* read header */ - if( stream_Read( p_input->s, &p_sys->au, sizeof(au_t) )<(int)sizeof(au_t) ) + if( stream_Read( p_demux->s, hdr, 20 ) < 20 ) { - msg_Err( p_input, "cannot load header" ); - goto error; + msg_Err( p_demux, "cannot read" ); + return VLC_EGENERIC; } - p_sys->au.i_header_size = GetDWBE( &p_sys->au.i_header_size ); - p_sys->au.i_data_size = GetDWBE( &p_sys->au.i_data_size ); - p_sys->au.i_encoding = GetDWBE( &p_sys->au.i_encoding ); - p_sys->au.i_sample_rate = GetDWBE( &p_sys->au.i_sample_rate ); - p_sys->au.i_channels = GetDWBE( &p_sys->au.i_channels ); - - msg_Dbg( p_input, - "au file: header_size=%d data_size=%d encoding=0x%x sample_rate=%d channels=%d", - p_sys->au.i_header_size, - p_sys->au.i_data_size, - p_sys->au.i_encoding, - p_sys->au.i_sample_rate, - p_sys->au.i_channels ); - if( p_sys->au.i_header_size < 24 ) + if( GetDWBE( &hdr[0] ) < 24 ) { - msg_Warn( p_input, "AU module discarded (not a valid file)" ); - goto error; + msg_Err( p_demux, "invalid file" ); + return VLC_EGENERIC; } + DEMUX_INIT_COMMON(); p_sys = p_demux->p_sys; + p_sys->i_time = 1; + p_sys->i_header_size = GetDWBE( &hdr[0] ); + /* skip extra header data */ - if( p_sys->au.i_header_size > 4 + sizeof( au_t ) ) + if( p_sys->i_header_size > 24 ) { - stream_Read( p_input->s, - NULL, p_sys->au.i_header_size - 4 - sizeof( au_t ) ); + stream_Read( p_demux->s, NULL, p_sys->i_header_size - 24 ); } - /* Create WAVEFORMATEX structure */ - p_sys->wf.nChannels = p_sys->au.i_channels; - p_sys->wf.nSamplesPerSec= p_sys->au.i_sample_rate; - p_sys->wf.cbSize = 0; + /* init fmt */ + es_format_Init( &p_sys->fmt, AUDIO_ES, 0 ); + p_sys->fmt.audio.i_rate = GetDWBE( &hdr[12] ); + p_sys->fmt.audio.i_channels = GetDWBE( &hdr[16] ); - switch( p_sys->au.i_encoding ) +#if 0 + p_sys->au.i_header_size = GetDWBE( &p_sys->au.i_header_size ); + p_sys->au.i_data_size = GetDWBE( &p_sys->au.i_data_size ); + p_sys->au.i_encoding = GetDWBE( &p_sys->au.i_encoding ); + p_sys->au.i_sample_rate = GetDWBE( &p_sys->au.i_sample_rate ); + p_sys->au.i_channels = GetDWBE( &p_sys->au.i_channels ); +#endif + switch( GetDWBE( &hdr[8] ) ) { case AU_ALAW_8: /* 8-bit ISDN A-law */ - p_sys->wf.wFormatTag = WAVE_FORMAT_ALAW; // FIXME ?? - p_sys->wf.wBitsPerSample = 8; - p_sys->wf.nBlockAlign = 1 * p_sys->wf.nChannels; - i_fourcc = VLC_FOURCC( 'a','l','a','w' ); + p_sys->fmt.i_codec = VLC_FOURCC( 'a','l','a','w' ); + p_sys->fmt.audio.i_bitspersample = 8; + p_sys->fmt.audio.i_blockalign = 1 * p_sys->fmt.audio.i_channels; i_cat = AU_CAT_PCM; break; case AU_MULAW_8: /* 8-bit ISDN u-law */ - p_sys->wf.wFormatTag = WAVE_FORMAT_MULAW; // FIXME ?? - p_sys->wf.wBitsPerSample = 8; - p_sys->wf.nBlockAlign = 1 * p_sys->wf.nChannels; - i_fourcc = VLC_FOURCC( 'u','l','a','w' ); + p_sys->fmt.i_codec = VLC_FOURCC( 'u','l','a','w' ); + p_sys->fmt.audio.i_bitspersample = 8; + p_sys->fmt.audio.i_blockalign = 1 * p_sys->fmt.audio.i_channels; i_cat = AU_CAT_PCM; break; case AU_LINEAR_8: /* 8-bit linear PCM */ - p_sys->wf.wFormatTag = WAVE_FORMAT_PCM; - p_sys->wf.wBitsPerSample = 8; - p_sys->wf.nBlockAlign = 1 * p_sys->wf.nChannels; - i_fourcc = VLC_FOURCC( 't','w','o','s' ); + p_sys->fmt.i_codec = VLC_FOURCC( 't','w','o','s' ); + p_sys->fmt.audio.i_bitspersample = 8; + p_sys->fmt.audio.i_blockalign = 1 * p_sys->fmt.audio.i_channels; i_cat = AU_CAT_PCM; break; case AU_LINEAR_16: /* 16-bit linear PCM */ - p_sys->wf.wFormatTag = WAVE_FORMAT_PCM; - p_sys->wf.wBitsPerSample = 16; - p_sys->wf.nBlockAlign = 2 * p_sys->wf.nChannels; - i_fourcc = VLC_FOURCC( 't','w','o','s' ); + p_sys->fmt.i_codec = VLC_FOURCC( 't','w','o','s' ); + p_sys->fmt.audio.i_bitspersample = 16; + p_sys->fmt.audio.i_blockalign = 2 * p_sys->fmt.audio.i_channels; i_cat = AU_CAT_PCM; break; case AU_LINEAR_24: /* 24-bit linear PCM */ - p_sys->wf.wFormatTag = WAVE_FORMAT_PCM; - p_sys->wf.wBitsPerSample = 24; - p_sys->wf.nBlockAlign = 3 * p_sys->wf.nChannels; - i_fourcc = VLC_FOURCC( 't','w','o','s' ); + p_sys->fmt.i_codec = VLC_FOURCC( 't','w','o','s' ); + p_sys->fmt.audio.i_bitspersample = 24; + p_sys->fmt.audio.i_blockalign = 3 * p_sys->fmt.audio.i_channels; i_cat = AU_CAT_PCM; break; case AU_LINEAR_32: /* 32-bit linear PCM */ - p_sys->wf.wFormatTag = WAVE_FORMAT_PCM; - p_sys->wf.wBitsPerSample = 32; - p_sys->wf.nBlockAlign = 4 * p_sys->wf.nChannels; - i_fourcc = VLC_FOURCC( 't','w','o','s' ); + p_sys->fmt.i_codec = VLC_FOURCC( 't','w','o','s' ); + p_sys->fmt.audio.i_bitspersample = 32; + p_sys->fmt.audio.i_blockalign = 4 * p_sys->fmt.audio.i_channels; i_cat = AU_CAT_PCM; break; case AU_FLOAT: /* 32-bit IEEE floating point */ - p_sys->wf.wFormatTag = WAVE_FORMAT_UNKNOWN; - p_sys->wf.wBitsPerSample = 32; - p_sys->wf.nBlockAlign = 4 * p_sys->wf.nChannels; - i_fourcc = VLC_FOURCC( 'a', 'u', 0, AU_FLOAT ); + p_sys->fmt.i_codec = VLC_FOURCC( 'a', 'u', 0, AU_FLOAT ); + p_sys->fmt.audio.i_bitspersample = 32; + p_sys->fmt.audio.i_blockalign = 4 * p_sys->fmt.audio.i_channels; i_cat = AU_CAT_PCM; break; case AU_DOUBLE: /* 64-bit IEEE floating point */ - p_sys->wf.wFormatTag = WAVE_FORMAT_UNKNOWN; - p_sys->wf.wBitsPerSample = 64; - p_sys->wf.nBlockAlign = 8 * p_sys->wf.nChannels; - i_fourcc = VLC_FOURCC( 'a', 'u', 0, AU_DOUBLE ); + p_sys->fmt.i_codec = VLC_FOURCC( 'a', 'u', 0, AU_DOUBLE ); + p_sys->fmt.audio.i_bitspersample = 64; + p_sys->fmt.audio.i_blockalign = 8 * p_sys->fmt.audio.i_channels; i_cat = AU_CAT_PCM; break; case AU_ADPCM_G721: /* 4-bit CCITT g.721 ADPCM */ - p_sys->wf.wFormatTag = WAVE_FORMAT_UNKNOWN; - p_sys->wf.wBitsPerSample = 0; - p_sys->wf.nBlockAlign = 0 * p_sys->wf.nChannels; - i_fourcc = VLC_FOURCC( 'a', 'u', 0, AU_ADPCM_G721 ); + p_sys->fmt.i_codec = VLC_FOURCC( 'a', 'u', 0, AU_ADPCM_G721 ); + p_sys->fmt.audio.i_bitspersample = 0; + p_sys->fmt.audio.i_blockalign = 0 * p_sys->fmt.audio.i_channels; i_cat = AU_CAT_ADPCM; break; case AU_ADPCM_G722: /* CCITT g.722 ADPCM */ - p_sys->wf.wFormatTag = WAVE_FORMAT_UNKNOWN; - p_sys->wf.wBitsPerSample = 0; - p_sys->wf.nBlockAlign = 0 * p_sys->wf.nChannels; - i_fourcc = VLC_FOURCC( 'a', 'u', 0, AU_ADPCM_G722 ); + p_sys->fmt.i_codec = VLC_FOURCC( 'a', 'u', 0, AU_ADPCM_G722 ); + p_sys->fmt.audio.i_bitspersample = 0; + p_sys->fmt.audio.i_blockalign = 0 * p_sys->fmt.audio.i_channels; i_cat = AU_CAT_ADPCM; break; case AU_ADPCM_G723_3: /* CCITT g.723 3-bit ADPCM */ - p_sys->wf.wFormatTag = WAVE_FORMAT_UNKNOWN; - p_sys->wf.wBitsPerSample = 0; - p_sys->wf.nBlockAlign = 0 * p_sys->wf.nChannels; - i_fourcc = VLC_FOURCC( 'a', 'u', 0, AU_ADPCM_G723_3 ); + p_sys->fmt.i_codec = VLC_FOURCC( 'a', 'u', 0, AU_ADPCM_G723_3 ); + p_sys->fmt.audio.i_bitspersample = 0; + p_sys->fmt.audio.i_blockalign = 0 * p_sys->fmt.audio.i_channels; i_cat = AU_CAT_ADPCM; break; case AU_ADPCM_G723_5: /* CCITT g.723 5-bit ADPCM */ - p_sys->wf.wFormatTag = WAVE_FORMAT_UNKNOWN; - p_sys->wf.wBitsPerSample = 0; - p_sys->wf.nBlockAlign = 0 * p_sys->wf.nChannels; - i_fourcc = VLC_FOURCC( 'a', 'u', 0, AU_ADPCM_G723_5 ); + p_sys->fmt.i_codec = VLC_FOURCC( 'a', 'u', 0, AU_ADPCM_G723_5 ); + p_sys->fmt.audio.i_bitspersample = 0; + p_sys->fmt.audio.i_blockalign = 0 * p_sys->fmt.audio.i_channels; i_cat = AU_CAT_ADPCM; break; default: - msg_Warn( p_input, "unknow encoding=0x%x", p_sys->au.i_encoding ); + msg_Warn( p_demux, "unknow encoding=0x%x", GetDWBE( &hdr[8] ) ); + p_sys->fmt.audio.i_bitspersample = 0; + p_sys->fmt.audio.i_blockalign = 0; i_cat = AU_CAT_UNKNOWN; - goto error; + break; } - p_sys->wf.nAvgBytesPerSec = p_sys->wf.nSamplesPerSec * p_sys->wf.nChannels * p_sys->wf.wBitsPerSample / 8; - + p_sys->fmt.i_bitrate = p_sys->fmt.audio.i_rate * + p_sys->fmt.audio.i_channels * + p_sys->fmt.audio.i_bitspersample; if( i_cat == AU_CAT_UNKNOWN || i_cat == AU_CAT_ADPCM ) { p_sys->i_frame_size = 0; p_sys->i_frame_length = 0; - msg_Err( p_input, "unsupported codec/type (Please report it)" ); - goto error; + msg_Err( p_demux, "unsupported codec/type (Please report it)" ); + free( p_sys ); + return VLC_EGENERIC; } - else - { - int i_samples, i_modulo; - - /* read samples for 50ms of */ - i_samples = __MAX( p_sys->wf.nSamplesPerSec / 20, 1 ); - p_sys->i_frame_size = i_samples * p_sys->wf.nChannels * ( (p_sys->wf.wBitsPerSample + 7) / 8 ); + /* add the es */ + p_sys->es = es_out_Add( p_demux->out, &p_sys->fmt ); - if( p_sys->wf.nBlockAlign > 0 ) + /* calculate 50ms frame size/time */ + i_samples = __MAX( p_sys->fmt.audio.i_rate / 20, 1 ); + p_sys->i_frame_size = i_samples * p_sys->fmt.audio.i_channels * + ( (p_sys->fmt.audio.i_bitspersample + 7) / 8 ); + if( p_sys->fmt.audio.i_blockalign > 0 ) + { + if( ( i_modulo = p_sys->i_frame_size % p_sys->fmt.audio.i_blockalign ) != 0 ) { - if( ( i_modulo = p_sys->i_frame_size % p_sys->wf.nBlockAlign ) != 0 ) - { - p_sys->i_frame_size += p_sys->wf.nBlockAlign - i_modulo; - } + p_sys->i_frame_size += p_sys->fmt.audio.i_blockalign - i_modulo; } - - p_sys->i_frame_length = (mtime_t)1000000 * - (mtime_t)i_samples / - (mtime_t)p_sys->wf.nSamplesPerSec; - - p_input->pf_demux = DemuxPCM; - p_input->pf_demux_control = demux_vaControlDefault; } - - /* create one program */ - vlc_mutex_lock( &p_input->stream.stream_lock ); - if( input_InitStream( p_input, 0 ) == -1) - { - vlc_mutex_unlock( &p_input->stream.stream_lock ); - 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]; - p_input->stream.i_mux_rate = p_sys->wf.nAvgBytesPerSec / 50; - - p_sys->p_es = input_AddES( p_input, p_input->stream.p_selected_program, - 0x01, AUDIO_ES, NULL, 0 ); - - p_sys->p_es->i_stream_id = 0x01; - p_sys->p_es->i_fourcc = i_fourcc; - p_sys->p_es->p_waveformatex= malloc( sizeof( WAVEFORMATEX ) ); - memcpy( p_sys->p_es->p_waveformatex, &p_sys->wf, sizeof( WAVEFORMATEX ) ); - - 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->i_frame_length = (mtime_t)1000000 * + (mtime_t)i_samples / + (mtime_t)p_sys->fmt.audio.i_rate; return VLC_SUCCESS; - -error: - free( p_sys ); - return VLC_EGENERIC; } /***************************************************************************** - * DemuxPCM: read packet and send them to decoders + * Demux: read packet and send them to decoders ***************************************************************************** * Returns -1 in case of error, 0 in case of EOF, 1 otherwise *****************************************************************************/ -static int DemuxPCM( input_thread_t *p_input ) +static int Demux( demux_t *p_demux ) { - demux_sys_t *p_sys = p_input->p_demux_data; - pes_packet_t *p_pes; + demux_sys_t *p_sys = p_demux->p_sys; + block_t *p_block; - if( p_input->stream.p_selected_program->i_synchro_state == SYNCHRO_REINIT ) - { - int64_t i_pos = stream_Tell( p_input->s ); + /* set PCR */ + es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_time ); - if( p_sys->wf.nBlockAlign != 0 ) - { - i_pos += p_sys->wf.nBlockAlign - i_pos % p_sys->wf.nBlockAlign; - if( stream_Seek( p_input->s, i_pos ) ) - { - msg_Err( p_input, "Seek failed(cannot resync)" ); - } - } - } - - input_ClockManageRef( p_input, - p_input->stream.p_selected_program, - p_sys->i_time * 9 / 100 ); - - if( ( p_pes = stream_PesPacket( 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_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 = p_sys->i_time; + + es_out_Send( p_demux->out, p_sys->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; } /***************************************************************************** @@ -407,9 +317,21 @@ static int DemuxPCM( 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; 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; + + return demux_vaControlHelper( p_demux->s, p_sys->i_header_size, -1, + p_sys->fmt.i_bitrate, p_sys->fmt.audio.i_blockalign, + i_query, args ); +} +