X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fa52.c;h=defb32b3b579a9f1e8b19781512d98f1ea3df044;hb=61c5ccdf303006a25fda9a60fffd8b91093a0b49;hp=c19831d671daf8018df936a95ae8cc13cf358005;hpb=7af3d91a653ca0b1b09f13e0c90466dc49c87daa;p=vlc diff --git a/modules/demux/a52.c b/modules/demux/a52.c index c19831d671..defb32b3b5 100644 --- a/modules/demux/a52.c +++ b/modules/demux/a52.c @@ -24,7 +24,12 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include @@ -41,8 +46,8 @@ static void Close ( vlc_object_t * ); vlc_module_begin(); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_DEMUX ); - set_description( _("Raw A/52 demuxer") ); - set_capability( "demux2", 145 ); + set_description( N_("Raw A/52 demuxer") ); + set_capability( "demux", 145 ); set_callbacks( Open, Close ); add_shortcut( "a52" ); vlc_module_end(); @@ -55,23 +60,23 @@ 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; }; -static int CheckSync( const uint8_t *p_peek, vlc_bool_t *p_big_endian ); +static int CheckSync( const uint8_t *p_peek, bool *p_big_endian ); #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 *****************************************************************************/ @@ -79,29 +84,32 @@ static int Open( vlc_object_t * p_this ) { demux_t *p_demux = (demux_t*)p_this; demux_sys_t *p_sys; - const byte_t*p_peek; + const uint8_t *p_peek; int i_peek = 0; - vlc_bool_t b_big_endian = 0; /* Arbitrary initialisation */ + bool b_big_endian = 0; /* Arbitrary initialisation */ /* Check if we are dealing with a WAV file */ - if( stream_Peek( p_demux->s, &p_peek, 12 ) == 12 && - !memcmp( p_peek, "RIFF", 4 ) && !memcmp( 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( stream_Peek( p_demux->s, &p_peek, i_peek ) == i_peek && - memcmp( 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 = stream_Peek( p_demux->s, &p_peek, i_peek + A52_PACKET_SIZE * 2); + 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 ) @@ -129,10 +137,8 @@ static int Open( vlc_object_t * p_this ) if( CheckSync( p_peek + i_peek, &b_big_endian ) != VLC_SUCCESS ) { - if( strncmp( p_demux->psz_demux, "a52", 3 ) ) - { + if( !p_demux->b_force ) return VLC_EGENERIC; - } /* User forced */ msg_Err( p_demux, "this doesn't look like a A52 audio stream, " @@ -140,8 +146,8 @@ static int Open( vlc_object_t * p_this ) } /* Fill p_demux fields */ - STANDARD_DEMUX_INIT; p_sys = p_demux->p_sys; - p_sys->b_start = VLC_TRUE; + 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; @@ -195,7 +201,7 @@ static int Demux( demux_t *p_demux ) #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-- ; ) { @@ -215,7 +221,7 @@ static int Demux( demux_t *p_demux ) 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 ) { @@ -225,7 +231,7 @@ static int Demux( demux_t *p_demux ) if( p_block_out->i_length ) { p_sys->i_mux_rate = - p_block_out->i_buffer * I64C(1000000)/p_block_out->i_length; + p_block_out->i_buffer * INT64_C(1000000)/p_block_out->i_length; } /* set PCR */ @@ -247,30 +253,40 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) { demux_sys_t *p_sys = p_demux->p_sys; if( i_query == DEMUX_SET_TIME ) + { 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 demux2_vaControlHelper( p_demux->s, + { + return demux_vaControlHelper( p_demux->s, 0, -1, 8*p_sys->i_mux_rate, 1, i_query, args ); + } } /***************************************************************************** * CheckSync: Check if buffer starts with an A52 sync code *****************************************************************************/ -static int CheckSync( const uint8_t *p_peek, vlc_bool_t *p_big_endian ) +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 = VLC_FALSE; + *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 = VLC_TRUE; + *p_big_endian = true; return VLC_SUCCESS; }