* lpcm.c: lpcm decoder module
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: lpcm.c,v 1.10 2003/01/02 20:48:28 gbazin Exp $
+ * $Id: lpcm.c,v 1.17 2003/09/02 20:19:25 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Henri Fallon <henri@videolan.org>
# include <unistd.h> /* getpid() */
#endif
-/* DVD PES size (2048) - 40 bytes (headers) */
-#define LPCM_FRAME_LENGTH 2008
-
/*****************************************************************************
* dec_thread_t : lpcm decoder thread descriptor
*****************************************************************************/
typedef struct dec_thread_t
{
- /*
- * Thread properties
- */
- vlc_thread_t thread_id; /* id for thread functions */
-
/*
* Input properties
*/
decoder_fifo_t * p_fifo; /* stores the PES stream data */
- bit_stream_t bit_stream;
- int sync_ptr; /* sync ptr from lpcm magic header */
+ /* Some filters don't handle well too small buffers (coreaudio resampler).
+ * Thus an aout buffer will be two PES packets. */
+ pes_packet_t * p_buffered_pes;
+ data_packet_t * p_buffered_data;
+ size_t i_buffered_size;
/*
* Output properties
* - start code (8 bits) == 0x80
*/
+#define LPCM_HEADER_LEN 6
+
/*****************************************************************************
* Local prototypes
*****************************************************************************/
*****************************************************************************/
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_fifo->i_fourcc != VLC_FOURCC('l','p','c','m')
- && p_fifo->i_fourcc != VLC_FOURCC('l','p','c','b') )
+ if( p_dec->p_fifo->i_fourcc != VLC_FOURCC('l','p','c','m')
+ && p_dec->p_fifo->i_fourcc != VLC_FOURCC('l','p','c','b') )
{
return VLC_EGENERIC;
}
- p_fifo->pf_run = RunDecoder;
+ p_dec->pf_run = RunDecoder;
return VLC_SUCCESS;
}
dec_thread_t * p_dec;
/* Allocate the memory needed to store the thread's structure */
- if( (p_dec = (dec_thread_t *)malloc (sizeof(dec_thread_t)) )
+ if( (p_dec = (dec_thread_t *)malloc( sizeof(dec_thread_t)) )
== NULL)
{
msg_Err( p_fifo, "out of memory" );
/* Initialize the thread properties */
p_dec->p_fifo = p_fifo;
+ p_dec->i_buffered_size = 0;
- /* Init the bitstream */
- if( InitBitstream( &p_dec->bit_stream, p_dec->p_fifo,
- NULL, NULL ) != VLC_SUCCESS )
- {
- msg_Err( p_fifo, "cannot initialize bitstream" );
- DecoderError( p_fifo );
- EndThread( p_dec );
- return -1;
- }
-
p_dec->output_format.i_format = VLC_FOURCC('s','1','6','b');
p_dec->p_aout = NULL;
p_dec->p_aout_input = NULL;
*****************************************************************************/
static void DecodeFrame( dec_thread_t * p_dec )
{
+ pes_packet_t * p_pes;
+ data_packet_t * p_data;
aout_buffer_t * p_buffer;
+ void * p_dest;
mtime_t i_pts;
uint8_t i_header;
- unsigned int i_rate, i_original_channels, i_nb_channels;
+ unsigned int i_rate = 0, i_original_channels = 0, i_size;
+ int i;
+
+ input_ExtractPES( p_dec->p_fifo, &p_pes );
+ if ( !p_pes )
+ {
+ p_dec->p_fifo->b_error = 1;
+ return;
+ }
- /* Look for sync word - should be 0xXX80 */
- RealignBits( &p_dec->bit_stream );
- while ( (ShowBits( &p_dec->bit_stream, 16 ) & 0xc8ff) != 0x0080 &&
- (!p_dec->p_fifo->b_die) && (!p_dec->p_fifo->b_error) )
+ /* Compute the size of the PES - i_pes_size includes the PES header. */
+ p_data = p_pes->p_first;
+ i_size = 0;
+ while ( p_data != NULL )
+ {
+ i_size += p_data->p_payload_end - p_data->p_payload_start;
+ p_data = p_data->p_next;
+ }
+ if ( i_size < LPCM_HEADER_LEN )
{
- RemoveBits( &p_dec->bit_stream, 8 );
+ msg_Err(p_dec->p_fifo, "PES packet is too short");
+ input_DeletePES( p_dec->p_fifo->p_packets_mgt, p_pes );
+ return;
}
- if ( p_dec->p_fifo->b_die || p_dec->p_fifo->b_error ) return;
- NextPTS( &p_dec->bit_stream, &i_pts, NULL );
+ i_pts = p_pes->i_pts;
if( i_pts != 0 && i_pts != aout_DateGet( &p_dec->end_date ) )
{
aout_DateSet( &p_dec->end_date, i_pts );
}
-
+
+ p_data = p_pes->p_first;
+ /* It necessarily contains one byte. */
/* Get LPCM header. */
- i_header = GetBits( &p_dec->bit_stream, 16 ) >> 8;
- switch ( i_header >> 4 )
+ /* Drop the first four bytes. */
+ for ( i = 0; i < 4; i++ )
+ {
+ if ( p_data->p_payload_end == p_data->p_payload_start )
+ {
+ p_data = p_data->p_next;
+ }
+ p_data->p_payload_start++;
+ }
+
+ i_header = p_data->p_payload_start[0];
+ p_data->p_payload_start++;
+
+ switch ( (i_header >> 4) & 0x3 )
{
case 0:
i_rate = 48000;
break;
case 1:
+ i_rate = 96000;
+ break;
+ case 2:
+ i_rate = 44100;
+ break;
+ case 3:
i_rate = 32000;
break;
- default:
- msg_Err( p_dec->p_fifo, "unsupported LPCM rate (0x%x)", i_header );
- p_dec->p_fifo->b_error = 1;
- return;
}
switch ( i_header & 0x7 )
{
case 0:
i_original_channels = AOUT_CHAN_CENTER;
- i_nb_channels = 1;
break;
case 1:
i_original_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
- i_nb_channels = 2;
+ break;
+ case 2:
+ /* This is unsure. */
+ i_original_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_LFE;
break;
case 3:
i_original_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
| AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
- i_nb_channels = 4;
+ break;
+ case 4:
+ /* This is unsure. */
+ i_original_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
+ | AOUT_CHAN_LFE;
break;
case 5:
i_original_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
| AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
| AOUT_CHAN_CENTER | AOUT_CHAN_LFE;
- i_nb_channels = 6;
break;
- case 2:
- case 4:
case 6:
+ i_original_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
+ | AOUT_CHAN_CENTER | AOUT_CHAN_MIDDLELEFT
+ | AOUT_CHAN_MIDDLERIGHT;
+ break;
case 7:
- default:
- msg_Err( p_dec->p_fifo, "unsupported LPCM channels (0x%x)",
- i_header );
- p_dec->p_fifo->b_error = 1;
+ i_original_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
+ | AOUT_CHAN_CENTER | AOUT_CHAN_MIDDLELEFT
+ | AOUT_CHAN_MIDDLERIGHT | AOUT_CHAN_LFE;
+ break;
+ }
+
+ /* Check frame sync and drop it. */
+ if ( p_data->p_payload_end == p_data->p_payload_start )
+ {
+ p_data = p_data->p_next;
+ }
+ if ( p_data->p_payload_start[0] != 0x80 )
+ {
+ msg_Warn(p_dec->p_fifo, "no frame sync");
+ input_DeletePES( p_dec->p_fifo->p_packets_mgt, p_pes );
return;
}
+ p_data->p_payload_start++;
if( (p_dec->p_aout_input != NULL) &&
( (p_dec->output_format.i_rate != i_rate)
p_dec->output_format.i_physical_channels
= i_original_channels & AOUT_CHAN_PHYSMASK;
aout_DateInit( &p_dec->end_date, i_rate );
+ aout_DateSet( &p_dec->end_date, i_pts );
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;
+ input_DeletePES( p_dec->p_fifo->p_packets_mgt, p_pes );
return;
}
+
+ if ( p_dec->i_buffered_size )
+ {
+ input_DeletePES( p_dec->p_fifo->p_packets_mgt,
+ p_dec->p_buffered_pes );
+ p_dec->i_buffered_size = 0;
+ }
}
if ( !aout_DateGet( &p_dec->end_date ) )
{
- byte_t p_junk[LPCM_FRAME_LENGTH];
-
/* We've just started the stream, wait for the first PTS. */
- GetChunk( &p_dec->bit_stream, p_junk, LPCM_FRAME_LENGTH );
+ input_DeletePES( p_dec->p_fifo->p_packets_mgt, p_pes );
return;
}
- p_buffer = aout_DecNewBuffer( p_dec->p_aout, p_dec->p_aout_input,
- LPCM_FRAME_LENGTH / p_dec->output_format.i_bytes_per_frame );
-
- if( p_buffer == NULL )
+ if ( p_dec->i_buffered_size != 0 )
{
- msg_Err( p_dec->p_fifo, "cannot get aout buffer" );
- p_dec->p_fifo->b_error = 1;
- return;
+ p_buffer = aout_DecNewBuffer( p_dec->p_aout, p_dec->p_aout_input,
+ (i_size - LPCM_HEADER_LEN + p_dec->i_buffered_size)
+ / p_dec->output_format.i_bytes_per_frame );
+
+ if( p_buffer == NULL )
+ {
+ msg_Err( p_dec->p_fifo, "cannot get aout buffer" );
+ p_dec->p_fifo->b_error = 1;
+ input_DeletePES( p_dec->p_fifo->p_packets_mgt, p_pes );
+ return;
+ }
+ p_buffer->start_date = aout_DateGet( &p_dec->end_date );
+ p_buffer->end_date = aout_DateIncrement( &p_dec->end_date,
+ (i_size - LPCM_HEADER_LEN + p_dec->i_buffered_size)
+ / p_dec->output_format.i_bytes_per_frame );
+
+ /* Get the whole frame. */
+ p_dest = p_buffer->p_buffer;
+
+ while ( p_dec->p_buffered_data != NULL )
+ {
+ p_dec->p_fifo->p_vlc->pf_memcpy( p_dest,
+ p_dec->p_buffered_data->p_payload_start,
+ p_dec->p_buffered_data->p_payload_end
+ - p_dec->p_buffered_data->p_payload_start );
+ p_dest += p_dec->p_buffered_data->p_payload_end
+ - p_dec->p_buffered_data->p_payload_start;
+ p_dec->p_buffered_data = p_dec->p_buffered_data->p_next;
+ }
+ input_DeletePES( p_dec->p_fifo->p_packets_mgt,
+ p_dec->p_buffered_pes );
+
+ p_dest = p_buffer->p_buffer + p_dec->i_buffered_size;
+
+ while ( p_data != NULL )
+ {
+ p_dec->p_fifo->p_vlc->pf_memcpy( p_dest, p_data->p_payload_start,
+ p_data->p_payload_end - p_data->p_payload_start );
+ p_dest += p_data->p_payload_end - p_data->p_payload_start;
+ p_data = p_data->p_next;
+ }
+ input_DeletePES( p_dec->p_fifo->p_packets_mgt, p_pes );
+
+ /* Send the buffer to the aout core. */
+ aout_DecPlay( p_dec->p_aout, p_dec->p_aout_input, p_buffer );
+
+ p_dec->i_buffered_size = 0;
}
- p_buffer->start_date = aout_DateGet( &p_dec->end_date );
- p_buffer->end_date = aout_DateIncrement( &p_dec->end_date,
- LPCM_FRAME_LENGTH / p_dec->output_format.i_bytes_per_frame );
-
- /* Get the whole frame. */
- GetChunk( &p_dec->bit_stream, p_buffer->p_buffer,
- LPCM_FRAME_LENGTH);
- if( p_dec->p_fifo->b_die )
+ else
{
- aout_DecDeleteBuffer( p_dec->p_aout, p_dec->p_aout_input,
- p_buffer );
- return;
+ p_dec->i_buffered_size = i_size - LPCM_HEADER_LEN;
+ p_dec->p_buffered_pes = p_pes;
+ p_dec->p_buffered_data = p_data;
}
-
- /* Send the buffer to the aout core. */
- aout_DecPlay( p_dec->p_aout, p_dec->p_aout_input, p_buffer );
}
/*****************************************************************************
aout_DecDelete( p_dec->p_aout, p_dec->p_aout_input );
}
- CloseBitstream( &p_dec->bit_stream );
+ if ( p_dec->i_buffered_size )
+ {
+ input_DeletePES( p_dec->p_fifo->p_packets_mgt,
+ p_dec->p_buffered_pes );
+ p_dec->i_buffered_size = 0;
+ }
+
free( p_dec );
}
projects / vlc / blobdiff