X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fau.c;h=58da050f6175464eaebb058ac23be30221b76a0f;hb=1c8685fb7d890424ec06ff9a2e3cbc1da984e617;hp=fd256f4172e03347616cc8443d49711a8af04ce9;hpb=ffdca9af740e111153ab385cf00e887c652e7b4c;p=vlc diff --git a/modules/demux/au.c b/modules/demux/au.c index fd256f4172..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.12 2004/01/25 20:05:28 hartman 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,100 +80,81 @@ 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; + es_format_t fmt; + es_out_id_t *es; mtime_t i_time; - es_format_t fmt; - es_out_id_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; + demux_t *p_demux = (demux_t*)p_this; + demux_sys_t *p_sys; - uint8_t *p_peek; + 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 */ + /* init fmt */ es_format_Init( &p_sys->fmt, AUDIO_ES, 0 ); - p_sys->fmt.audio.i_channels = p_sys->au.i_channels; - p_sys->fmt.audio.i_rate = p_sys->au.i_sample_rate; - switch( p_sys->au.i_encoding ) + p_sys->fmt.audio.i_rate = GetDWBE( &hdr[12] ); + p_sys->fmt.audio.i_channels = GetDWBE( &hdr[16] ); + +#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->fmt.i_codec = VLC_FOURCC( 'a','l','a','w' ); @@ -258,10 +241,13 @@ static int Open( vlc_object_t * p_this ) 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->fmt.i_bitrate = p_sys->fmt.audio.i_rate * p_sys->fmt.audio.i_channels * p_sys->fmt.audio.i_bitspersample; @@ -271,95 +257,59 @@ static int Open( vlc_object_t * p_this ) 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->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 ); + /* add the es */ + p_sys->es = es_out_Add( p_demux->out, &p_sys->fmt ); - if( p_sys->fmt.audio.i_blockalign > 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->fmt.audio.i_blockalign ) != 0 ) - { - p_sys->i_frame_size += p_sys->fmt.audio.i_blockalign - 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->fmt.audio.i_rate; - - p_input->pf_demux = DemuxPCM; - p_input->pf_demux_control = demux_vaControlDefault; - } - - 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; } - p_input->stream.i_mux_rate = p_sys->fmt.i_bitrate / 50 / 8; - 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; - p_sys->p_es = es_out_Add( p_input->p_es_out, &p_sys->fmt ); 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; - 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 ); - - if( p_sys->fmt.audio.i_blockalign != 0 ) - { - i_pos += p_sys->fmt.audio.i_blockalign - i_pos % p_sys->fmt.audio.i_blockalign; - if( stream_Seek( p_input->s, i_pos ) ) - { - msg_Err( p_input, "seek failed (cannot resync)" ); - } - } - } + demux_sys_t *p_sys = p_demux->p_sys; + block_t *p_block; - input_ClockManageRef( p_input, - p_input->stream.p_selected_program, - p_sys->i_time * 9 / 100 ); + /* set PCR */ + es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_time ); - 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_pts = p_sys->i_time; - es_out_Send( p_input->p_es_out, p_sys->p_es, p_block ); + es_out_Send( p_demux->out, p_sys->es, p_block ); p_sys->i_time += p_sys->i_frame_length; - return( 1 ); + return 1; } /***************************************************************************** @@ -367,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 ); +} +