X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fpacketizer%2Fmpeg4audio.c;h=2bf711bf5e5da99b127be4dba02082280a56f4ab;hb=67415a4c979fc38b6b604b6f87d5e7d4220ba33f;hp=5f0eb4c06e63a80c55e5ac0006fe4cbcd8c9a158;hpb=1c332603ed6f326c80ac5ac872aa3000e3985aad;p=vlc diff --git a/modules/packetizer/mpeg4audio.c b/modules/packetizer/mpeg4audio.c index 5f0eb4c06e..2bf711bf5e 100644 --- a/modules/packetizer/mpeg4audio.c +++ b/modules/packetizer/mpeg4audio.c @@ -1,10 +1,11 @@ /***************************************************************************** - * mpeg4audio.c + * mpeg4audio.c: parse and packetize an MPEG 4 audio stream ***************************************************************************** - * Copyright (C) 2001, 2002 VideoLAN - * $Id: mpeg4audio.c,v 1.1 2003/01/08 10:26:49 fenrir Exp $ + * Copyright (C) 2001, 2002, 2006 the VideoLAN team + * $Id$ * * Authors: Laurent Aimar + * 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 @@ -18,24 +19,27 @@ * * 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 -#include -#include -#include -#include "codecs.h" -#include /* malloc(), free() */ -#include /* strdup() */ -/***************************************************************************** - * Local prototypes - *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include +#include + +#include "vlc_block_helper.h" + +#include /* AAC Config in ES: * @@ -50,295 +54,1174 @@ * ExtensionFlag 1 bit (always 0) */ -typedef struct packetizer_thread_s +/***************************************************************************** + * decoder_sys_t : decoder descriptor + *****************************************************************************/ +typedef struct { - /* Input properties */ - int b_adts; + int i_object_type; + int i_samplerate; + int i_channel; + int i_sbr; // 0: no sbr, 1: sbr, -1: unknown - decoder_fifo_t *p_fifo; - bit_stream_t bit_stream; + struct + { + int i_object_type; + int i_samplerate; + } extension; - /* Output properties */ - sout_input_t *p_sout_input; - sout_packet_format_t output_format; + /* GASpecific */ + int i_frame_length; // 1024 or 960 + +} mpeg4_cfg_t; + +#define LATM_MAX_EXTRA_SIZE 64 +typedef struct +{ + int i_program; + int i_layer; + + int i_frame_length_type; + int i_frame_length; // type 1 + int i_frame_length_index; // type 3 4 5 6 7 + + mpeg4_cfg_t cfg; + + /* Raw configuration */ + int i_extra; + uint8_t extra[LATM_MAX_EXTRA_SIZE]; + +} latm_stream_t; + +#define LATM_MAX_LAYER (8) +#define LATM_MAX_PROGRAM (16) +typedef struct +{ + int b_same_time_framing; + int i_sub_frames; + int i_programs; - mtime_t i_pts_start; - mtime_t i_pts; + int pi_layers[LATM_MAX_PROGRAM]; - WAVEFORMATEX *p_wf; + int pi_stream[LATM_MAX_PROGRAM][LATM_MAX_LAYER]; - /* Extracted from AAC config */ - int i_sample_rate; - int i_frame_size; // 1024 or 960 + int i_streams; + latm_stream_t stream[LATM_MAX_PROGRAM*LATM_MAX_LAYER]; -} packetizer_thread_t; + int i_other_data; + int i_crc; /* -1 if not set */ +} latm_mux_t; -static int Open ( vlc_object_t * ); -static int Run ( decoder_fifo_t * ); +struct decoder_sys_t +{ + /* + * Input properties + */ + int i_state; + int i_type; + + block_bytestream_t bytestream; + + /* + * Common properties + */ + audio_date_t end_date; + mtime_t i_pts; + + int i_frame_size; + unsigned int i_channels; + unsigned int i_rate, i_frame_length, i_header_size; + + int i_input_rate; + + /* LOAS */ + bool b_latm_cfg; + latm_mux_t latm; +}; + +enum { + STATE_NOSYNC, + STATE_SYNC, + STATE_HEADER, + STATE_NEXT_SYNC, + STATE_GET_DATA, + STATE_SEND_DATA +}; + +enum { + TYPE_NONE, + TYPE_RAW, + TYPE_ADTS, + TYPE_LOAS +}; + +static const int pi_sample_rates[16] = +{ + 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, + 16000, 12000, 11025, 8000, 7350, 0, 0, 0 +}; + +#define ADTS_HEADER_SIZE 9 +#define LOAS_HEADER_SIZE 3 + +/**************************************************************************** + * Local prototypes + ****************************************************************************/ +static int OpenPacketizer( vlc_object_t * ); +static void ClosePacketizer( vlc_object_t * ); -static int InitThread ( packetizer_thread_t * ); -static void PacketizeThreadMPEG4 ( packetizer_thread_t * ); -static void PacketizeThreadADTS ( packetizer_thread_t * ); -static void EndThread ( packetizer_thread_t * ); +static block_t *PacketizeRawBlock ( decoder_t *, block_t ** ); +static block_t *PacketizeStreamBlock( decoder_t *, block_t ** ); /***************************************************************************** * Module descriptor *****************************************************************************/ - -vlc_module_begin(); - set_description( _("MPEG4 Audio packetizer") ); - set_capability( "packetizer", 50 ); - set_callbacks( Open, NULL ); -vlc_module_end(); - +vlc_module_begin () + set_category( CAT_SOUT ) + set_subcategory( SUBCAT_SOUT_PACKETIZER ) + set_description( N_("MPEG4 audio packetizer") ) + set_capability( "packetizer", 50 ) + set_callbacks( OpenPacketizer, ClosePacketizer ) +vlc_module_end () /***************************************************************************** - * OpenDecoder: probe the packetizer and return score - ***************************************************************************** - * Tries to launch a decoder and return score so that the interface is able - * to choose. + * OpenPacketizer: probe the packetizer and return score *****************************************************************************/ -static int Open( vlc_object_t *p_this ) +static int OpenPacketizer( 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_dec->fmt_in.i_codec != VLC_FOURCC( 'm', 'p', '4', 'a' ) ) + { + return VLC_EGENERIC; + } + + /* 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; + + /* Misc init */ + p_sys->i_state = STATE_NOSYNC; + aout_DateSet( &p_sys->end_date, 0 ); + p_sys->bytestream = block_BytestreamInit(); + p_sys->b_latm_cfg = false; + + /* Set output properties */ + p_dec->fmt_out.i_cat = AUDIO_ES; + p_dec->fmt_out.i_codec = VLC_FOURCC('m','p','4','a'); - p_fifo->pf_run = Run; + msg_Dbg( p_dec, "running MPEG4 audio packetizer" ); - if( p_fifo->i_fourcc == VLC_FOURCC( 'm', 'p', '4', 'a') ) + if( p_dec->fmt_in.i_extra > 0 ) { - return( VLC_SUCCESS ); + uint8_t *p_config = (uint8_t*)p_dec->fmt_in.p_extra; + int i_index; + + i_index = ( ( p_config[0] << 1 ) | ( p_config[1] >> 7 ) ) & 0x0f; + if( i_index != 0x0f ) + { + p_dec->fmt_out.audio.i_rate = pi_sample_rates[i_index]; + p_dec->fmt_out.audio.i_frame_length = + (( p_config[1] >> 2 ) & 0x01) ? 960 : 1024; + } + else + { + p_dec->fmt_out.audio.i_rate = ( ( p_config[1] & 0x7f ) << 17 ) | + ( p_config[2] << 9 ) | ( p_config[3] << 1 ) | + ( p_config[4] >> 7 ); + p_dec->fmt_out.audio.i_frame_length = + (( p_config[4] >> 2 ) & 0x01) ? 960 : 1024; + } + + p_dec->fmt_out.audio.i_channels = + (p_config[i_index == 0x0f ? 4 : 1] >> 3) & 0x0f; + + msg_Dbg( p_dec, "AAC %dHz %d samples/frame", + p_dec->fmt_out.audio.i_rate, + p_dec->fmt_out.audio.i_frame_length ); + + aout_DateInit( &p_sys->end_date, p_dec->fmt_out.audio.i_rate ); + + p_dec->fmt_out.i_extra = p_dec->fmt_in.i_extra; + p_dec->fmt_out.p_extra = malloc( p_dec->fmt_in.i_extra ); + if( !p_dec->fmt_out.p_extra ) + { + p_dec->fmt_out.i_extra = 0; + return VLC_ENOMEM; + } + memcpy( p_dec->fmt_out.p_extra, p_dec->fmt_in.p_extra, + p_dec->fmt_in.i_extra ); + + /* Set callback */ + p_dec->pf_packetize = PacketizeRawBlock; + p_sys->i_type = TYPE_RAW; } else { - return( VLC_EGENERIC ); + msg_Dbg( p_dec, "no decoder specific info, must be an ADTS or LOAS stream" ); + + aout_DateInit( &p_sys->end_date, p_dec->fmt_in.audio.i_rate ); + + /* We will try to create a AAC Config from adts/loas */ + p_dec->fmt_out.i_extra = 0; + p_dec->fmt_out.p_extra = NULL; + + /* Set callback */ + p_dec->pf_packetize = PacketizeStreamBlock; + p_sys->i_type = TYPE_NONE; } + + return VLC_SUCCESS; } -/***************************************************************************** - * RunDecoder: this function is called just after the thread is created - *****************************************************************************/ -static int Run( decoder_fifo_t *p_fifo ) +/**************************************************************************** + * PacketizeRawBlock: the whole thing + **************************************************************************** + * This function must be fed with complete frames. + ****************************************************************************/ +static block_t *PacketizeRawBlock( decoder_t *p_dec, block_t **pp_block ) { - packetizer_thread_t *p_pack; - int b_error; + decoder_sys_t *p_sys = p_dec->p_sys; + block_t *p_block; + + if( !pp_block || !*pp_block ) return NULL; - msg_Info( p_fifo, "Running MPEG4 audio packetizer" ); - if( !( p_pack = malloc( sizeof( packetizer_thread_t ) ) ) ) + if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) + { + aout_DateSet( &p_sys->end_date, 0 ); + block_Release( *pp_block ); + return NULL; + } + + p_block = *pp_block; + *pp_block = NULL; /* Don't reuse this block */ + + if( !aout_DateGet( &p_sys->end_date ) && !p_block->i_pts ) + { + /* We've just started the stream, wait for the first PTS. */ + block_Release( p_block ); + return NULL; + } + else if( p_block->i_pts != 0 && + p_block->i_pts != aout_DateGet( &p_sys->end_date ) ) { - msg_Err( p_fifo, "out of memory" ); - DecoderError( p_fifo ); - return( -1 ); + aout_DateSet( &p_sys->end_date, p_block->i_pts ); } - memset( p_pack, 0, sizeof( packetizer_thread_t ) ); - p_pack->p_fifo = p_fifo; + p_block->i_pts = p_block->i_dts = aout_DateGet( &p_sys->end_date ); - if( InitThread( p_pack ) != 0 ) + p_block->i_length = aout_DateIncrement( &p_sys->end_date, + p_dec->fmt_out.audio.i_frame_length ) - p_block->i_pts; + + return p_block; +} + +/**************************************************************************** + * ADTS helpers + ****************************************************************************/ +static int ADTSSyncInfo( decoder_t * p_dec, const uint8_t * p_buf, + unsigned int * pi_channels, + unsigned int * pi_sample_rate, + unsigned int * pi_frame_length, + unsigned int * pi_header_size ) +{ + int i_profile, i_sample_rate_idx, i_frame_size; + bool b_crc; + + /* Fixed header between frames */ + //int i_id = ( (p_buf[1] >> 3) & 0x01) ? 2 : 4; /* MPEG-2 or 4 */ + b_crc = !(p_buf[1] & 0x01); + i_profile = p_buf[2] >> 6; + i_sample_rate_idx = (p_buf[2] >> 2) & 0x0f; + *pi_sample_rate = pi_sample_rates[i_sample_rate_idx]; + //private_bit = (p_buf[2] >> 1) & 0x01; + *pi_channels = ((p_buf[2] & 0x01) << 2) | ((p_buf[3] >> 6) & 0x03); + //original_copy = (p_buf[3] >> 5) & 0x01; + //home = (p_buf[3] >> 4) & 0x01; + + /* Variable header */ + //copyright_id_bit = (p_buf[3] >> 3) & 0x01; + //copyright_id_start = (p_buf[3] >> 2) & 0x01; + i_frame_size = ((p_buf[3] & 0x03) << 11) | (p_buf[4] << 3) | + ((p_buf[5] >> 5) /*& 0x7*/); + //uint16_t buffer_fullness = ((p_buf[5] & 0x1f) << 6) | (p_buf[6] >> 2); + unsigned short i_raw_blocks_in_frame = p_buf[6] & 0x03; + + if( !*pi_sample_rate || !*pi_channels || !i_frame_size ) { - DecoderError( p_fifo ); - return( -1 ); + msg_Warn( p_dec, "Invalid ADTS header" ); + return 0; } - while( ( !p_pack->p_fifo->b_die )&&( !p_pack->p_fifo->b_error ) ) + *pi_frame_length = 1024; + + if( i_raw_blocks_in_frame == 0 ) { - if( p_pack->b_adts ) + if( b_crc ) { - PacketizeThreadADTS( p_pack ); + msg_Warn( p_dec, "ADTS CRC not supported" ); + //uint16_t crc = (p_buf[7] << 8) | p_buf[8]; } - else + } + else + { + msg_Err( p_dec, "Multiple blocks per frame in ADTS not supported" ); + return 0; +#if 0 + int i; + const uint8_t *p_pos = p_buf + 7; + uint16_t crc_block; + uint16_t i_block_pos[3]; + if( b_crc ) { - PacketizeThreadMPEG4( p_pack ); + for( i = 0 ; i < i_raw_blocks_in_frame ; i++ ) + { /* the 1st block's position is known ... */ + i_block_pos[i] = (*p_pos << 8) | *(p_pos+1); + p_pos += 2; + } + crc_block = (*p_pos << 8) | *(p_pos+1); + p_pos += 2; } + for( i = 0 ; i <= i_raw_blocks_in_frame ; i++ ) + { + //read 1 block + if( b_crc ) + { + msg_Err( p_dec, "ADTS CRC not supported" ); + //uint16_t crc = (*p_pos << 8) | *(p_pos+1); + //p_pos += 2; + } + } +#endif } - if( ( b_error = p_pack->p_fifo->b_error ) ) + /* Build the decoder specific info header */ + if( !p_dec->fmt_out.i_extra ) { - DecoderError( p_pack->p_fifo ); + p_dec->fmt_out.p_extra = malloc( 2 ); + if( !p_dec->fmt_out.p_extra ) + { + p_dec->fmt_out.i_extra = 0; + return 0; + } + p_dec->fmt_out.i_extra = 2; + ((uint8_t *)p_dec->fmt_out.p_extra)[0] = + (i_profile + 1) << 3 | (i_sample_rate_idx >> 1); + ((uint8_t *)p_dec->fmt_out.p_extra)[1] = + ((i_sample_rate_idx & 0x01) << 7) | (*pi_channels <<3); } - EndThread( p_pack ); - if( b_error ) + /* ADTS header length */ + *pi_header_size = b_crc ? 9 : 7; + + return i_frame_size - *pi_header_size; +} + +/**************************************************************************** + * LOAS helpers + ****************************************************************************/ +static int LOASSyncInfo( uint8_t p_header[LOAS_HEADER_SIZE], unsigned int *pi_header_size ) +{ + *pi_header_size = 3; + return ( ( p_header[1] & 0x1f ) << 8 ) + p_header[2]; +} + +static int Mpeg4GAProgramConfigElement( bs_t *s ) +{ + /* TODO compute channels count ? */ + int i_tag = bs_read( s, 4 ); + if( i_tag != 0x05 ) + return -1; + bs_skip( s, 2 + 4 ); // object type + sampling index + int i_num_front = bs_read( s, 4 ); + int i_num_side = bs_read( s, 4 ); + int i_num_back = bs_read( s, 4 ); + int i_num_lfe = bs_read( s, 2 ); + int i_num_assoc_data = bs_read( s, 3 ); + int i_num_valid_cc = bs_read( s, 4 ); + + if( bs_read1(s) ) + bs_skip( s, 4 ); // mono downmix + if( bs_read1(s) ) + bs_skip( s, 4 ); // stereo downmix + if( bs_read1(s) ) + bs_skip( s, 2+1 ); // matrix downmix + pseudo_surround + + bs_skip( s, i_num_front * (1+4) ); + bs_skip( s, i_num_side * (1+4) ); + bs_skip( s, i_num_back * (1+4) ); + bs_skip( s, i_num_lfe * (4) ); + bs_skip( s, i_num_assoc_data * (4) ); + bs_skip( s, i_num_valid_cc * (5) ); + bs_align( s ); + int i_comment = bs_read( s, 8 ); + bs_skip( s, i_comment * 8 ); + return 0; +} + +static int Mpeg4GASpecificConfig( mpeg4_cfg_t *p_cfg, bs_t *s ) +{ + p_cfg->i_frame_length = bs_read1(s) ? 960 : 1024; + + if( bs_read1( s ) ) // depend on core coder + bs_skip( s, 14 ); // core coder delay + + int i_extension_flag = bs_read1( s ); + if( p_cfg->i_channel == 0 ) { - return( -1 ); + Mpeg4GAProgramConfigElement( s ); } + if( p_cfg->i_object_type == 6 || p_cfg->i_object_type == 20 ) + bs_skip( s, 3 ); // layer - return( 0 ); + if( i_extension_flag ) + { + if( p_cfg->i_object_type == 22 ) + { + bs_skip( s, 5 + 11 ); // numOfSubFrame + layer length + } + if( p_cfg->i_object_type == 17 || p_cfg->i_object_type == 19 || + p_cfg->i_object_type == 20 || p_cfg->i_object_type == 23 ) + { + bs_skip( s, 1+1+1 ); // ER data : section scale spectral */ + } + if( bs_read1( s ) ) // extension 3 + fprintf( stderr, "Mpeg4GASpecificConfig: error 1\n" ); + } + return 0; } +static int Mpeg4ReadAudioObjectType( bs_t *s ) +{ + int i_type = bs_read( s, 5 ); + if( i_type == 0x1f ) + i_type += bs_read( s, 6 ); + return i_type; +} -#define FREE( p ) if( p ) free( p ); p = NULL - -/***************************************************************************** - * InitThread: initialize data before entering main loop - *****************************************************************************/ -static int i_sample_rates[] = +static int Mpeg4ReadAudioSamplerate( bs_t *s ) { - 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, - 16000, 12000, 11025, 8000, 7350, 0, 0, 0 -}; + int i_index = bs_read( s, 4 ); + if( i_index != 0x0f ) + return pi_sample_rates[i_index]; + return bs_read( s, 24 ); +} -static int InitThread( packetizer_thread_t *p_pack ) +static int Mpeg4ReadAudioSpecificInfo( mpeg4_cfg_t *p_cfg, int *pi_extra, uint8_t *p_extra, bs_t *s, int i_max_size ) { - WAVEFORMATEX *p_wf; +#if 0 + static const char *ppsz_otype[] = { + "NULL", + "AAC Main", "AAC LC", "AAC SSR", "AAC LTP", "SBR", "AAC Scalable", + "TwinVQ", + "CELP", "HVXC", + "Reserved", "Reserved", + "TTSI", + "Main Synthetic", "Wavetables Synthesis", "General MIDI", + "Algorithmic Synthesis and Audio FX", + "ER AAC LC", + "Reserved", + "ER AAC LTP", "ER AAC Scalable", "ER TwinVQ", "ER BSAC", "ER AAC LD", + "ER CELP", "ER HVXC", "ER HILN", "ER Parametric", + "SSC", + "Reserved", "Reserved", "Escape", + "Layer 1", "Layer 2", "Layer 3", + "DST", + }; +#endif + const int i_pos_start = bs_pos( s ); + bs_t s_sav = *s; + int i_bits; + int i; - p_wf = (WAVEFORMATEX*)p_pack->p_fifo->p_waveformatex; + memset( p_cfg, 0, sizeof(*p_cfg) ); + *pi_extra = 0; - if( p_wf && p_wf->cbSize > 0) - { - uint8_t *p_config = (uint8_t*)&p_wf[1]; - int i_wf = sizeof( WAVEFORMATEX ) + p_wf->cbSize; - int i_index; + p_cfg->i_object_type = Mpeg4ReadAudioObjectType( s ); + p_cfg->i_samplerate = Mpeg4ReadAudioSamplerate( s ); + p_cfg->i_channel = bs_read( s, 4 ); + if( p_cfg->i_channel == 7 ) + p_cfg->i_channel = 8; // 7.1 + else if( p_cfg->i_channel >= 8 ) + p_cfg->i_channel = -1; - p_pack->p_wf = malloc( i_wf ); - memcpy( p_pack->p_wf, - p_wf, - i_wf ); - p_pack->output_format.i_cat = AUDIO_ES; - p_pack->output_format.i_fourcc = VLC_FOURCC( 'm', 'p', '4', 'a' ); - p_pack->output_format.p_format = p_pack->p_wf; - p_pack->b_adts = 0; + p_cfg->i_sbr = -1; + p_cfg->extension.i_object_type = 0; + p_cfg->extension.i_samplerate = 0; + if( p_cfg->i_object_type == 5 ) + { + p_cfg->i_sbr = 1; + p_cfg->extension.i_object_type = p_cfg->i_object_type; + p_cfg->extension.i_samplerate = Mpeg4ReadAudioSamplerate( s ); - i_index = ( ( p_config[0] << 1 ) | ( p_config[1] >> 7 ) )&0x0f; - if( i_index != 0x0f ) + p_cfg->i_object_type = Mpeg4ReadAudioObjectType( s ); + } + + switch( p_cfg->i_object_type ) + { + case 1: case 2: case 3: case 4: + case 6: case 7: + case 17: case 19: case 20: case 21: case 22: case 23: + Mpeg4GASpecificConfig( p_cfg, s ); + break; + case 8: + // CelpSpecificConfig(); + break; + case 9: + // HvxcSpecificConfig(); + break; + case 12: + // TTSSSpecificConfig(); + break; + case 13: case 14: case 15: case 16: + // StructuredAudioSpecificConfig(); + break; + case 24: + // ERCelpSpecificConfig(); + break; + case 25: + // ERHvxcSpecificConfig(); + break; + case 26: case 27: + // ParametricSpecificConfig(); + break; + case 28: + // SSCSpecificConfig(); + break; + case 32: case 33: case 34: + // MPEG_1_2_SpecificConfig(); + break; + case 35: + // DSTSpecificConfig(); + break; + default: + // error + break; + } + switch( p_cfg->i_object_type ) + { + case 17: case 19: case 20: case 21: case 22: case 23: + case 24: case 25: case 26: case 27: + { + int epConfig = bs_read( s, 2 ); + if( epConfig == 2 || epConfig == 3 ) { - p_pack->i_sample_rate = i_sample_rates[i_index]; - p_pack->i_frame_size = ( ( p_config[1] >> 2 )&0x01 ) ? 960 : 1024; + //ErrorProtectionSpecificConfig(); } - else + if( epConfig == 3 ) { - p_pack->i_sample_rate = ( ( p_config[1]&0x7f ) << 17 ) | ( p_config[2] << 9 )| - ( p_config[3] << 1 ) | ( p_config[4] >> 7 ); - p_pack->i_frame_size = ( ( p_config[4] >> 2 )&0x01 ) ? 960 : 1024; + int directMapping = bs_read1( s ); + if( directMapping ) + { + // tbd ... + } } - msg_Dbg( p_pack->p_fifo, - "aac %dHz %d samples/frame", - p_pack->i_sample_rate, - p_pack->i_frame_size ); + break; } - else + default: + break; + } + + if( p_cfg->extension.i_object_type != 5 && i_max_size > 0 && i_max_size - (bs_pos(s) - i_pos_start) >= 16 && + bs_read( s, 11 ) == 0x2b7 ) { - int i_wf = sizeof( WAVEFORMATEX ) + 5; - /* we will try to create a AAC Config from adts */ - p_pack->output_format.i_cat = UNKNOWN_ES; - p_pack->output_format.i_fourcc = VLC_FOURCC( 'n', 'u', 'l', 'l' ); - p_pack->b_adts = 1; - - if( InitBitstream( &p_pack->bit_stream, p_pack->p_fifo, - NULL, NULL ) != VLC_SUCCESS ) + p_cfg->extension.i_object_type = Mpeg4ReadAudioObjectType( s ); + if( p_cfg->extension.i_object_type == 5 ) { - msg_Err( p_pack->p_fifo, "cannot initialize bitstream" ); - return -1; + p_cfg->i_sbr = bs_read1( s ); + if( p_cfg->i_sbr == 1 ) + p_cfg->extension.i_samplerate = Mpeg4ReadAudioSamplerate( s ); } - } - p_pack->p_sout_input = - sout_InputNew( p_pack->p_fifo, - &p_pack->output_format ); + //fprintf( stderr, "Mpeg4ReadAudioSpecificInfo: t=%s(%d)f=%d c=%d sbr=%d\n", + // ppsz_otype[p_cfg->i_object_type], p_cfg->i_object_type, p_cfg->i_samplerate, p_cfg->i_channel, p_cfg->i_sbr ); - if( !p_pack->p_sout_input ) + i_bits = bs_pos(s) - i_pos_start; + + *pi_extra = ( i_bits + 7 ) / 8; + for( i = 0; i < __MIN( LATM_MAX_EXTRA_SIZE, *pi_extra ); i++ ) { - msg_Err( p_pack->p_fifo, - "cannot add a new stream" ); - return( -1 ); + const int i_read = __MIN( 8, i_bits - 8*i ); + p_extra[i] = bs_read( &s_sav, i_read ) << (8-i_read); } + return i_bits; +} - p_pack->i_pts_start = -1; - p_pack->i_pts = 0; - return( 0 ); +static int LatmGetValue( bs_t *s ) +{ + int i_bytes = bs_read( s, 2 ); + int v = 0; + int i; + for( i = 0; i < i_bytes; i++ ) + v = (v << 8) + bs_read( s, 8 ); + + return v; } -/***************************************************************************** - * PacketizeThread: packetize an unit (here copy a complete pes) - *****************************************************************************/ -static void PacketizeThreadMPEG4( packetizer_thread_t *p_pack ) +static int LatmReadStreamMuxConfiguration( latm_mux_t *m, bs_t *s ) { - sout_buffer_t *p_sout_buffer; - pes_packet_t *p_pes; - size_t i_size; + int i_mux_version; + int i_mux_versionA; + int i_program; - /* **** get samples count **** */ - input_ExtractPES( p_pack->p_fifo, &p_pes ); - if( !p_pes ) + i_mux_version = bs_read( s, 1 ); + i_mux_versionA = 0; + if( i_mux_version ) + i_mux_versionA = bs_read( s, 1 ); + + if( i_mux_versionA != 0 ) /* support only A=0 */ + return -1; + + memset( m, 0, sizeof(*m) ); + + if( i_mux_versionA == 0 ) { - p_pack->p_fifo->b_error = 1; - return; + if( i_mux_version == 1 ) + { + LatmGetValue(s); /* taraBufferFullness */ + } } -#if 0 - if( p_pack->i_pts_start < 0 && p_pes->i_pts > 0 ) + + m->b_same_time_framing = bs_read1( s ); + m->i_sub_frames = 1 + bs_read( s, 6 ); + m->i_programs = 1 + bs_read( s, 4 ); + + for( i_program = 0; i_program < m->i_programs; i_program++ ) { - p_pack->i_pts_start = p_pes->i_pts; + int i_layer; + + m->pi_layers[i_program] = 1+bs_read( s, 3 ); + + for( i_layer = 0; i_layer < m->pi_layers[i_program]; i_layer++ ) + { + latm_stream_t *st = &m->stream[m->i_streams]; + bool b_previous_cfg; + + m->pi_stream[i_program][i_layer] = m->i_streams; + st->i_program = i_program; + st->i_layer = i_layer; + + b_previous_cfg = false; + if( i_program != 0 || i_layer != 0 ) + b_previous_cfg = bs_read1( s ); + + if( b_previous_cfg ) + { + assert( m->i_streams > 0 ); + st->cfg = m->stream[m->i_streams-1].cfg; + } + else + { + int i_cfg_size = 0; + if( i_mux_version == 1 ) + i_cfg_size = LatmGetValue(s); + i_cfg_size -= Mpeg4ReadAudioSpecificInfo( &st->cfg, &st->i_extra, st->extra, s, i_cfg_size ); + if( i_cfg_size > 0 ) + bs_skip( s, i_cfg_size ); + } + + st->i_frame_length_type = bs_read( s, 3 ); + switch( st->i_frame_length_type ) + { + case 0: + { + bs_skip( s, 8 ); /* latmBufferFullnes */ + if( !m->b_same_time_framing ) + { + if( st->cfg.i_object_type == 6 || st->cfg.i_object_type == 20 || + st->cfg.i_object_type == 8 || st->cfg.i_object_type == 24 ) + { + bs_skip( s, 6 ); /* eFrameOffset */ + } + } + break; + } + case 1: + st->i_frame_length = bs_read( s, 9 ); + break; + case 3: case 4: case 5: + st->i_frame_length_index = bs_read( s, 6 ); // celp + break; + case 6: case 7: + st->i_frame_length_index = bs_read( s, 1 ); // hvxc + default: + break; + } + /* Next stream */ + m->i_streams++; + } + } + + /* other data */ + if( bs_read1( s ) ) + { + if( i_mux_version == 1 ) + { + m->i_other_data = LatmGetValue( s ); + } + else + { + int b_continue; + do { + b_continue = bs_read1(s); + m->i_other_data = (m->i_other_data << 8) + bs_read( s, 8 ); + } while( b_continue ); + } } - p_pack->i_pts = p_pes->i_pts - p_pack->i_pts_start; -#endif - i_size = p_pes->i_pes_size; + /* crc */ + m->i_crc = -1; + if( bs_read1( s ) ) + m->i_crc = bs_read( s, 8 ); + + return 0; +} + +static int LOASParse( decoder_t *p_dec, uint8_t *p_buffer, int i_buffer ) +{ + decoder_sys_t *p_sys = p_dec->p_sys; + bs_t s; + int i_sub; + int i_accumulated = 0; - if( i_size > 0 ) + bs_init( &s, p_buffer, i_buffer ); + + /* Read the stream mux configuration if present */ + if( !bs_read1( &s ) ) { - data_packet_t *p_data; - size_t i_buffer; + if( !LatmReadStreamMuxConfiguration( &p_sys->latm, &s ) && + p_sys->latm.i_streams > 0 ) + { + const latm_stream_t *st = &p_sys->latm.stream[0]; + + p_sys->i_channels = st->cfg.i_channel; + p_sys->i_rate = st->cfg.i_samplerate; + p_sys->i_frame_length = st->cfg.i_frame_length; + + /* FIXME And if it changes ? */ + if( !p_dec->fmt_out.i_extra && st->i_extra > 0 ) + { + p_dec->fmt_out.i_extra = st->i_extra; + p_dec->fmt_out.p_extra = malloc( st->i_extra ); + if( !p_dec->fmt_out.p_extra ) + { + p_dec->fmt_out.i_extra = 0; + return 0; + } + memcpy( p_dec->fmt_out.p_extra, st->extra, st->i_extra ); + } + + p_sys->b_latm_cfg = true; + } + } + /* Wait for the configuration */ + if( !p_sys->b_latm_cfg ) + return 0; - p_sout_buffer = - sout_BufferNew( p_pack->p_sout_input->p_sout, i_size ); - if( !p_sout_buffer ) + /* FIXME do we need to split the subframe into independent packet ? */ + if( p_sys->latm.i_sub_frames > 1 ) + msg_Err( p_dec, "latm sub frames not yet supported, please send a sample" ); + + for( i_sub = 0; i_sub < p_sys->latm.i_sub_frames; i_sub++ ) + { + int pi_payload[LATM_MAX_PROGRAM][LATM_MAX_LAYER]; + if( p_sys->latm.b_same_time_framing ) { - p_pack->p_fifo->b_error = 1; - return; + int i_program; + /* Payload length */ + for( i_program = 0; i_program < p_sys->latm.i_programs; i_program++ ) + { + int i_layer; + for( i_layer = 0; i_layer < p_sys->latm.pi_layers[i_program]; i_layer++ ) + { + latm_stream_t *st = &p_sys->latm.stream[p_sys->latm.pi_stream[i_program][i_layer]]; + if( st->i_frame_length_type == 0 ) + { + int i_payload = 0; + for( ;; ) + { + int i_tmp = bs_read( &s, 8 ); + i_payload += i_tmp; + if( i_tmp != 255 ) + break; + } + pi_payload[i_program][i_layer] = i_payload; + } + else if( st->i_frame_length_type == 1 ) + { + pi_payload[i_program][i_layer] = st->i_frame_length / 8; /* XXX not correct */ + } + else if( ( st->i_frame_length_type == 3 ) || + ( st->i_frame_length_type == 5 ) || + ( st->i_frame_length_type == 7 ) ) + { + bs_skip( &s, 2 ); // muxSlotLengthCoded + pi_payload[i_program][i_layer] = 0; /* TODO */ + } + else + { + pi_payload[i_program][i_layer] = 0; /* TODO */ + } + } + } + /* Payload Data */ + for( i_program = 0; i_program < p_sys->latm.i_programs; i_program++ ) + { + int i_layer; + int i; + for( i_layer = 0; i_layer < p_sys->latm.pi_layers[i_program]; i_layer++ ) + { + /* XXX we only extract 1 stream */ + if( i_program != 0 || i_layer != 0 ) + break; + + if( pi_payload[i_program][i_layer] <= 0 ) + continue; + + /* FIXME that's slow (and a bit ugly to write in place) */ + for( i = 0; i < pi_payload[i_program][i_layer]; i++ ) + p_buffer[i_accumulated++] = bs_read( &s, 8 ); + } + } } - /* TODO: memcpy of the pes packet */ - for( i_buffer = 0, p_data = p_pes->p_first; - p_data != NULL && i_buffer < i_size; - p_data = p_data->p_next) + else { - size_t i_copy; + const int i_chunks = bs_read( &s, 4 ); + int pi_program[16]; + int pi_layer[16]; + int i_chunk; - i_copy = __MIN( p_data->p_payload_end - p_data->p_payload_start, - i_size - i_buffer ); - if( i_copy > 0 ) + msg_Err( p_dec, "latm without same time frameing not yet supported, please send a sample" ); + + for( i_chunk = 0; i_chunk < i_chunks; i_chunk++ ) { - p_pack->p_fifo->p_vlc->pf_memcpy( p_sout_buffer->p_buffer + i_buffer, - p_data->p_payload_start, - i_copy ); + const int streamIndex = bs_read( &s, 4 ); + latm_stream_t *st = &p_sys->latm.stream[streamIndex]; + const int i_program = st->i_program; + const int i_layer = st->i_layer; + + pi_program[i_chunk] = i_program; + pi_layer[i_chunk] = i_layer; + + if( st->i_frame_length_type == 0 ) + { + int i_payload = 0; + for( ;; ) + { + int i_tmp = bs_read( &s, 8 ); + i_payload += i_tmp; + if( i_tmp != 255 ) + break; + } + pi_payload[i_program][i_layer] = i_payload; + bs_skip( &s, 1 ); // auEndFlag + } + else if( st->i_frame_length_type == 1 ) + { + pi_payload[i_program][i_layer] = st->i_frame_length / 8; /* XXX not correct */ + } + else if( ( st->i_frame_length_type == 3 ) || + ( st->i_frame_length_type == 5 ) || + ( st->i_frame_length_type == 7 ) ) + { + bs_read( &s, 2 ); // muxSlotLengthCoded + } + else + { + } + } + for( i_chunk = 0; i_chunk < i_chunks; i_chunk++ ) + { + //const int i_program = pi_program[i_chunk]; + //const int i_layer = pi_layer[i_chunk]; + + /* TODO ? Payload */ } - i_buffer += i_copy; } + } + + if( p_sys->latm.i_other_data > 0 ) + { + /* Other data XXX we just ignore them */ + } + bs_align( &s ); - p_sout_buffer->i_length = (mtime_t)1000000 * (mtime_t)p_pack->i_frame_size / (mtime_t)p_pack->i_sample_rate; - p_sout_buffer->i_bitrate = 0; - p_sout_buffer->i_dts = p_pack->i_pts; - p_sout_buffer->i_pts = p_pack->i_pts; + return i_accumulated; +} - sout_InputSendBuffer( p_pack->p_sout_input, - p_sout_buffer ); +/**************************************************************************** + * PacketizeStreamBlock: ADTS/LOAS packetizer + ****************************************************************************/ +static void SetupOutput( decoder_t *p_dec, block_t *p_block ); +static block_t *PacketizeStreamBlock( decoder_t *p_dec, block_t **pp_block ) +{ + decoder_sys_t *p_sys = p_dec->p_sys; + uint8_t p_header[ADTS_HEADER_SIZE + LOAS_HEADER_SIZE]; + block_t *p_out_buffer; + uint8_t *p_buf; - p_pack->i_pts += (mtime_t)1000000 * (mtime_t)p_pack->i_frame_size / (mtime_t)p_pack->i_sample_rate; + if( !pp_block || !*pp_block ) return NULL; + + if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) + { + 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; } - input_DeletePES( p_pack->p_fifo->p_packets_mgt, p_pes ); -} + if( !aout_DateGet( &p_sys->end_date ) && !(*pp_block)->i_pts ) + { + /* We've just started the stream, wait for the first PTS. */ + block_Release( *pp_block ); + return NULL; + } + block_BytestreamPush( &p_sys->bytestream, *pp_block ); -static void PacketizeThreadADTS( packetizer_thread_t *p_pack ) -{ - msg_Err( p_pack->p_fifo, "adts stream unsupported" ); - p_pack->p_fifo->b_error = 1; + for( ;; ) + { + switch( p_sys->i_state ) + { + + case STATE_NOSYNC: + while( block_PeekBytes( &p_sys->bytestream, p_header, 2 ) + == VLC_SUCCESS ) + { + /* Look for sync word - should be 0xfff(adts) or 0x2b7(loas) */ + if( p_header[0] == 0xff && (p_header[1] & 0xf6) == 0xf0 ) + { + if( p_sys->i_type != TYPE_ADTS ) + msg_Dbg( p_dec, "detected ADTS format" ); + + p_sys->i_state = STATE_SYNC; + p_sys->i_type = TYPE_ADTS; + break; + } + else if( p_header[0] == 0x56 && (p_header[1] & 0xe0) == 0xe0 ) + { + if( p_sys->i_type != TYPE_LOAS ) + msg_Dbg( p_dec, "detected LOAS format" ); + + p_sys->i_state = STATE_SYNC; + p_sys->i_type = TYPE_LOAS; + break; + } + block_SkipByte( &p_sys->bytestream ); + } + if( p_sys->i_state != STATE_SYNC ) + { + block_BytestreamFlush( &p_sys->bytestream ); + + /* Need more data */ + return 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; + break; + + case STATE_HEADER: + if( p_sys->i_type == TYPE_ADTS ) + { + /* Get ADTS frame header (ADTS_HEADER_SIZE bytes) */ + if( block_PeekBytes( &p_sys->bytestream, p_header, + ADTS_HEADER_SIZE ) != VLC_SUCCESS ) + { + /* Need more data */ + return NULL; + } + + /* Check if frame is valid and get frame info */ + p_sys->i_frame_size = ADTSSyncInfo( p_dec, p_header, + &p_sys->i_channels, + &p_sys->i_rate, + &p_sys->i_frame_length, + &p_sys->i_header_size ); + } + else + { + assert( p_sys->i_type == TYPE_LOAS ); + /* Get LOAS frame header (LOAS_HEADER_SIZE bytes) */ + if( block_PeekBytes( &p_sys->bytestream, p_header, + LOAS_HEADER_SIZE ) != VLC_SUCCESS ) + { + /* Need more data */ + return NULL; + } + + /* Check if frame is valid and get frame info */ + p_sys->i_frame_size = LOASSyncInfo( p_header, &p_sys->i_header_size ); + } + + if( p_sys->i_frame_size <= 0 ) + { + 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; + + case STATE_NEXT_SYNC: + /* TODO: If p_block == NULL, flush the buffer without checking the + * next sync word */ + if( p_sys->bytestream.p_block == NULL ) + { + p_sys->i_state = STATE_NOSYNC; + block_BytestreamFlush( &p_sys->bytestream ); + return NULL; + } + + /* Check if next expected frame contains the sync word */ + if( block_PeekOffsetBytes( &p_sys->bytestream, p_sys->i_frame_size + + p_sys->i_header_size, p_header, 2 ) + != VLC_SUCCESS ) + { + /* Need more data */ + return NULL; + } + + assert( (p_sys->i_type == TYPE_ADTS) || (p_sys->i_type == TYPE_LOAS) ); + if( ( ( p_sys->i_type == TYPE_ADTS ) && + ( p_header[0] != 0xff || (p_header[1] & 0xf6) != 0xf0 ) ) || + ( ( p_sys->i_type == TYPE_LOAS ) && + ( p_header[0] != 0x56 || (p_header[1] & 0xe0) != 0xe0 ) ) ) + { + msg_Dbg( p_dec, "emulated sync word " + "(no sync on following frame)" ); + p_sys->i_state = STATE_NOSYNC; + block_SkipByte( &p_sys->bytestream ); + break; + } + + p_sys->i_state = STATE_SEND_DATA; + break; + + 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 + + p_sys->i_header_size) != VLC_SUCCESS ) + { + /* Need more data */ + return NULL; + } + p_sys->i_state = STATE_SEND_DATA; + + case STATE_SEND_DATA: + /* When we reach this point we already know we have enough + * data available. */ + + p_out_buffer = block_New( p_dec, p_sys->i_frame_size ); + if( !p_out_buffer ) + { + //p_dec->b_error = true; + return NULL; + } + p_buf = p_out_buffer->p_buffer; + + /* Skip the ADTS/LOAS header */ + block_SkipBytes( &p_sys->bytestream, p_sys->i_header_size ); + + if( p_sys->i_type == TYPE_ADTS ) + { + /* Copy the whole frame into the buffer */ + block_GetBytes( &p_sys->bytestream, p_buf, p_sys->i_frame_size ); + } + else + { + assert( p_sys->i_type == TYPE_LOAS ); + /* Copy the whole frame into the buffer and parse/extract it */ + block_GetBytes( &p_sys->bytestream, p_buf, p_sys->i_frame_size ); + p_out_buffer->i_buffer = LOASParse( p_dec, p_buf, p_sys->i_frame_size ); + if( p_out_buffer->i_buffer <= 0 ) + { + if( !p_sys->b_latm_cfg ) + msg_Warn( p_dec, "waiting for header" ); + + block_Release( p_out_buffer ); + p_out_buffer = NULL; + p_sys->i_state = STATE_NOSYNC; + break; + } + } + SetupOutput( p_dec, p_out_buffer ); + /* 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; + + return p_out_buffer; + } + } + + return NULL; } /***************************************************************************** - * EndThread : packetizer thread destruction + * SetupBuffer: *****************************************************************************/ -static void EndThread ( packetizer_thread_t *p_pack) +static void SetupOutput( decoder_t *p_dec, block_t *p_block ) { - if( p_pack->p_sout_input ) - { - sout_InputDelete( p_pack->p_sout_input ); - } - if( p_pack->p_wf ) + decoder_sys_t *p_sys = p_dec->p_sys; + + if( p_dec->fmt_out.audio.i_rate != p_sys->i_rate ) { - free( p_pack->p_wf ); + msg_Info( p_dec, "AAC channels: %d samplerate: %d", + p_sys->i_channels, p_sys->i_rate ); + + aout_DateInit( &p_sys->end_date, p_sys->i_rate ); + aout_DateSet( &p_sys->end_date, p_sys->i_pts ); } + + 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; + +#if 0 + 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; +#endif + + 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; } +/***************************************************************************** + * ClosePacketizer: clean up the packetizer + *****************************************************************************/ +static void ClosePacketizer( vlc_object_t *p_this ) +{ + decoder_t *p_dec = (decoder_t *)p_this; + decoder_sys_t *p_sys = p_dec->p_sys; + + block_BytestreamRelease( &p_sys->bytestream ); + + free( p_dec->p_sys ); +}