X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fa52.c;h=3f0713b2a1a68d5410f05e1201a009966b98a17b;hb=a4ee447788e85ead0d1ce0e0f7f345af3829ddc9;hp=04980ab0aef40ac33a0e10ad0b6f56565246d7e7;hpb=aba1225f4fdfbbf27f842a6616de571fc1951c34;p=vlc diff --git a/modules/codec/a52.c b/modules/codec/a52.c index 04980ab0ae..3f0713b2a1 100644 --- a/modules/codec/a52.c +++ b/modules/codec/a52.c @@ -2,12 +2,11 @@ * a52.c: A/52 basic parser ***************************************************************************** * Copyright (C) 2001-2002 VideoLAN - * $Id: a52.c,v 1.20 2002/12/28 02:02:18 massiot Exp $ + * $Id: a52.c,v 1.24 2003/09/30 20:23:03 gbazin Exp $ * * Authors: Stéphane Borel * Christophe Massiot - * Michel Lespinasse - * Aaron Holtzman + * Gildas Bazin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -34,45 +33,87 @@ #include #include +#include #include +#include #ifdef HAVE_UNISTD_H # include #endif +#include "vlc_block_helper.h" + +#define A52_HEADER_SIZE 7 + /***************************************************************************** - * dec_thread_t : A52 pass-through thread descriptor + * decoder_sys_t : decoder descriptor *****************************************************************************/ -typedef struct dec_thread_t +struct decoder_sys_t { + /* Module mode */ + vlc_bool_t b_packetizer; + /* - * Thread properties + * Input properties */ - vlc_thread_t thread_id; /* id for thread functions */ + int i_state; + vlc_bool_t b_synchro; + + block_t *p_chain; + block_bytestream_t bytestream; /* - * Input properties + * Decoder output properties + */ + aout_instance_t * p_aout; /* opaque */ + aout_input_t * p_aout_input; /* opaque */ + audio_sample_format_t aout_format; + aout_buffer_t * p_aout_buffer; /* current aout buffer being filled */ + + /* + * Packetizer output properties */ - decoder_fifo_t * p_fifo; /* stores the PES stream data */ - bit_stream_t bit_stream; + sout_packetizer_input_t *p_sout_input; + sout_format_t sout_format; + sout_buffer_t * p_sout_buffer; /* current sout buffer */ /* - * Output properties + * Common properties */ - aout_instance_t * p_aout; /* opaque */ - aout_input_t * p_aout_input; /* opaque */ - audio_sample_format_t output_format; -} dec_thread_t; + uint8_t *p_out_buffer; /* output buffer */ + int i_out_buffer; /* position in output buffer */ + audio_date_t end_date; + + mtime_t pts; + int i_frame_size, i_bit_rate; + unsigned int i_rate, i_channels, i_channels_conf; + +}; + +enum { + + STATE_NOSYNC, + STATE_SYNC, + STATE_HEADER, + STATE_DATA +}; /**************************************************************************** * Local prototypes ****************************************************************************/ -static int OpenDecoder ( vlc_object_t * ); -static int RunDecoder ( decoder_fifo_t * ); +static int OpenDecoder ( vlc_object_t * ); +static int OpenPacketizer( vlc_object_t * ); + +static int InitDecoder ( decoder_t * ); +static int RunDecoder ( decoder_t *, block_t * ); +static int EndDecoder ( decoder_t * ); -static void EndThread ( dec_thread_t * ); +static int SyncInfo ( const byte_t *, int *, int *, int *,int * ); -static int SyncInfo ( const byte_t *, int *, int *, int * ); +static int GetOutBuffer ( decoder_t *, uint8_t ** ); +static int GetAoutBuffer( decoder_t *, aout_buffer_t ** ); +static int GetSoutBuffer( decoder_t *, sout_buffer_t ** ); +static int SendOutBuffer( decoder_t * ); /***************************************************************************** * Module descriptor @@ -81,6 +122,11 @@ vlc_module_begin(); set_description( _("A/52 parser") ); set_capability( "decoder", 100 ); set_callbacks( OpenDecoder, NULL ); + + add_submodule(); + set_description( _("A/52 audio packetizer") ); + set_capability( "packetizer", 10 ); + set_callbacks( OpenPacketizer, NULL ); vlc_module_end(); /***************************************************************************** @@ -88,15 +134,65 @@ vlc_module_end(); *****************************************************************************/ static int OpenDecoder( vlc_object_t *p_this ) { - decoder_fifo_t *p_fifo = (decoder_fifo_t*) p_this; + decoder_t *p_dec = (decoder_t*)p_this; + + if( p_dec->p_fifo->i_fourcc != VLC_FOURCC('a','5','2',' ') + && p_dec->p_fifo->i_fourcc != VLC_FOURCC('a','5','2','b') ) + { + return VLC_EGENERIC; + } + + p_dec->pf_init = InitDecoder; + p_dec->pf_decode = RunDecoder; + p_dec->pf_end = EndDecoder; - if( p_fifo->i_fourcc != VLC_FOURCC('a','5','2',' ') - && p_fifo->i_fourcc != VLC_FOURCC('a','5','2','b') ) + /* Allocate the memory needed to store the decoder's structure */ + if( ( p_dec->p_sys = + (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL ) { + msg_Err( p_dec, "out of memory" ); return VLC_EGENERIC; } + p_dec->p_sys->b_packetizer = VLC_FALSE; + + return VLC_SUCCESS; +} + +static int OpenPacketizer( vlc_object_t *p_this ) +{ + decoder_t *p_dec = (decoder_t*)p_this; + + int i_ret = OpenDecoder( p_this ); + + if( i_ret == VLC_SUCCESS ) p_dec->p_sys->b_packetizer = VLC_TRUE; + + return i_ret; +} + +/***************************************************************************** + * InitDecoder: Initalize the decoder + *****************************************************************************/ +static int InitDecoder( decoder_t *p_dec ) +{ + p_dec->p_sys->i_state = STATE_NOSYNC; + p_dec->p_sys->b_synchro = VLC_FALSE; + + p_dec->p_sys->p_out_buffer = NULL; + p_dec->p_sys->i_out_buffer = 0; + aout_DateSet( &p_dec->p_sys->end_date, 0 ); + + p_dec->p_sys->p_aout = NULL; + p_dec->p_sys->p_aout_input = NULL; + p_dec->p_sys->p_aout_buffer = NULL; + p_dec->p_sys->aout_format.i_format = VLC_FOURCC('a','5','2',' '); + + p_dec->p_sys->p_sout_input = NULL; + p_dec->p_sys->p_sout_buffer = NULL; + p_dec->p_sys->sout_format.i_cat = AUDIO_ES; + p_dec->p_sys->sout_format.i_fourcc = VLC_FOURCC( 'a', '5', '2', ' ' ); + + p_dec->p_sys->p_chain = NULL; - p_fifo->pf_run = RunDecoder; return VLC_SUCCESS; } @@ -105,176 +201,353 @@ static int OpenDecoder( vlc_object_t *p_this ) **************************************************************************** * This function is called just after the thread is launched. ****************************************************************************/ -static int RunDecoder( decoder_fifo_t *p_fifo ) +static int RunDecoder( decoder_t *p_dec, block_t *p_block ) { - dec_thread_t * p_dec; - audio_date_t end_date; + decoder_sys_t *p_sys = p_dec->p_sys; + uint8_t p_header[A52_HEADER_SIZE]; - /* Allocate the memory needed to store the thread's structure */ - p_dec = malloc( sizeof(dec_thread_t) ); - if( p_dec == NULL ) + if( p_sys->p_chain ) { - msg_Err( p_fifo, "out of memory" ); - DecoderError( p_fifo ); - return -1; + block_ChainAppend( &p_sys->p_chain, p_block ); } - - /* Initialize the thread properties */ - p_dec->p_aout = NULL; - p_dec->p_aout_input = NULL; - p_dec->p_fifo = p_fifo; - p_dec->output_format.i_format = VLC_FOURCC('a','5','2',' '); - - aout_DateSet( &end_date, 0 ); - - /* Init the bitstream */ - if( InitBitstream( &p_dec->bit_stream, p_dec->p_fifo, - NULL, NULL ) != VLC_SUCCESS ) + else { - msg_Err( p_fifo, "cannot initialize bitstream" ); - DecoderError( p_fifo ); - free( p_dec ); - return -1; + block_ChainAppend( &p_sys->p_chain, p_block ); + p_sys->bytestream = block_BytestreamInit( p_dec, p_sys->p_chain, 0 ); } - /* Decoder thread's main loop */ - while ( !p_dec->p_fifo->b_die && !p_dec->p_fifo->b_error ) + while( 1 ) { - int i_bit_rate; - unsigned int i_rate, i_original_channels, i_frame_size; - mtime_t pts; - byte_t p_header[7]; - aout_buffer_t * p_buffer; - - /* Look for sync word - should be 0x0b77 */ - RealignBits( &p_dec->bit_stream ); - while ( (ShowBits( &p_dec->bit_stream, 16 ) ) != 0x0b77 && - (!p_dec->p_fifo->b_die) && (!p_dec->p_fifo->b_error) ) + switch( p_sys->i_state ) { - RemoveBits( &p_dec->bit_stream, 8 ); - } - if ( p_dec->p_fifo->b_die || p_dec->p_fifo->b_error ) break; - /* Set the Presentation Time Stamp */ - NextPTS( &p_dec->bit_stream, &pts, NULL ); - if ( pts != 0 && pts != aout_DateGet( &end_date ) ) - { - aout_DateSet( &end_date, pts ); - } - - /* Get A/52 frame header */ - GetChunk( &p_dec->bit_stream, p_header, 7 ); - if ( p_dec->p_fifo->b_die || p_dec->p_fifo->b_error ) break; + case STATE_NOSYNC: + while( block_PeekBytes( &p_sys->bytestream, p_header, 2 ) + == VLC_SUCCESS ) + { + if( p_header[0] == 0x0b && p_header[1] == 0x77 ) + { + p_sys->i_state = STATE_SYNC; + break; + } + block_SkipByte( &p_sys->bytestream ); + p_dec->p_sys->b_synchro = VLC_FALSE; + } + if( p_sys->i_state != STATE_SYNC ) + { + block_ChainRelease( p_sys->p_chain ); + p_sys->p_chain = NULL; - /* Check if frame is valid and get frame info */ - i_frame_size = SyncInfo( p_header, &i_original_channels, &i_rate, - &i_bit_rate ); + /* Need more data */ + return VLC_SUCCESS; + } - if( !i_frame_size ) - { - msg_Warn( p_dec->p_fifo, "a52_syncinfo failed" ); - continue; - } + case STATE_SYNC: + /* New frame, set the Presentation Time Stamp */ + p_sys->pts = p_sys->bytestream.p_block->i_pts; + if( p_sys->pts != 0 && + p_sys->pts != aout_DateGet( &p_sys->end_date ) ) + { + aout_DateSet( &p_sys->end_date, p_sys->pts ); + } + p_sys->i_state = STATE_HEADER; + break; - if( (p_dec->p_aout_input != NULL) && - ( (p_dec->output_format.i_rate != i_rate) - || (p_dec->output_format.i_original_channels - != i_original_channels) - || (p_dec->output_format.i_bytes_per_frame != i_frame_size) ) ) - { - /* Parameters changed - this should not happen. */ - aout_DecDelete( p_dec->p_aout, p_dec->p_aout_input ); - p_dec->p_aout_input = NULL; - } + case STATE_HEADER: + /* Get A/52 frame header (A52_HEADER_SIZE bytes) */ + if( block_PeekBytes( &p_sys->bytestream, p_header, + A52_HEADER_SIZE ) != VLC_SUCCESS ) + { + /* Need more data */ + return VLC_SUCCESS; + } - /* Creating the audio input if not created yet. */ - if( p_dec->p_aout_input == NULL ) - { - p_dec->output_format.i_rate = i_rate; - p_dec->output_format.i_original_channels = i_original_channels; - p_dec->output_format.i_physical_channels - = i_original_channels & AOUT_CHAN_PHYSMASK; - p_dec->output_format.i_bytes_per_frame = i_frame_size; - p_dec->output_format.i_frame_length = A52_FRAME_NB; - aout_DateInit( &end_date, i_rate ); - p_dec->p_aout_input = aout_DecNew( p_dec->p_fifo, - &p_dec->p_aout, - &p_dec->output_format ); - - if ( p_dec->p_aout_input == NULL ) + /* Check if frame is valid and get frame info */ + p_sys->i_frame_size = SyncInfo( p_header, + &p_sys->i_channels, + &p_sys->i_channels_conf, + &p_sys->i_rate, + &p_sys->i_bit_rate ); + if( !p_sys->i_frame_size ) { - p_dec->p_fifo->b_error = 1; + msg_Dbg( p_dec, "emulated sync word" ); + block_SkipByte( &p_sys->bytestream ); + p_sys->i_state = STATE_NOSYNC; + p_dec->p_sys->b_synchro = VLC_FALSE; break; } + p_sys->i_state = STATE_DATA; + + case STATE_DATA: + /* TODO: If p_block == NULL, flush the buffer without checking the + * next sync word */ + + if( !p_dec->p_sys->b_synchro ) + { + /* Check if next expected frame contains the sync word */ + if( block_PeekOffsetBytes( &p_sys->bytestream, + p_sys->i_frame_size, p_header, 2 ) + != VLC_SUCCESS ) + { + /* Need more data */ + return VLC_SUCCESS; + } + + if( p_header[0] != 0x0b || p_header[1] != 0x77 ) + { + msg_Dbg( p_dec, "emulated sync word " + "(no sync on following frame)" ); + p_sys->i_state = STATE_NOSYNC; + block_SkipByte( &p_sys->bytestream ); + p_dec->p_sys->b_synchro = VLC_FALSE; + break; + } + } + + if( !p_dec->p_sys->p_out_buffer ) + if( GetOutBuffer( p_dec, &p_sys->p_out_buffer ) != VLC_SUCCESS ) + { + return VLC_EGENERIC; + } + + /* Copy the whole frame into the buffer */ + if( block_GetBytes( &p_sys->bytestream, p_sys->p_out_buffer, + p_sys->i_frame_size ) != VLC_SUCCESS ) + { + /* Need more data */ + return VLC_SUCCESS; + } + + p_sys->p_chain = block_BytestreamFlush( &p_sys->bytestream ); + + SendOutBuffer( p_dec ); + p_sys->i_state = STATE_NOSYNC; + p_dec->p_sys->b_synchro = VLC_TRUE; + + /* Make sure we don't reuse the same pts twice */ + if( p_sys->pts == p_sys->bytestream.p_block->i_pts ) + p_sys->pts = p_sys->bytestream.p_block->i_pts = 0; } + } - if ( !aout_DateGet( &end_date ) ) + return VLC_SUCCESS; +} + +/***************************************************************************** + * EndDecoder: clean up the decoder + *****************************************************************************/ +static int EndDecoder( decoder_t *p_dec ) +{ + if( p_dec->p_sys->p_aout_input != NULL ) + { + if( p_dec->p_sys->p_aout_buffer ) { - byte_t p_junk[3840]; + aout_DecDeleteBuffer( p_dec->p_sys->p_aout, + p_dec->p_sys->p_aout_input, + p_dec->p_sys->p_aout_buffer ); + } + + aout_DecDelete( p_dec->p_sys->p_aout, p_dec->p_sys->p_aout_input ); + } - /* We've just started the stream, wait for the first PTS. */ - GetChunk( &p_dec->bit_stream, p_junk, i_frame_size - 7 ); - continue; + if( p_dec->p_sys->p_sout_input != NULL ) + { + if( p_dec->p_sys->p_sout_buffer ) + { + sout_BufferDelete( p_dec->p_sys->p_sout_input->p_sout, + p_dec->p_sys->p_sout_buffer ); } - p_buffer = aout_DecNewBuffer( p_dec->p_aout, p_dec->p_aout_input, - A52_FRAME_NB ); - if ( p_buffer == NULL ) + sout_InputDelete( p_dec->p_sys->p_sout_input ); + } + + if( p_dec->p_sys->p_chain ) block_ChainRelease( p_sys->p_chain ); + + free( p_dec->p_sys ); + + return VLC_SUCCESS; +} + +/***************************************************************************** + * GetOutBuffer: + *****************************************************************************/ +static int GetOutBuffer( decoder_t *p_dec, uint8_t **pp_out_buffer ) +{ + decoder_sys_t *p_sys = p_dec->p_sys; + int i_ret; + + if( p_sys->b_packetizer ) + { + i_ret= GetSoutBuffer( p_dec, &p_sys->p_sout_buffer ); + *pp_out_buffer = + p_sys->p_sout_buffer ? p_sys->p_sout_buffer->p_buffer : NULL; + } + else + { + i_ret = GetAoutBuffer( p_dec, &p_sys->p_aout_buffer ); + *pp_out_buffer = + p_sys->p_aout_buffer ? p_sys->p_aout_buffer->p_buffer : NULL; + } + + return i_ret; +} + +/***************************************************************************** + * GetAoutBuffer: + *****************************************************************************/ +static int GetAoutBuffer( decoder_t *p_dec, aout_buffer_t **pp_buffer ) +{ + decoder_sys_t *p_sys = p_dec->p_sys; + + if( p_sys->p_aout_input != NULL && + ( p_sys->aout_format.i_rate != p_sys->i_rate + || p_sys->aout_format.i_original_channels != p_sys->i_channels_conf + || (int)p_sys->aout_format.i_bytes_per_frame != p_sys->i_frame_size ) ) + { + /* Parameters changed - this should not happen. */ + aout_DecDelete( p_sys->p_aout, p_sys->p_aout_input ); + p_sys->p_aout_input = NULL; + } + + /* Creating the audio input if not created yet. */ + if( p_sys->p_aout_input == NULL ) + { + p_sys->aout_format.i_rate = p_sys->i_rate; + p_sys->aout_format.i_original_channels = p_sys->i_channels_conf; + p_sys->aout_format.i_physical_channels + = p_sys->i_channels_conf & AOUT_CHAN_PHYSMASK; + p_sys->aout_format.i_bytes_per_frame = p_sys->i_frame_size; + p_sys->aout_format.i_frame_length = A52_FRAME_NB; + aout_DateInit( &p_sys->end_date, p_sys->i_rate ); + aout_DateSet( &p_sys->end_date, p_sys->pts ); + p_sys->p_aout_input = aout_DecNew( p_dec, + &p_sys->p_aout, + &p_sys->aout_format ); + + if ( p_sys->p_aout_input == NULL ) { - p_dec->p_fifo->b_error = 1; - break; + *pp_buffer = NULL; + return VLC_SUCCESS; } - p_buffer->start_date = aout_DateGet( &end_date ); - p_buffer->end_date = aout_DateIncrement( &end_date, - A52_FRAME_NB ); - - /* Get the whole frame. */ - memcpy( p_buffer->p_buffer, p_header, 7 ); - GetChunk( &p_dec->bit_stream, p_buffer->p_buffer + 7, - i_frame_size - 7 ); - if( p_dec->p_fifo->b_die ) + } + + if( !aout_DateGet( &p_sys->end_date ) ) + { + /* We've just started the stream, wait for the first PTS. */ + *pp_buffer = NULL; + return VLC_SUCCESS; + } + + *pp_buffer = aout_DecNewBuffer( p_sys->p_aout, p_sys->p_aout_input, + A52_FRAME_NB ); + if( *pp_buffer == NULL ) + { + return VLC_SUCCESS; + } + + (*pp_buffer)->start_date = aout_DateGet( &p_sys->end_date ); + (*pp_buffer)->end_date = + aout_DateIncrement( &p_sys->end_date, A52_FRAME_NB ); + + return VLC_SUCCESS; +} + +/***************************************************************************** + * GetSoutBuffer: + *****************************************************************************/ +static int GetSoutBuffer( decoder_t *p_dec, sout_buffer_t **pp_buffer ) +{ + decoder_sys_t *p_sys = p_dec->p_sys; + + if( p_sys->p_sout_input != NULL && + ( p_sys->sout_format.i_sample_rate != (int)p_sys->i_rate + || p_sys->sout_format.i_channels != (int)p_sys->i_channels ) ) + { + /* Parameters changed - this should not happen. */ + } + + /* Creating the sout input if not created yet. */ + if( p_sys->p_sout_input == NULL ) + { + p_sys->sout_format.i_sample_rate = p_sys->i_rate; + p_sys->sout_format.i_channels = p_sys->i_channels; + p_sys->sout_format.i_block_align = 0; + p_sys->sout_format.i_bitrate = p_sys->i_bit_rate; + p_sys->sout_format.i_extra_data = 0; + p_sys->sout_format.p_extra_data = NULL; + + aout_DateInit( &p_sys->end_date, p_sys->i_rate ); + aout_DateSet( &p_sys->end_date, p_sys->pts ); + + p_sys->p_sout_input = sout_InputNew( p_dec, &p_sys->sout_format ); + if( p_sys->p_sout_input == NULL ) { - aout_DecDeleteBuffer( p_dec->p_aout, p_dec->p_aout_input, - p_buffer ); - break; + msg_Err( p_dec, "cannot add a new stream" ); + *pp_buffer = NULL; + return VLC_EGENERIC; } + msg_Info( p_dec, "A/52 channels:%d samplerate:%d bitrate:%d", + p_sys->i_channels, p_sys->i_rate, p_sys->i_bit_rate ); + } - /* Send the buffer to the aout core. */ - aout_DecPlay( p_dec->p_aout, p_dec->p_aout_input, p_buffer ); + if( !aout_DateGet( &p_sys->end_date ) ) + { + /* We've just started the stream, wait for the first PTS. */ + *pp_buffer = NULL; + return VLC_SUCCESS; } - if( p_dec->p_fifo->b_error ) + *pp_buffer = sout_BufferNew( p_sys->p_sout_input->p_sout, + p_sys->i_frame_size ); + if( *pp_buffer == NULL ) { - DecoderError( p_dec->p_fifo ); + return VLC_SUCCESS; } - EndThread( p_dec ); + (*pp_buffer)->i_pts = + (*pp_buffer)->i_dts = aout_DateGet( &p_sys->end_date ); + + (*pp_buffer)->i_length = + aout_DateIncrement( &p_sys->end_date, A52_FRAME_NB ) + - (*pp_buffer)->i_pts; - return 0; + return VLC_SUCCESS; } /***************************************************************************** - * EndThread : spdif thread destruction + * SendOutBuffer: *****************************************************************************/ -static void EndThread( dec_thread_t * p_dec ) +static int SendOutBuffer( decoder_t *p_dec ) { - if ( p_dec->p_aout_input != NULL ) + decoder_sys_t *p_sys = p_dec->p_sys; + + if( p_sys->b_packetizer ) { - aout_DecDelete( p_dec->p_aout, p_dec->p_aout_input ); + sout_InputSendBuffer( p_sys->p_sout_input, p_sys->p_sout_buffer ); + p_sys->p_sout_buffer = NULL; } + else + { + /* We have all we need, send the buffer to the aout core. */ + aout_DecPlay( p_sys->p_aout, p_sys->p_aout_input, + p_sys->p_aout_buffer ); + p_sys->p_aout_buffer = NULL; + } + + p_dec->p_sys->p_out_buffer = NULL; - CloseBitstream( &p_dec->bit_stream ); - free( p_dec ); + return VLC_SUCCESS; } /***************************************************************************** - * SyncInfo: parse A52 sync info + * SyncInfo: parse A/52 sync info ***************************************************************************** * This code is borrowed from liba52 by Aaron Holtzman & Michel Lespinasse, * 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, +static int SyncInfo( const byte_t * p_buf, + int * pi_channels, int * pi_channels_conf, 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 }; @@ -300,52 +573,67 @@ static int SyncInfo( const byte_t * p_buf, int * pi_channels, if ( (p_buf[6] & 0xf8) == 0x50 ) { /* Dolby surround = stereo + Dolby */ - *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT - | AOUT_CHAN_DOLBYSTEREO; + *pi_channels = 2; + *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT + | AOUT_CHAN_DOLBYSTEREO; } else switch ( acmod ) { case 0x0: /* Dual-mono = stereo + dual-mono */ - *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT - | AOUT_CHAN_DUALMONO; + *pi_channels = 2; + *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT + | AOUT_CHAN_DUALMONO; break; case 0x1: /* Mono */ - *pi_channels = AOUT_CHAN_CENTER; + *pi_channels = 1; + *pi_channels_conf = AOUT_CHAN_CENTER; break; case 0x2: /* Stereo */ - *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT; + *pi_channels = 2; + *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT; break; case 0x3: /* 3F */ - *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER; + *pi_channels = 3; + *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT + | AOUT_CHAN_CENTER; break; case 0x4: /* 2F1R */ - *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARCENTER; + *pi_channels = 3; + *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT + | AOUT_CHAN_REARCENTER; break; case 0x5: /* 3F1R */ - *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER - | AOUT_CHAN_REARCENTER; + *pi_channels = 4; + *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER + | AOUT_CHAN_REARCENTER; break; case 0x6: /* 2F2R */ - *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT - | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT; + *pi_channels = 4; + *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT + | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT; break; case 0x7: /* 3F2R */ - *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER - | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT; + *pi_channels = 5; + *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER + | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT; break; default: return 0; } - if ( p_buf[6] & lfeon[acmod] ) *pi_channels |= AOUT_CHAN_LFE; + if ( p_buf[6] & lfeon[acmod] ) + { + (*pi_channels)++; + *pi_channels_conf |= AOUT_CHAN_LFE; + } frmsizecod = p_buf[4] & 63; if (frmsizecod >= 38) @@ -367,4 +655,3 @@ static int SyncInfo( const byte_t * p_buf, int * pi_channels, return 0; } } -