X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fa52.c;h=defb32b3b579a9f1e8b19781512d98f1ea3df044;hb=61c5ccdf303006a25fda9a60fffd8b91093a0b49;hp=dda074a918e4b2fb5122511868be2e02c6548a70;hpb=7bf9ebcf6611b3b091ea6a144c58c6a85bba20e2;p=vlc diff --git a/modules/demux/a52.c b/modules/demux/a52.c index dda074a918..defb32b3b5 100644 --- a/modules/demux/a52.c +++ b/modules/demux/a52.c @@ -1,8 +1,8 @@ /***************************************************************************** * a52.c : raw A/52 stream input module for vlc ***************************************************************************** - * Copyright (C) 2001 VideoLAN - * $Id: a52.c,v 1.1 2004/02/13 21:48:32 gbazin Exp $ + * Copyright (C) 2001-2007 the VideoLAN team + * $Id$ * * Authors: Gildas Bazin * @@ -18,106 +18,99 @@ * * 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 -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include #include -#define A52_PACKET_SIZE 16384 -#define A52_MAX_HEADER_SIZE 11 +#ifdef HAVE_UNISTD_H +# include +#endif /***************************************************************************** - * Local prototypes + * Module descriptor *****************************************************************************/ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -static int Demux ( input_thread_t * ); -static int Control( input_thread_t *, int, va_list ); +vlc_module_begin(); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_DEMUX ); + set_description( N_("Raw A/52 demuxer") ); + set_capability( "demux", 145 ); + set_callbacks( Open, Close ); + add_shortcut( "a52" ); +vlc_module_end(); + +/***************************************************************************** + * Local prototypes + *****************************************************************************/ +static int Demux ( demux_t * ); +static int Control( demux_t *, int, va_list ); struct demux_sys_t { - vlc_bool_t b_start; + bool b_start; es_out_id_t *p_es; /* Packetizer */ decoder_t *p_packetizer; int i_mux_rate; - vlc_bool_t b_big_endian; + bool b_big_endian; }; -/***************************************************************************** - * Module descriptor - *****************************************************************************/ -vlc_module_begin(); - set_description( _("Raw A/52 demuxer") ); - set_capability( "demux", 155 ); - set_callbacks( Open, Close ); - add_shortcut( "a52" ); -vlc_module_end(); +static int CheckSync( const uint8_t *p_peek, bool *p_big_endian ); -/***************************************************************************** - * CheckSync: Check if buffer starts with an A52 sync code - *****************************************************************************/ -int CheckSync( uint8_t *p_peek, vlc_bool_t *p_big_endian ) -{ - /* Little endian version of the bitstream */ - if( p_peek[0] == 0x77 && p_peek[1] == 0x0b && - p_peek[4] < 0x60 /* bsid < 12 */ ) - { - return VLC_SUCCESS; - } - /* Big endian version of the bitstream */ - else if( p_peek[0] == 0x0b && p_peek[1] == 0x77 && - p_peek[5] < 0x60 /* bsid < 12 */ ) - { - return VLC_SUCCESS; - } - - return VLC_EGENERIC; -} +#define PCM_FRAME_SIZE (1536 * 4) +#define A52_PACKET_SIZE (4 * PCM_FRAME_SIZE) +#define A52_PROBE_SIZE (512*1024) +#define A52_MAX_HEADER_SIZE 10 /***************************************************************************** * Open: initializes ES structures *****************************************************************************/ static int Open( vlc_object_t * p_this ) { - input_thread_t *p_input = (input_thread_t *)p_this; - demux_sys_t *p_sys; - byte_t * p_peek; - int i_peek = 0; - vlc_bool_t b_big_endian; - - p_input->pf_demux = Demux; - p_input->pf_demux_control = Control; - p_input->pf_rewind = NULL; + demux_t *p_demux = (demux_t*)p_this; + demux_sys_t *p_sys; + const uint8_t *p_peek; + int i_peek = 0; + bool b_big_endian = 0; /* Arbitrary initialisation */ /* Check if we are dealing with a WAV file */ - if( input_Peek( p_input, &p_peek, 12 ) == 12 && - !strncmp( p_peek, "RIFF", 4 ) && !strncmp( &p_peek[8], "WAVE", 4 ) ) + if( stream_Peek( p_demux->s, &p_peek, 12+8 ) == 12+8 && + !memcmp( p_peek, "RIFF", 4 ) && !memcmp( &p_peek[8], "WAVE", 4 ) ) { - int i_size; - /* Skip the wave header */ i_peek = 12 + 8; - while( input_Peek( p_input, &p_peek, i_peek ) == i_peek && - strncmp( p_peek + i_peek - 8, "data", 4 ) ) + while( memcmp( p_peek + i_peek - 8, "data", 4 ) ) { - i_peek += GetDWLE( p_peek + i_peek - 4 ) + 8; + uint32_t i_len = GetDWLE( p_peek + i_peek - 4 ); + if( i_len > A52_PROBE_SIZE || i_peek + i_len > A52_PROBE_SIZE ) + return VLC_EGENERIC; + + i_peek += i_len + 8; + if( stream_Peek( p_demux->s, &p_peek, i_peek ) != i_peek ) + return VLC_EGENERIC; } /* TODO: should check wave format and sample_rate */ /* Some A52 wav files don't begin with a sync code so we do a more * extensive search */ - i_size = input_Peek( p_input, &p_peek, i_peek + A52_PACKET_SIZE * 2); - i_size -= A52_MAX_HEADER_SIZE; + int i_size = stream_Peek( p_demux->s, &p_peek, i_peek + A52_PACKET_SIZE * 2); + i_size -= (PCM_FRAME_SIZE + A52_MAX_HEADER_SIZE); while( i_peek < i_size ) { @@ -125,72 +118,45 @@ static int Open( vlc_object_t * p_this ) /* The data is stored in 16 bits words */ i_peek += 2; else + { + /* Check following sync code */ + if( CheckSync( p_peek + i_peek + PCM_FRAME_SIZE, + &b_big_endian ) != VLC_SUCCESS ) + { + i_peek += 2; + continue; + } + break; + } } } /* Have a peep at the show. */ - if( input_Peek( p_input, &p_peek, i_peek + A52_MAX_HEADER_SIZE * 2 ) < - i_peek + A52_MAX_HEADER_SIZE * 2 ) - { - /* Stream too short */ - msg_Warn( p_input, "cannot peek()" ); - return VLC_EGENERIC; - } + CHECK_PEEK( p_peek, i_peek + A52_MAX_HEADER_SIZE * 2 ); if( CheckSync( p_peek + i_peek, &b_big_endian ) != VLC_SUCCESS ) { - if( p_input->psz_demux && !strncmp( p_input->psz_demux, "a52", 3 ) ) - { - /* User forced */ - msg_Err( p_input, "this doesn't look like a A52 audio stream, " - "continuing anyway" ); - } - else - { + if( !p_demux->b_force ) return VLC_EGENERIC; - } + + /* User forced */ + msg_Err( p_demux, "this doesn't look like a A52 audio stream, " + "continuing anyway" ); } - p_input->p_demux_data = p_sys = malloc( sizeof( demux_sys_t ) ); - p_sys->b_start = VLC_TRUE; + /* Fill p_demux fields */ + DEMUX_INIT_COMMON(); p_sys = p_demux->p_sys; + p_sys->b_start = true; p_sys->i_mux_rate = 0; p_sys->b_big_endian = b_big_endian; - /* - * Load the A52 packetizer - */ - p_sys->p_packetizer = vlc_object_create( p_input, VLC_OBJECT_DECODER ); - p_sys->p_packetizer->pf_decode_audio = 0; - p_sys->p_packetizer->pf_decode_video = 0; - p_sys->p_packetizer->pf_decode_sub = 0; - p_sys->p_packetizer->pf_packetize = 0; - - /* Initialization of decoder structure */ - es_format_Init( &p_sys->p_packetizer->fmt_in, AUDIO_ES, - VLC_FOURCC( 'a', '5', '2', ' ' ) ); - - p_sys->p_packetizer->p_module = - module_Need( p_sys->p_packetizer, "packetizer", NULL ); - if( !p_sys->p_packetizer->p_module ) - { - msg_Err( p_input, "cannot find A52 packetizer" ); - return VLC_EGENERIC; - } + /* Load the A52 packetizer */ + INIT_APACKETIZER( p_sys->p_packetizer, 'a', '5', '2', ' ' ); + LOAD_PACKETIZER_OR_FAIL( p_sys->p_packetizer, "A52" ); /* 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" ); - return VLC_EGENERIC; - } - p_input->stream.i_mux_rate = 0; - vlc_mutex_unlock( &p_input->stream.stream_lock ); - - p_sys->p_es = - es_out_Add( p_input->p_es_out, &p_sys->p_packetizer->fmt_in ); + p_sys->p_es = es_out_Add( p_demux->out, &p_sys->p_packetizer->fmt_in ); return VLC_SUCCESS; } @@ -200,15 +166,10 @@ static int Open( vlc_object_t * p_this ) *****************************************************************************/ 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; - - /* Unneed module */ - module_Unneed( p_sys->p_packetizer, p_sys->p_packetizer->p_module ); - - /* Delete the decoder */ - vlc_object_destroy( p_sys->p_packetizer ); + demux_t *p_demux = (demux_t*)p_this; + demux_sys_t *p_sys = p_demux->p_sys; + DESTROY_PACKETIZER( p_sys->p_packetizer ); free( p_sys ); } @@ -217,12 +178,16 @@ static void Close( vlc_object_t * p_this ) ***************************************************************************** * 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; - block_t *p_block_in, *p_block_out; + demux_sys_t *p_sys = p_demux->p_sys; + block_t *p_block_in, *p_block_out; + + /* Align stream */ + int64_t i_pos = stream_Tell( p_demux->s ); + if( i_pos % 2 ) stream_Read( p_demux->s, NULL, 1 ); - if( !( p_block_in = stream_Block( p_input->s, A52_PACKET_SIZE ) ) ) + if( !( p_block_in = stream_Block( p_demux->s, A52_PACKET_SIZE ) ) ) { return 0; } @@ -230,15 +195,13 @@ static int Demux( input_thread_t * p_input ) if( !p_sys->b_big_endian && p_block_in->i_buffer ) { /* Convert to big endian */ - int64_t i_pos = stream_Tell( p_input->s ); - if( i_pos % 2 ) p_block_in->p_buffer++; /* Align stream */ #ifdef HAVE_SWAB swab(p_block_in->p_buffer, p_block_in->p_buffer, p_block_in->i_buffer); #else int i; - byte_t *p_tmp, tmp; + uint8_t *p_tmp, tmp; p_tmp = p_block_in->p_buffer; for( i = p_block_in->i_buffer / 2 ; i-- ; ) { @@ -258,7 +221,7 @@ static int Demux( input_thread_t * p_input ) while( (p_block_out = p_sys->p_packetizer->pf_packetize( p_sys->p_packetizer, &p_block_in )) ) { - p_sys->b_start = VLC_FALSE; + p_sys->b_start = false; while( p_block_out ) { @@ -266,20 +229,15 @@ static int Demux( input_thread_t * p_input ) /* We assume a constant bitrate */ if( p_block_out->i_length ) - p_sys->i_mux_rate = - p_block_out->i_buffer * I64C(1000000) / p_block_out->i_length; - p_input->stream.i_mux_rate = p_sys->i_mux_rate / 50; - - input_ClockManageRef( p_input, - p_input->stream.p_selected_program, - p_block_out->i_pts * 9 / 100 ); + { + p_sys->i_mux_rate = + p_block_out->i_buffer * INT64_C(1000000)/p_block_out->i_length; + } - p_block_in->b_discontinuity = 0; - p_block_out->i_dts = p_block_out->i_pts = - input_ClockGetTS( p_input, p_input->stream.p_selected_program, - p_block_out->i_pts * 9 / 100 ); + /* set PCR */ + es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block_out->i_dts ); - es_out_Send( p_input->p_es_out, p_sys->p_es, p_block_out ); + es_out_Send( p_demux->out, p_sys->p_es, p_block_out ); p_block_out = p_next; } @@ -291,36 +249,48 @@ static int Demux( input_thread_t * p_input ) /***************************************************************************** * Control: *****************************************************************************/ -static int Control( input_thread_t *p_input, int i_query, va_list args ) +static int Control( demux_t *p_demux, int i_query, va_list args ) { - demux_sys_t *p_sys = (demux_sys_t *)p_input->p_demux_data; - int64_t *pi64; - - switch( i_query ) + demux_sys_t *p_sys = p_demux->p_sys; + if( i_query == DEMUX_SET_TIME ) { - case DEMUX_GET_TIME: - pi64 = (int64_t*)va_arg( args, int64_t * ); - if( p_sys->i_mux_rate > 0 ) - { - *pi64 = I64C(1000000) * stream_Tell( p_input->s ) / - p_sys->i_mux_rate; - return VLC_SUCCESS; - } - *pi64 = 0; - return VLC_EGENERIC; - - case DEMUX_GET_LENGTH: - pi64 = (int64_t*)va_arg( args, int64_t * ); - if( p_sys->i_mux_rate > 0 ) - { - *pi64 = I64C(1000000) * stream_Size( p_input->s ) / - p_sys->i_mux_rate; - return VLC_SUCCESS; - } - *pi64 = 0; - return VLC_EGENERIC; + return VLC_EGENERIC; + } + else if( i_query == DEMUX_HAS_UNSUPPORTED_META ) + { + bool *pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = true; + return VLC_SUCCESS; + } + else + { + return demux_vaControlHelper( p_demux->s, + 0, -1, + 8*p_sys->i_mux_rate, 1, i_query, args ); + } +} - default: - return demux_vaControlDefault( p_input, i_query, args ); +/***************************************************************************** + * CheckSync: Check if buffer starts with an A52 sync code + *****************************************************************************/ +static int CheckSync( const uint8_t *p_peek, bool *p_big_endian ) +{ + /* Little endian version of the bitstream */ + if( p_peek[0] == 0x77 && p_peek[1] == 0x0b && + p_peek[4] < 0x60 /* bsid < 12 */ ) + { + *p_big_endian = false; + return VLC_SUCCESS; + } + /* Big endian version of the bitstream */ + else if( p_peek[0] == 0x0b && p_peek[1] == 0x77 && + p_peek[5] < 0x60 /* bsid < 12 */ ) + { + *p_big_endian = true; + return VLC_SUCCESS; } + + return VLC_EGENERIC; } + +