X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fa52.c;h=fec3f80ae1d0c838fa3b3cbefd8d0b4adc6d5ab7;hb=22dbf2bfad420b171fee86c1a97a433929e6fc1e;hp=64f2f5298f5cc83f370db2a76046c24942426d29;hpb=c57912c9f801be2b4982fc89a0740e57c0a3ece6;p=vlc diff --git a/modules/codec/a52.c b/modules/codec/a52.c index 64f2f5298f..fec3f80ae1 100644 --- a/modules/codec/a52.c +++ b/modules/codec/a52.c @@ -1,10 +1,10 @@ /***************************************************************************** * a52.c: parse A/52 audio sync info and packetize the stream ***************************************************************************** - * Copyright (C) 2001-2002 VideoLAN + * Copyright (C) 2001-2002 the VideoLAN team * $Id$ * - * Authors: Stéphane Borel + * Authors: Stéphane Borel * Christophe Massiot * Gildas Bazin * @@ -20,16 +20,22 @@ * * 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 "vlc_block_helper.h" +#include +#include +#include +#include +#include +#include #define A52_HEADER_SIZE 7 @@ -39,7 +45,7 @@ struct decoder_sys_t { /* Module mode */ - vlc_bool_t b_packetizer; + bool b_packetizer; /* * Input properties @@ -57,6 +63,7 @@ struct decoder_sys_t int i_frame_size, i_bit_rate; unsigned int i_rate, i_channels, i_channels_conf; + int i_input_rate; }; enum { @@ -77,7 +84,8 @@ static int OpenPacketizer( vlc_object_t * ); static void CloseDecoder ( vlc_object_t * ); static void *DecodeBlock ( decoder_t *, block_t ** ); -static int SyncInfo ( const byte_t *, int *, int *, int *,int * ); +static int SyncInfo ( const uint8_t *, unsigned int *, unsigned int *, + unsigned int *, int * ); static uint8_t *GetOutBuffer ( decoder_t *, void ** ); static aout_buffer_t *GetAoutBuffer( decoder_t * ); @@ -87,12 +95,14 @@ static block_t *GetSoutBuffer( decoder_t * ); * Module descriptor *****************************************************************************/ vlc_module_begin(); - set_description( _("A/52 parser") ); + set_description( N_("A/52 parser") ); set_capability( "decoder", 100 ); set_callbacks( OpenDecoder, CloseDecoder ); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_ACODEC ); add_submodule(); - set_description( _("A/52 audio packetizer") ); + set_description( N_("A/52 audio packetizer") ); set_capability( "packetizer", 10 ); set_callbacks( OpenPacketizer, CloseDecoder ); vlc_module_end(); @@ -114,17 +124,15 @@ static int OpenDecoder( vlc_object_t *p_this ) /* Allocate the memory needed to store the decoder's structure */ if( ( p_dec->p_sys = p_sys = (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL ) - { - msg_Err( p_dec, "out of memory" ); - return VLC_EGENERIC; - } + return VLC_ENOMEM; /* Misc init */ - p_sys->b_packetizer = VLC_FALSE; + p_sys->b_packetizer = false; p_sys->i_state = STATE_NOSYNC; aout_DateSet( &p_sys->end_date, 0 ); - p_sys->bytestream = block_BytestreamInit( p_dec ); + p_sys->bytestream = block_BytestreamInit(); + p_sys->i_input_rate = INPUT_RATE_DEFAULT; /* Set output properties */ p_dec->fmt_out.i_cat = AUDIO_ES; @@ -146,7 +154,7 @@ static int OpenPacketizer( vlc_object_t *p_this ) int i_ret = OpenDecoder( p_this ); - if( i_ret == VLC_SUCCESS ) p_dec->p_sys->b_packetizer = VLC_TRUE; + if( i_ret == VLC_SUCCESS ) p_dec->p_sys->b_packetizer = true; return i_ret; } @@ -165,18 +173,28 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) if( !pp_block || !*pp_block ) return NULL; - if( !aout_DateGet( &p_sys->end_date ) && !(*pp_block)->i_pts ) + if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) { - /* We've just started the stream, wait for the first PTS. */ + if( (*pp_block)->i_flags&BLOCK_FLAG_CORRUPTED ) + { + p_sys->i_state = STATE_NOSYNC; + block_BytestreamFlush( &p_sys->bytestream ); + } +// aout_DateSet( &p_sys->end_date, 0 ); block_Release( *pp_block ); return NULL; } - if( (*pp_block)->i_flags&BLOCK_FLAG_DISCONTINUITY ) + if( !aout_DateGet( &p_sys->end_date ) && !(*pp_block)->i_pts ) { - p_sys->i_state = STATE_NOSYNC; + /* We've just started the stream, wait for the first PTS. */ + block_Release( *pp_block ); + return NULL; } + if( (*pp_block)->i_rate > 0 ) + p_sys->i_input_rate = (*pp_block)->i_rate; + block_BytestreamPush( &p_sys->bytestream, *pp_block ); while( 1 ) @@ -282,7 +300,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) case STATE_SEND_DATA: if( !(p_buf = GetOutBuffer( p_dec, &p_out_buffer )) ) { - //p_dec->b_error = VLC_TRUE; + //p_dec->b_error = true; return NULL; } @@ -375,7 +393,8 @@ static aout_buffer_t *GetAoutBuffer( decoder_t *p_dec ) if( p_buf == NULL ) return NULL; p_buf->start_date = aout_DateGet( &p_sys->end_date ); - p_buf->end_date = aout_DateIncrement( &p_sys->end_date, A52_FRAME_NB ); + p_buf->end_date = aout_DateIncrement( &p_sys->end_date, + A52_FRAME_NB * p_sys->i_input_rate / INPUT_RATE_DEFAULT ); return p_buf; } @@ -393,8 +412,10 @@ static block_t *GetSoutBuffer( decoder_t *p_dec ) p_block->i_pts = p_block->i_dts = aout_DateGet( &p_sys->end_date ); - p_block->i_length = aout_DateIncrement( &p_sys->end_date, A52_FRAME_NB ) - - p_block->i_pts; + p_block->i_length = + aout_DateIncrement( &p_sys->end_date, + A52_FRAME_NB * p_sys->i_input_rate / INPUT_RATE_DEFAULT ) - + p_block->i_pts; return p_block; } @@ -406,9 +427,10 @@ static block_t *GetSoutBuffer( decoder_t *p_dec ) * since we don't want to oblige S/PDIF people to use liba52 just to get * their SyncInfo... *****************************************************************************/ -static int SyncInfo( const byte_t * p_buf, - int * pi_channels, int * pi_channels_conf, - int * pi_sample_rate, int * pi_bit_rate ) +static int SyncInfo( const uint8_t * p_buf, + unsigned int * pi_channels, + unsigned int * pi_channels_conf, + unsigned int * pi_sample_rate, int * pi_bit_rate ) { static const uint8_t halfrate[12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3 }; static const int rate[] = { 32, 40, 48, 56, 64, 80, 96, 112,