/*****************************************************************************
- * dts.c: DTS basic parser
+ * dts.c: parse DTS audio sync info and packetize the stream
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: dts.c,v 1.3 2003/03/18 00:25:27 jlj Exp $
+ * $Id: dts.c,v 1.9 2003/12/22 14:32:55 sam Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
+ * Gildas Bazin <gbazin@netcourrier.com>
*
* 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
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h> /* memcpy() */
-#include <fcntl.h>
-
#include <vlc/vlc.h>
#include <vlc/decoder.h>
-#include <vlc/aout.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include "vlc_block_helper.h"
+
+#define DTS_HEADER_SIZE 10
/*****************************************************************************
- * dec_thread_t : decoder thread descriptor
+ * decoder_sys_t : decoder descriptor
*****************************************************************************/
-typedef struct dec_thread_t
+struct decoder_sys_t
{
- /*
- * Thread properties
- */
- vlc_thread_t thread_id; /* id for thread functions */
+ /* Module mode */
+ vlc_bool_t b_packetizer;
/*
* Input properties
*/
- decoder_fifo_t * p_fifo; /* stores the PES stream data */
- bit_stream_t bit_stream;
+ int i_state;
+
+ block_bytestream_t bytestream;
/*
- * 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;
+ audio_date_t end_date;
+
+ mtime_t i_pts;
+
+ int i_frame_size, i_bit_rate;
+ unsigned int i_frame_length, i_rate, i_channels, i_channels_conf;
+
+ /* This is very hacky. For DTS over S/PDIF we apparently need to send
+ * 3 frames at a time. This should likely be moved to the output stage. */
+ int i_frames_in_buf;
+ aout_buffer_t *p_aout_buffer; /* current aout buffer being filled */
+
+};
+
+enum {
+
+ STATE_NOSYNC,
+ STATE_SYNC,
+ STATE_HEADER,
+ STATE_NEXT_SYNC,
+ STATE_GET_DATA,
+ STATE_SEND_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 void CloseDecoder ( vlc_object_t * );
+static void *DecodeBlock ( decoder_t *, block_t ** );
-static void EndThread ( dec_thread_t * );
+static int SyncInfo ( const byte_t *, unsigned int *, unsigned int *,
+ unsigned int *, unsigned int *, unsigned int * );
-static int SyncInfo ( const byte_t *, unsigned int *,
- unsigned int *, unsigned int *,
- unsigned int * );
+static uint8_t *GetOutBuffer ( decoder_t *, void ** );
+static aout_buffer_t *GetAoutBuffer( decoder_t * );
+static block_t *GetSoutBuffer( decoder_t * );
/*****************************************************************************
* Module descriptor
vlc_module_begin();
set_description( _("DTS parser") );
set_capability( "decoder", 100 );
- set_callbacks( OpenDecoder, NULL );
+ set_callbacks( OpenDecoder, CloseDecoder );
+
+ add_submodule();
+ set_description( _("DTS audio packetizer") );
+ set_capability( "packetizer", 10 );
+ set_callbacks( OpenPacketizer, NULL );
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;
+ decoder_sys_t *p_sys;
- if( p_fifo->i_fourcc != VLC_FOURCC('d','t','s',' ')
- && p_fifo->i_fourcc != VLC_FOURCC('d','t','s','b') )
+ if( p_dec->fmt_in.i_codec != VLC_FOURCC('d','t','s',' ')
+ && p_dec->fmt_in.i_codec != VLC_FOURCC('d','t','s','b') )
{
return VLC_EGENERIC;
}
- p_fifo->pf_run = RunDecoder;
+ /* 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;
+ }
+
+ /* Misc init */
+ p_sys->b_packetizer = VLC_FALSE;
+ p_sys->i_state = STATE_NOSYNC;
+ aout_DateSet( &p_sys->end_date, 0 );
+ p_sys->i_frames_in_buf = 0;
+
+ p_sys->bytestream = block_BytestreamInit( p_dec );
+
+ /* Set output properties */
+ p_dec->fmt_out.i_cat = AUDIO_ES;
+ p_dec->fmt_out.i_codec = VLC_FOURCC('d','t','s',' ');
+
+ /* Set callback */
+ p_dec->pf_decode_audio = (aout_buffer_t *(*)(decoder_t *, block_t **))
+ DecodeBlock;
+ p_dec->pf_packetize = (block_t *(*)(decoder_t *, block_t **))
+ DecodeBlock;
+
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;
+}
+
/****************************************************************************
- * RunDecoder: the whole thing
+ * DecodeBlock: the whole thing
****************************************************************************
* This function is called just after the thread is launched.
****************************************************************************/
-static int RunDecoder( decoder_fifo_t *p_fifo )
+static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
{
- dec_thread_t * p_dec;
- audio_date_t end_date;
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ uint8_t p_header[DTS_HEADER_SIZE];
+ uint8_t *p_buf;
+ void *p_out_buffer;
+
+ if( !pp_block || !*pp_block ) return NULL;
- /* Allocate the memory needed to store the thread's structure */
- p_dec = malloc( sizeof(dec_thread_t) );
- if( p_dec == NULL )
+ if( !aout_DateGet( &p_sys->end_date ) && !(*pp_block)->i_pts )
{
- msg_Err( p_fifo, "out of memory" );
- DecoderError( p_fifo );
- return -1;
+ /* We've just started the stream, wait for the first PTS. */
+ block_Release( *pp_block );
+ return NULL;
}
- /* 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('d','t','s',' ');
-
- aout_DateSet( &end_date, 0 );
-
- /* Init the bitstream */
- if( InitBitstream( &p_dec->bit_stream, p_dec->p_fifo,
- NULL, NULL ) != VLC_SUCCESS )
+ if( (*pp_block)->b_discontinuity )
{
- msg_Err( p_fifo, "cannot initialize bitstream" );
- DecoderError( p_fifo );
- free( p_dec );
- return -1;
+ p_sys->i_state = STATE_NOSYNC;
}
- /* Decoder thread's main loop */
- while( !p_dec->p_fifo->b_die && !p_dec->p_fifo->b_error )
+ block_BytestreamPush( &p_sys->bytestream, *pp_block );
+
+ while( 1 )
{
- int i;
- mtime_t pts;
- byte_t p_header[10];
+ switch( p_sys->i_state )
+ {
+ case STATE_NOSYNC:
+ /* Look for sync dword - should be 0x7ffe8001 */
+ while( block_PeekBytes( &p_sys->bytestream, p_header, 4 )
+ == VLC_SUCCESS )
+ {
+ if( p_header[0] == 0x7f && p_header[1] == 0xfe &&
+ p_header[2] == 0x80 && p_header[3] == 0x01 )
+ {
+ p_sys->i_state = STATE_SYNC;
+ break;
+ }
+ block_SkipByte( &p_sys->bytestream );
+ }
+ if( p_sys->i_state != STATE_SYNC )
+ {
+ block_BytestreamFlush( &p_sys->bytestream );
- unsigned int i_rate;
- unsigned int i_bit_rate;
- unsigned int i_frame_size;
- unsigned int i_frame_length;
- unsigned int i_original_channels;
+ /* Need more data */
+ return NULL;
+ }
- aout_buffer_t * p_buffer = NULL;
+ case STATE_SYNC:
+ /* New frame, set the Presentation Time Stamp */
+ p_sys->i_pts = p_sys->bytestream.p_block->i_pts;
+ if( p_sys->i_pts != 0 &&
+ p_sys->i_pts != aout_DateGet( &p_sys->end_date ) )
+ {
+ aout_DateSet( &p_sys->end_date, p_sys->i_pts );
+ }
+ p_sys->i_state = STATE_HEADER;
- for( i = 0; i < 3; i++ )
- {
- RealignBits( &p_dec->bit_stream );
- while( (ShowBits( &p_dec->bit_stream, 32 ) ) != 0x7ffe8001 &&
- (!p_dec->p_fifo->b_die) && (!p_dec->p_fifo->b_error) )
+ case STATE_HEADER:
+ /* Get DTS frame header (DTS_HEADER_SIZE bytes) */
+ if( block_PeekBytes( &p_sys->bytestream, p_header,
+ DTS_HEADER_SIZE ) != VLC_SUCCESS )
{
- RemoveBits( &p_dec->bit_stream, 8 );
+ /* Need more data */
+ return NULL;
}
- if( p_dec->p_fifo->b_die || p_dec->p_fifo->b_error ) break;
- if( i == 0 )
+ /* 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,
+ &p_sys->i_frame_length );
+ if( !p_sys->i_frame_size )
{
- /* 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 );
- }
+ msg_Dbg( p_dec, "emulated sync word" );
+ block_SkipByte( &p_sys->bytestream );
+ p_sys->i_state = STATE_NOSYNC;
+ break;
}
+ p_sys->i_state = STATE_NEXT_SYNC;
- /* Get DTS frame header */
- GetChunk( &p_dec->bit_stream, p_header, 10 );
- if( p_dec->p_fifo->b_die || p_dec->p_fifo->b_error ) break;
+ case STATE_NEXT_SYNC:
+ /* TODO: If pp_block == NULL, flush the buffer without checking the
+ * next sync word */
- i_frame_size = SyncInfo( p_header, &i_original_channels, &i_rate,
- &i_bit_rate, &i_frame_length );
- if( !i_frame_size )
+ /* Check if next expected frame contains the sync word */
+ if( block_PeekOffsetBytes( &p_sys->bytestream,
+ p_sys->i_frame_size, p_header, 4 )
+ != VLC_SUCCESS )
{
- msg_Warn( p_dec->p_fifo, "dts_syncinfo failed" );
- i--; continue;
+ /* Need more data */
+ return NULL;
}
- if( i == 0 )
+ if( p_header[0] != 0x7f || p_header[1] != 0xfe ||
+ p_header[2] != 0x80 || p_header[3] != 0x01 )
{
- 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 * 3) ) )
- {
- /* Parameters changed - this should not happen. */
- aout_DecDelete( p_dec->p_aout, p_dec->p_aout_input );
- p_dec->p_aout_input = NULL;
- }
-
- /* 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 * 3;
- p_dec->output_format.i_frame_length = i_frame_length * 3;
- 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 )
- {
- p_dec->p_fifo->b_error = 1;
- break;
- }
- }
+ msg_Dbg( p_dec, "emulated sync word "
+ "(no sync on following frame) %2.2x%2.2x%2.2x%2.2x",
+ p_header[0], p_header[1], p_header[2], p_header[3] );
+ p_sys->i_state = STATE_NOSYNC;
+ block_SkipByte( &p_sys->bytestream );
+ break;
}
+ p_sys->i_state = STATE_SEND_DATA;
+ break;
- if( !aout_DateGet( &end_date ) )
+ case STATE_GET_DATA:
+ /* Make sure we have enough data.
+ * (Not useful if we went through NEXT_SYNC) */
+ if( block_WaitBytes( &p_sys->bytestream,
+ p_sys->i_frame_size ) != VLC_SUCCESS )
{
- byte_t p_junk[ i_frame_size ];
+ /* Need more data */
+ return NULL;
+ }
+ p_sys->i_state = STATE_SEND_DATA;
- /* We've just started the stream, wait for the first PTS. */
- GetChunk( &p_dec->bit_stream, p_junk, i_frame_size - 10 );
- i--; continue;
+ case STATE_SEND_DATA:
+ if( !(p_buf = GetOutBuffer( p_dec, &p_out_buffer )) )
+ {
+ //p_dec->b_error = VLC_TRUE;
+ return NULL;
}
- if( i == 0 )
+ /* Copy the whole frame into the buffer. When we reach this point
+ * we already know we have enough data available. */
+ block_GetBytes( &p_sys->bytestream, p_buf, p_sys->i_frame_size );
+
+ /* Make sure we don't reuse the same pts twice */
+ if( p_sys->i_pts == p_sys->bytestream.p_block->i_pts )
+ p_sys->i_pts = p_sys->bytestream.p_block->i_pts = 0;
+
+ /* So p_block doesn't get re-added several times */
+ *pp_block = block_BytestreamPop( &p_sys->bytestream );
+
+ p_sys->i_state = STATE_NOSYNC;
+
+ if( !p_sys->b_packetizer )
{
- p_buffer = aout_DecNewBuffer( p_dec->p_aout,
- p_dec->p_aout_input,
- i_frame_length * 3 );
- if( p_buffer == NULL )
+ if( p_sys->i_frames_in_buf != 3 ) return NULL;
+ else
{
- p_dec->p_fifo->b_error = 1;
- break;
+ p_sys->i_frames_in_buf = 0;
+ p_sys->p_aout_buffer = 0;
}
- p_buffer->start_date = aout_DateGet( &end_date );
- p_buffer->end_date = aout_DateIncrement( &end_date,
- i_frame_length * 3 );
}
- /* Get the whole frame. */
- memcpy( p_buffer->p_buffer + (i * i_frame_size), p_header, 10 );
- GetChunk( &p_dec->bit_stream,
- p_buffer->p_buffer + (i * i_frame_size) + 10,
- i_frame_size - 10 );
- if( p_dec->p_fifo->b_die ) break;
+ return p_out_buffer;
}
+ }
- if( p_dec->p_fifo->b_die || p_dec->p_fifo->b_error )
- {
- if( p_buffer != NULL )
- {
- aout_DecDeleteBuffer( p_dec->p_aout, p_dec->p_aout_input,
- p_buffer );
- }
+ return NULL;
+}
- break;
- }
+/*****************************************************************************
+ * CloseDecoder: clean up the decoder
+ *****************************************************************************/
+static void CloseDecoder( vlc_object_t *p_this )
+{
+ decoder_t *p_dec = (decoder_t*)p_this;
+ decoder_sys_t *p_sys = p_dec->p_sys;
- /* Send the buffer to the aout core. */
- aout_DecPlay( p_dec->p_aout, p_dec->p_aout_input, p_buffer );
+ block_BytestreamRelease( &p_sys->bytestream );
+
+ free( p_sys );
+}
+
+/*****************************************************************************
+ * GetOutBuffer:
+ *****************************************************************************/
+static uint8_t *GetOutBuffer( decoder_t *p_dec, void **pp_out_buffer )
+{
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ uint8_t *p_buf;
+
+ if( p_dec->fmt_out.audio.i_rate != p_sys->i_rate )
+ {
+ msg_Info( p_dec, "DTS channels:%d samplerate:%d bitrate:%d",
+ p_sys->i_channels, p_sys->i_rate, p_sys->i_bit_rate );
+
+ aout_DateInit( &p_sys->end_date, p_sys->i_rate );
+ aout_DateSet( &p_sys->end_date, p_sys->i_pts );
}
- if( p_dec->p_fifo->b_error )
+ p_dec->fmt_out.audio.i_rate = p_sys->i_rate;
+ p_dec->fmt_out.audio.i_channels = p_sys->i_channels;
+ p_dec->fmt_out.audio.i_bytes_per_frame = p_sys->i_frame_size;
+ p_dec->fmt_out.audio.i_frame_length = p_sys->i_frame_length;
+
+ p_dec->fmt_out.audio.i_original_channels = p_sys->i_channels_conf;
+ p_dec->fmt_out.audio.i_physical_channels =
+ p_sys->i_channels_conf & AOUT_CHAN_PHYSMASK;
+
+ p_dec->fmt_out.i_bitrate = p_sys->i_bit_rate;
+
+ if( p_sys->b_packetizer )
{
- DecoderError( p_dec->p_fifo );
+ block_t *p_sout_buffer = GetSoutBuffer( p_dec );
+ p_buf = p_sout_buffer ? p_sout_buffer->p_buffer : NULL;
+ *pp_out_buffer = p_sout_buffer;
+ }
+ else
+ {
+ if( !p_sys->i_frames_in_buf )
+ {
+ p_sys->p_aout_buffer = GetAoutBuffer( p_dec );
+ }
+ p_buf = p_sys->p_aout_buffer ? p_sys->p_aout_buffer->p_buffer +
+ p_sys->i_frames_in_buf * p_sys->i_frame_size : NULL;
+ *pp_out_buffer = p_sys->p_aout_buffer;
}
- EndThread( p_dec );
+ p_sys->i_frames_in_buf++;
- return 0;
+ return p_buf;
}
/*****************************************************************************
- * EndThread : thread destruction
+ * GetAoutBuffer:
*****************************************************************************/
-static void EndThread( dec_thread_t * p_dec )
+static aout_buffer_t *GetAoutBuffer( decoder_t *p_dec )
{
- if ( p_dec->p_aout_input != NULL )
- {
- aout_DecDelete( p_dec->p_aout, p_dec->p_aout_input );
- }
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ aout_buffer_t *p_buf;
+
+ p_buf = p_dec->pf_aout_buffer_new( p_dec, p_sys->i_frame_length * 3 );
+ 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, p_sys->i_frame_length * 3 );
+
+ return p_buf;
+}
+
+/*****************************************************************************
+ * GetSoutBuffer:
+ *****************************************************************************/
+static block_t *GetSoutBuffer( decoder_t *p_dec )
+{
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ block_t *p_block;
+
+ p_block = block_New( p_dec, p_sys->i_frame_size );
+ if( p_block == NULL ) return NULL;
+
+ p_block->i_pts = p_block->i_dts = aout_DateGet( &p_sys->end_date );
+
+ p_block->i_length = aout_DateIncrement( &p_sys->end_date,
+ p_sys->i_frame_length ) - p_block->i_pts;
- CloseBitstream( &p_dec->bit_stream );
- free( p_dec );
+ return p_block;
}
/*****************************************************************************
* SyncInfo: parse DTS sync info
*****************************************************************************/
-static int SyncInfo( const byte_t * p_buf, unsigned int * pi_channels,
+static int SyncInfo( const byte_t * p_buf,
+ unsigned int * pi_channels,
+ unsigned int * pi_channels_conf,
unsigned int * pi_sample_rate,
unsigned int * pi_bit_rate,
unsigned int * pi_frame_length )
{
case 0x0:
/* Mono */
- *pi_channels = AOUT_CHAN_CENTER;
+ *pi_channels_conf = AOUT_CHAN_CENTER;
break;
case 0x1:
/* Dual-mono = stereo + dual-mono */
- *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
+ *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
AOUT_CHAN_DUALMONO;
break;
case 0x2:
case 0x3:
case 0x4:
/* Stereo */
- *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
+ *pi_channels = 2;
+ *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
break;
case 0x5:
/* 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 0x6:
/* 2F/LFE */
- *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_LFE;
+ *pi_channels = 3;
+ *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
+ AOUT_CHAN_LFE;
break;
case 0x7:
/* 3F/LFE */
- *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
- AOUT_CHAN_CENTER | AOUT_CHAN_LFE;
+ *pi_channels = 4;
+ *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
+ AOUT_CHAN_CENTER | AOUT_CHAN_LFE;
break;
case 0x8:
/* 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 0x9:
/* 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;
case 0xA:
case 0xB:
/* 2F2M2R */
- *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
- AOUT_CHAN_MIDDLELEFT | AOUT_CHAN_MIDDLERIGHT |
- AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
+ *pi_channels = 6;
+ *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
+ AOUT_CHAN_MIDDLELEFT | AOUT_CHAN_MIDDLERIGHT |
+ AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
break;
case 0xC:
/* 3F2M2R */
- *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
- AOUT_CHAN_CENTER | AOUT_CHAN_MIDDLELEFT |
- AOUT_CHAN_MIDDLERIGHT | AOUT_CHAN_REARLEFT |
- AOUT_CHAN_REARRIGHT;
+ *pi_channels = 7;
+ *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
+ AOUT_CHAN_CENTER | AOUT_CHAN_MIDDLELEFT |
+ AOUT_CHAN_MIDDLERIGHT | AOUT_CHAN_REARLEFT |
+ AOUT_CHAN_REARRIGHT;
break;
case 0xD:
case 0xE:
/* 3F2M2R/LFE */
- *pi_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
- AOUT_CHAN_CENTER | AOUT_CHAN_MIDDLELEFT |
- AOUT_CHAN_MIDDLERIGHT | AOUT_CHAN_REARLEFT |
- AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE;
+ *pi_channels = 8;
+ *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
+ AOUT_CHAN_CENTER | AOUT_CHAN_MIDDLELEFT |
+ AOUT_CHAN_MIDDLERIGHT | AOUT_CHAN_REARLEFT |
+ AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE;
break;
default:
if( i_audio_mode <= 63 )
{
/* User defined */
- *pi_channels = 0;
+ *pi_channels = 0;
+ *pi_channels_conf = 0;
}
else
{
*pi_frame_length = (i_frame_length + 1) * 32;
- return( i_frame_size + 1 );
+ return i_frame_size + 1;
}