X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Flpcm.c;h=6827db40c1b4f2e060b3c2ba9b15286f9cdf5c19;hb=32b31e87d90967549e5cc8bef18d5aae7e3b98c6;hp=747eb1d083db3e4be5133d53574be89f5892b963;hpb=2216d29e1b0b2856c2db076cfbbeb14f58738310;p=vlc diff --git a/modules/codec/lpcm.c b/modules/codec/lpcm.c index 747eb1d083..6827db40c1 100644 --- a/modules/codec/lpcm.c +++ b/modules/codec/lpcm.c @@ -1,18 +1,19 @@ /***************************************************************************** - * lpcm.c: lpcm decoder module + * lpcm.c: lpcm decoder/packetizer module ***************************************************************************** - * Copyright (C) 1999-2001 VideoLAN - * $Id: lpcm.c,v 1.10 2003/01/02 20:48:28 gbazin Exp $ + * Copyright (C) 1999-2005 the VideoLAN team + * $Id$ * * Authors: Samuel Hocevar * Henri Fallon * Christophe Massiot + * 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 * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -20,57 +21,41 @@ * * 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 /* malloc(), free() */ -#include /* memcpy(), memset() */ - -#include -#include -#include -#include - -#ifdef HAVE_UNISTD_H -# include /* getpid() */ +#ifdef HAVE_CONFIG_H +# include "config.h" #endif -/* DVD PES size (2048) - 40 bytes (headers) */ -#define LPCM_FRAME_LENGTH 2008 +#include +#include +#include +#include /***************************************************************************** - * dec_thread_t : lpcm decoder thread descriptor + * decoder_sys_t : lpcm decoder descriptor *****************************************************************************/ -typedef struct dec_thread_t +struct decoder_sys_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 */ + /* Module mode */ + bool b_packetizer; /* * Output properties */ - aout_instance_t *p_aout; - aout_input_t *p_aout_input; - audio_sample_format_t output_format; - audio_date_t end_date; -} dec_thread_t; + audio_date_t end_date; + +}; /* * LPCM header : * - PES header * - private stream ID (16 bits) == 0xA0 -> not in the bitstream + * * - frame number (8 bits) * - unknown (16 bits) == 0x0003 ? * - unknown (4 bits) @@ -82,22 +67,33 @@ typedef struct dec_thread_t * - start code (8 bits) == 0x80 */ +#define LPCM_HEADER_LEN 6 + /***************************************************************************** * 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 DecodeFrame ( dec_thread_t * ); -static void EndThread ( dec_thread_t * ); +static void *DecodeFrame ( decoder_t *, block_t ** ); /***************************************************************************** * Module descriptor *****************************************************************************/ vlc_module_begin(); - set_description( _("linear PCM audio parser") ); + + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_ACODEC ); + set_description( N_("Linear PCM audio decoder") ); set_capability( "decoder", 100 ); - set_callbacks( OpenDecoder, NULL ); + set_callbacks( OpenDecoder, CloseDecoder ); + + add_submodule(); + set_description( N_("Linear PCM audio packetizer") ); + set_capability( "packetizer", 100 ); + set_callbacks( OpenPacketizer, CloseDecoder ); + vlc_module_end(); /***************************************************************************** @@ -105,218 +101,299 @@ 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('l','p','c','m') - && p_fifo->i_fourcc != VLC_FOURCC('l','p','c','b') ) - { + if( p_dec->fmt_in.i_codec != VLC_FOURCC('l','p','c','m') + && p_dec->fmt_in.i_codec != VLC_FOURCC('l','p','c','b') ) + { return VLC_EGENERIC; } - - p_fifo->pf_run = RunDecoder; - return VLC_SUCCESS; -} -/***************************************************************************** - * RunDecoder: the lpcm decoder - *****************************************************************************/ -static int RunDecoder( decoder_fifo_t * p_fifo ) -{ - dec_thread_t * p_dec; + /* 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 ) + return VLC_ENOMEM; - /* Allocate the memory needed to store the thread's structure */ - if( (p_dec = (dec_thread_t *)malloc (sizeof(dec_thread_t)) ) - == NULL) - { - msg_Err( p_fifo, "out of memory" ); - DecoderError( p_fifo ); - return -1; - } + /* Misc init */ + p_sys->b_packetizer = false; + aout_DateSet( &p_sys->end_date, 0 ); - /* Initialize the thread properties */ - p_dec->p_fifo = p_fifo; + /* Set output properties */ + p_dec->fmt_out.i_cat = AUDIO_ES; - /* Init the bitstream */ - if( InitBitstream( &p_dec->bit_stream, p_dec->p_fifo, - NULL, NULL ) != VLC_SUCCESS ) + if( p_dec->fmt_out.audio.i_bitspersample == 24 ) { - msg_Err( p_fifo, "cannot initialize bitstream" ); - DecoderError( p_fifo ); - EndThread( p_dec ); - return -1; + p_dec->fmt_out.i_codec = VLC_FOURCC('s','2','4','b'); } - - p_dec->output_format.i_format = VLC_FOURCC('s','1','6','b'); - p_dec->p_aout = NULL; - p_dec->p_aout_input = NULL; - - /* LPCM decoder thread's main loop */ - while ( (!p_dec->p_fifo->b_die) && (!p_dec->p_fifo->b_error) ) + else { - DecodeFrame(p_dec); + p_dec->fmt_out.i_codec = VLC_FOURCC('s','1','6','b'); + p_dec->fmt_out.audio.i_bitspersample = 16; } - /* If b_error is set, the lpcm decoder thread enters the error loop */ - if ( p_dec->p_fifo->b_error ) - { - DecoderError( p_dec->p_fifo ); - } + /* Set callback */ + p_dec->pf_decode_audio = (aout_buffer_t *(*)(decoder_t *, block_t **)) + DecodeFrame; + p_dec->pf_packetize = (block_t *(*)(decoder_t *, block_t **)) + DecodeFrame; + + 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 ) return i_ret; + + p_dec->p_sys->b_packetizer = true; - /* End of the lpcm decoder thread */ - EndThread( p_dec ); + p_dec->fmt_out.i_codec = VLC_FOURCC('l','p','c','m'); - return 0; + return i_ret; } /***************************************************************************** - * DecodeFrame: decodes a frame. + * DecodeFrame: decodes an lpcm frame. + **************************************************************************** + * Beware, this function must be fed with complete frames (PES packet). *****************************************************************************/ -static void DecodeFrame( dec_thread_t * p_dec ) +static void *DecodeFrame( decoder_t *p_dec, block_t **pp_block ) { - aout_buffer_t * p_buffer; - mtime_t i_pts; - uint8_t i_header; - unsigned int i_rate, i_original_channels, i_nb_channels; - - /* 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) ) + decoder_sys_t *p_sys = p_dec->p_sys; + block_t *p_block; + unsigned int i_rate = 0, i_original_channels = 0, i_channels = 0; + int i_frame_length, i_bitspersample; + uint8_t i_header; + + if( !pp_block || !*pp_block ) return NULL; + + p_block = *pp_block; + *pp_block = NULL; /* So the packet doesn't get re-sent */ + + /* Date management */ + if( p_block->i_pts > 0 && + p_block->i_pts != aout_DateGet( &p_sys->end_date ) ) + { + aout_DateSet( &p_sys->end_date, p_block->i_pts ); + } + + if( !aout_DateGet( &p_sys->end_date ) ) { - RemoveBits( &p_dec->bit_stream, 8 ); + /* We've just started the stream, wait for the first PTS. */ + block_Release( p_block ); + return NULL; } - if ( p_dec->p_fifo->b_die || p_dec->p_fifo->b_error ) return; - NextPTS( &p_dec->bit_stream, &i_pts, NULL ); - if( i_pts != 0 && i_pts != aout_DateGet( &p_dec->end_date ) ) + if( p_block->i_buffer <= LPCM_HEADER_LEN ) { - aout_DateSet( &p_dec->end_date, i_pts ); + msg_Err(p_dec, "frame is too short"); + block_Release( p_block ); + return NULL; } - - /* Get LPCM header. */ - i_header = GetBits( &p_dec->bit_stream, 16 ) >> 8; - switch ( i_header >> 4 ) + i_header = p_block->p_buffer[4]; + 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 ) + i_channels = (i_header & 0x7); + switch ( i_channels ) { 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; - return; + 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; } - 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) ) ) + switch ( (i_header >> 6) & 0x3 ) { - /* Parameters changed - this should not happen. */ - aout_DecDelete( p_dec->p_aout, p_dec->p_aout_input ); - p_dec->p_aout_input = NULL; + case 2: + p_dec->fmt_out.i_codec = VLC_FOURCC('s','2','4','b'); + p_dec->fmt_out.audio.i_bitspersample = 24; + i_bitspersample = 24; + break; + case 1: + p_dec->fmt_out.i_codec = VLC_FOURCC('s','2','4','b'); + p_dec->fmt_out.audio.i_bitspersample = 24; + i_bitspersample = 20; + break; + case 0: + default: + p_dec->fmt_out.i_codec = VLC_FOURCC('s','1','6','b'); + p_dec->fmt_out.audio.i_bitspersample = 16; + i_bitspersample = 16; + break; } - /* Creating the audio input if not created yet. */ - if( p_dec->p_aout_input == NULL ) + /* Check frame sync and drop it. */ + if( p_block->p_buffer[5] != 0x80 ) { - 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; - aout_DateInit( &p_dec->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; - return; - } + msg_Warn( p_dec, "no frame sync" ); + block_Release( p_block ); + return NULL; } - if ( !aout_DateGet( &p_dec->end_date ) ) + /* Set output properties */ + if( p_dec->fmt_out.audio.i_rate != i_rate ) { - 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 ); - return; + aout_DateInit( &p_sys->end_date, i_rate ); + aout_DateSet( &p_sys->end_date, p_block->i_pts ); } + p_dec->fmt_out.audio.i_rate = i_rate; + p_dec->fmt_out.audio.i_channels = i_channels + 1; + p_dec->fmt_out.audio.i_original_channels = i_original_channels; + p_dec->fmt_out.audio.i_physical_channels + = i_original_channels & AOUT_CHAN_PHYSMASK; - 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 ) + i_frame_length = (p_block->i_buffer - LPCM_HEADER_LEN) / + p_dec->fmt_out.audio.i_channels * 8 / i_bitspersample; + + if( p_sys->b_packetizer ) { - msg_Err( p_dec->p_fifo, "cannot get aout buffer" ); - p_dec->p_fifo->b_error = 1; - return; + p_dec->fmt_out.i_codec = VLC_FOURCC('l','p','c','m'); + p_block->i_pts = p_block->i_dts = aout_DateGet( &p_sys->end_date ); + p_block->i_length = + aout_DateIncrement( &p_sys->end_date, i_frame_length ) - + p_block->i_pts; + + /* Just pass on the incoming frame */ + return p_block; } - 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; - } + aout_buffer_t *p_aout_buffer; + p_aout_buffer = p_dec->pf_aout_buffer_new( p_dec, i_frame_length ); + if( p_aout_buffer == NULL ) return NULL; + + p_aout_buffer->start_date = aout_DateGet( &p_sys->end_date ); + p_aout_buffer->end_date = + aout_DateIncrement( &p_sys->end_date, i_frame_length ); - /* Send the buffer to the aout core. */ - aout_DecPlay( p_dec->p_aout, p_dec->p_aout_input, p_buffer ); + p_block->p_buffer += LPCM_HEADER_LEN; + p_block->i_buffer -= LPCM_HEADER_LEN; + + /* 20/24 bits LPCM use special packing */ + if( i_bitspersample == 24 ) + { + uint8_t *p_out = p_aout_buffer->p_buffer; + + while( p_block->i_buffer / 12 ) + { + /* Sample 1 */ + p_out[0] = p_block->p_buffer[0]; + p_out[1] = p_block->p_buffer[1]; + p_out[2] = p_block->p_buffer[8]; + /* Sample 2 */ + p_out[3] = p_block->p_buffer[2]; + p_out[4] = p_block->p_buffer[3]; + p_out[5] = p_block->p_buffer[9]; + /* Sample 3 */ + p_out[6] = p_block->p_buffer[4]; + p_out[7] = p_block->p_buffer[5]; + p_out[8] = p_block->p_buffer[10]; + /* Sample 4 */ + p_out[9] = p_block->p_buffer[6]; + p_out[10] = p_block->p_buffer[7]; + p_out[11] = p_block->p_buffer[11]; + + p_block->i_buffer -= 12; + p_block->p_buffer += 12; + p_out += 12; + } + } + else if( i_bitspersample == 20 ) + { + uint8_t *p_out = p_aout_buffer->p_buffer; + + while( p_block->i_buffer / 10 ) + { + /* Sample 1 */ + p_out[0] = p_block->p_buffer[0]; + p_out[1] = p_block->p_buffer[1]; + p_out[2] = p_block->p_buffer[8] & 0xF0; + /* Sample 2 */ + p_out[3] = p_block->p_buffer[2]; + p_out[4] = p_block->p_buffer[3]; + p_out[5] = p_block->p_buffer[8] << 4; + /* Sample 3 */ + p_out[6] = p_block->p_buffer[4]; + p_out[7] = p_block->p_buffer[5]; + p_out[8] = p_block->p_buffer[9] & 0xF0; + /* Sample 4 */ + p_out[9] = p_block->p_buffer[6]; + p_out[10] = p_block->p_buffer[7]; + p_out[11] = p_block->p_buffer[9] << 4; + + p_block->i_buffer -= 10; + p_block->p_buffer += 10; + p_out += 12; + } + } + else + { + memcpy( p_aout_buffer->p_buffer, + p_block->p_buffer, p_block->i_buffer ); + } + + block_Release( p_block ); + return p_aout_buffer; + } } /***************************************************************************** - * EndThread : lpcm decoder thread destruction + * CloseDecoder : lpcm decoder destruction *****************************************************************************/ -static void EndThread( dec_thread_t * p_dec ) +static void CloseDecoder( vlc_object_t *p_this ) { - if( p_dec->p_aout_input != NULL ) - { - aout_DecDelete( p_dec->p_aout, p_dec->p_aout_input ); - } - - CloseBitstream( &p_dec->bit_stream ); - free( p_dec ); + decoder_t *p_dec = (decoder_t*)p_this; + free( p_dec->p_sys ); }