/*****************************************************************************
- * mpeg4audio.c
+ * mpeg4audio.c: parse and packetize an MPEG 4 audio stream
*****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
- * $Id: mpeg4audio.c,v 1.5 2003/04/13 20:00:21 fenrir Exp $
+ * Copyright (C) 2001, 2002, 2006 the VideoLAN team
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ * 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
*
* 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 <vlc/vlc.h>
-#include <vlc/aout.h>
-#include <vlc/decoder.h>
-#include <vlc/input.h>
-#include <vlc/sout.h>
-#include "codecs.h"
#include <stdlib.h> /* malloc(), free() */
#include <string.h> /* strdup() */
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
+#include <vlc/vlc.h>
+#include <vlc_aout.h>
+#include <vlc_codec.h>
+#include <vlc_block.h>
+#include <vlc_sout.h>
+#include <vlc_codecs.h>
+
+#include "vlc_block_helper.h"
/* AAC Config in ES:
*
* ExtensionFlag 1 bit (always 0)
*/
-typedef struct packetizer_thread_s
+/*****************************************************************************
+ * decoder_sys_t : decoder descriptor
+ *****************************************************************************/
+struct decoder_sys_t
{
- /* Input properties */
- int b_adts;
+ /*
+ * Input properties
+ */
+ int i_state;
+
+ block_bytestream_t bytestream;
+
+ /*
+ * Common properties
+ */
+ audio_date_t end_date;
+ mtime_t i_pts;
+
+ int i_frame_size;
+ unsigned int i_raw_blocks;
+ unsigned int i_channels;
+ unsigned int i_rate, i_frame_length, i_header_size;
+};
- decoder_fifo_t *p_fifo;
- bit_stream_t bit_stream;
+enum {
- /* Output properties */
- sout_packetizer_input_t *p_sout_input;
- sout_format_t output_format;
+ STATE_NOSYNC,
+ STATE_SYNC,
+ STATE_HEADER,
+ STATE_NEXT_SYNC,
+ STATE_GET_DATA,
+ STATE_SEND_DATA
+};
-// mtime_t i_pts_start;
- mtime_t i_last_pts;
+static int i_sample_rates[] =
+{
+ 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050,
+ 16000, 12000, 11025, 8000, 7350, 0, 0, 0
+};
- WAVEFORMATEX *p_wf;
+#define ADTS_HEADER_SIZE 9
- /* Extracted from AAC config */
- int i_sample_rate;
- int i_frame_size; // 1024 or 960
+/****************************************************************************
+ * Local prototypes
+ ****************************************************************************/
+static int OpenPacketizer( vlc_object_t * );
+static void ClosePacketizer( vlc_object_t * );
-} packetizer_thread_t;
+static block_t *PacketizeBlock ( decoder_t *, block_t ** );
+static block_t *ADTSPacketizeBlock( decoder_t *, block_t ** );
-static int Open ( vlc_object_t * );
-static int Run ( decoder_fifo_t * );
+static uint8_t *GetOutBuffer ( decoder_t *, void ** );
-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 int ADTSSyncInfo( decoder_t *, const byte_t * p_buf,
+ unsigned int * pi_channels,
+ unsigned int * pi_sample_rate,
+ unsigned int * pi_frame_length,
+ unsigned int * pi_header_size,
+ unsigned int * pi_raw_blocks );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-
vlc_module_begin();
- set_description( _("MPEG4 Audio packetizer") );
+ set_category( CAT_SOUT );
+ set_subcategory( SUBCAT_SOUT_PACKETIZER );
+ set_description( _("MPEG4 audio packetizer") );
set_capability( "packetizer", 50 );
- set_callbacks( Open, NULL );
+ 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;
- p_fifo->pf_run = Run;
-
- if( p_fifo->i_fourcc == VLC_FOURCC( 'm', 'p', '4', 'a') )
+ if( p_dec->fmt_in.i_codec != VLC_FOURCC( 'm', 'p', '4', 'a' ) )
{
- return( VLC_SUCCESS );
+ return VLC_EGENERIC;
}
- else
+
+ /* 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_EGENERIC );
+ msg_Err( p_dec, "out of memory" );
+ return VLC_EGENERIC;
}
-}
-/*****************************************************************************
- * RunDecoder: this function is called just after the thread is created
- *****************************************************************************/
-static int Run( decoder_fifo_t *p_fifo )
-{
- packetizer_thread_t *p_pack;
- int b_error;
+ /* Misc init */
+ p_sys->i_state = STATE_NOSYNC;
+ aout_DateSet( &p_sys->end_date, 0 );
+ p_sys->bytestream = block_BytestreamInit( p_dec );
- msg_Info( p_fifo, "Running MPEG4 audio packetizer" );
- if( !( p_pack = malloc( sizeof( packetizer_thread_t ) ) ) )
- {
- msg_Err( p_fifo, "out of memory" );
- DecoderError( p_fifo );
- return( -1 );
- }
- memset( p_pack, 0, sizeof( packetizer_thread_t ) );
+ /* Set output properties */
+ p_dec->fmt_out.i_cat = AUDIO_ES;
+ p_dec->fmt_out.i_codec = VLC_FOURCC('m','p','4','a');
- p_pack->p_fifo = p_fifo;
+ /* Set callback */
+ p_dec->pf_packetize = PacketizeBlock;
- if( InitThread( p_pack ) != 0 )
- {
- DecoderError( p_fifo );
- return( -1 );
- }
+ msg_Dbg( p_dec, "running MPEG4 audio packetizer" );
- while( ( !p_pack->p_fifo->b_die )&&( !p_pack->p_fifo->b_error ) )
+ if( p_dec->fmt_in.i_extra > 0 )
{
- if( p_pack->b_adts )
+ 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 )
{
- PacketizeThreadADTS( p_pack );
+ p_dec->fmt_out.audio.i_rate = i_sample_rates[i_index];
+ p_dec->fmt_out.audio.i_frame_length =
+ (( p_config[1] >> 2 ) & 0x01) ? 960 : 1024;
}
else
{
- PacketizeThreadMPEG4( p_pack );
+ 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;
}
- }
+ msg_Dbg( p_dec, "AAC %dHz %d samples/frame",
+ p_dec->fmt_out.audio.i_rate,
+ p_dec->fmt_out.audio.i_frame_length );
- if( ( b_error = p_pack->p_fifo->b_error ) )
- {
- DecoderError( p_pack->p_fifo );
- }
+ aout_DateInit( &p_sys->end_date, p_dec->fmt_out.audio.i_rate );
- EndThread( p_pack );
- if( b_error )
+ p_dec->fmt_out.audio.i_channels = p_dec->fmt_in.audio.i_channels;
+ 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 );
+ memcpy( p_dec->fmt_out.p_extra, p_dec->fmt_in.p_extra,
+ p_dec->fmt_in.i_extra );
+ }
+ else
{
- return( -1 );
+ msg_Dbg( p_dec, "no decoder specific info, must be an ADTS stream" );
+
+ /* We will try to create a AAC Config from adts */
+ p_dec->fmt_out.i_extra = 0;
+ p_dec->fmt_out.p_extra = NULL;
+ p_dec->pf_packetize = ADTSPacketizeBlock;
}
- return( 0 );
+ return VLC_SUCCESS;
}
-
-#define FREE( p ) if( p ) free( p ); p = NULL
-
-/*****************************************************************************
- * InitThread: initialize data before entering main loop
- *****************************************************************************/
-static int i_sample_rates[] =
+/****************************************************************************
+ * PacketizeBlock: the whole thing
+ ****************************************************************************
+ * This function must be fed with complete frames.
+ ****************************************************************************/
+static block_t *PacketizeBlock( decoder_t *p_dec, block_t **pp_block )
{
- 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050,
- 16000, 12000, 11025, 8000, 7350, 0, 0, 0
-};
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ block_t *p_block;
-static int InitThread( packetizer_thread_t *p_pack )
-{
- WAVEFORMATEX *p_wf;
+ if( !pp_block || !*pp_block ) return NULL;
- p_wf = (WAVEFORMATEX*)p_pack->p_fifo->p_waveformatex;
+ p_block = *pp_block;
+ *pp_block = NULL; /* Don't reuse this block */
- if( p_wf && p_wf->cbSize > 0)
+ if( !aout_DateGet( &p_sys->end_date ) && !p_block->i_pts )
{
- uint8_t *p_config = (uint8_t*)&p_wf[1];
- int i_index;
-
- p_pack->b_adts = 0;
-
- i_index = ( ( p_config[0] << 1 ) | ( p_config[1] >> 7 ) )&0x0f;
- if( i_index != 0x0f )
- {
- p_pack->i_sample_rate = i_sample_rates[i_index];
- p_pack->i_frame_size = ( ( p_config[1] >> 2 )&0x01 ) ? 960 : 1024;
- }
- else
- {
- 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;
- }
- msg_Dbg( p_pack->p_fifo,
- "aac %dHz %d samples/frame",
- p_pack->i_sample_rate,
- p_pack->i_frame_size );
-
- p_pack->output_format.i_cat = AUDIO_ES;
- p_pack->output_format.i_fourcc = VLC_FOURCC( 'm', 'p', '4', 'a' );
- p_pack->output_format.i_sample_rate = p_pack->i_sample_rate;
- p_pack->output_format.i_channels = p_wf->nChannels;
- p_pack->output_format.i_block_align = 0;
- p_pack->output_format.i_bitrate = 0;
-
- p_pack->output_format.i_extra_data = p_wf->cbSize;
- p_pack->output_format.p_extra_data = malloc( p_wf->cbSize );
- memcpy( p_pack->output_format.p_extra_data,
- &p_wf[1],
- p_wf->cbSize );
+ /* We've just started the stream, wait for the first PTS. */
+ block_Release( p_block );
+ return NULL;
}
- else
+ else if( p_block->i_pts != 0 &&
+ p_block->i_pts != aout_DateGet( &p_sys->end_date ) )
{
- /* 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 )
- {
- msg_Err( p_pack->p_fifo, "cannot initialize bitstream" );
- return -1;
- }
-
+ aout_DateSet( &p_sys->end_date, p_block->i_pts );
}
- p_pack->p_sout_input =
- sout_InputNew( p_pack->p_fifo,
- &p_pack->output_format );
+ p_block->i_pts = p_block->i_dts = aout_DateGet( &p_sys->end_date );
- if( !p_pack->p_sout_input )
- {
- msg_Err( p_pack->p_fifo,
- "cannot add a new stream" );
- return( -1 );
- }
+ p_block->i_length = aout_DateIncrement( &p_sys->end_date,
+ p_dec->fmt_out.audio.i_frame_length ) - p_block->i_pts;
- p_pack->i_last_pts = 0;
- return( 0 );
+ return p_block;
}
-/*****************************************************************************
- * PacketizeThread: packetize an unit (here copy a complete pes)
- *****************************************************************************/
-static void PacketizeThreadMPEG4( packetizer_thread_t *p_pack )
+/****************************************************************************
+ * DTSPacketizeBlock: the whole thing
+ ****************************************************************************/
+static block_t *ADTSPacketizeBlock( decoder_t *p_dec, block_t **pp_block )
{
- sout_buffer_t *p_sout_buffer;
- pes_packet_t *p_pes;
- ssize_t i_size;
- mtime_t i_pts;
-
- /* **** get samples count **** */
- input_ExtractPES( p_pack->p_fifo, &p_pes );
- if( !p_pes )
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ uint8_t p_header[ADTS_HEADER_SIZE];
+ void *p_out_buffer;
+ uint8_t *p_buf;
+
+ if( !pp_block || !*pp_block ) return NULL;
+
+ if( !aout_DateGet( &p_sys->end_date ) && !(*pp_block)->i_pts )
{
- p_pack->p_fifo->b_error = 1;
- return;
+ /* We've just started the stream, wait for the first PTS. */
+ block_Release( *pp_block );
+ return NULL;
}
-#if 0
- if( p_pack->i_pts_start < 0 && p_pes->i_pts > 0 )
+
+ if( (*pp_block)->i_flags&BLOCK_FLAG_DISCONTINUITY )
{
- p_pack->i_pts_start = p_pes->i_pts;
+ p_sys->i_state = STATE_NOSYNC;
}
- p_pack->i_pts = p_pes->i_pts - p_pack->i_pts_start;
-#endif
- i_pts = p_pes->i_pts;
+ block_BytestreamPush( &p_sys->bytestream, *pp_block );
- if( i_pts <= 0 && p_pack->i_last_pts <= 0 )
+ while( 1 )
{
- msg_Dbg( p_pack->p_fifo, "need a starting pts" );
- input_DeletePES( p_pack->p_fifo->p_packets_mgt, p_pes );
- return;
- }
- i_size = p_pes->i_pes_size;
+ switch( p_sys->i_state )
+ {
- if( i_size > 0 )
- {
- data_packet_t *p_data;
- ssize_t i_buffer;
+ case STATE_NOSYNC:
+ while( block_PeekBytes( &p_sys->bytestream, p_header, 2 )
+ == VLC_SUCCESS )
+ {
+ /* Look for sync word - should be 0xfff + 2 layer bits */
+ if( p_header[0] == 0xff && (p_header[1] & 0xf6) == 0xf0 )
+ {
+ p_sys->i_state = STATE_SYNC;
+ break;
+ }
+ block_SkipByte( &p_sys->bytestream );
+ }
+ if( p_sys->i_state != STATE_SYNC )
+ {
+ block_BytestreamFlush( &p_sys->bytestream );
- p_sout_buffer =
- sout_BufferNew( p_pack->p_sout_input->p_sout, i_size );
- if( !p_sout_buffer )
- {
- p_pack->p_fifo->b_error = 1;
- input_DeletePES( p_pack->p_fifo->p_packets_mgt, p_pes );
- return;
- }
- /* 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)
- {
- size_t i_copy;
+ /* Need more data */
+ return NULL;
+ }
- i_copy = __MIN( p_data->p_payload_end - p_data->p_payload_start,
- i_size - i_buffer );
- if( i_copy > 0 )
+ 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 ) )
{
- p_pack->p_fifo->p_vlc->pf_memcpy( p_sout_buffer->p_buffer + i_buffer,
- p_data->p_payload_start,
- i_copy );
+ aout_DateSet( &p_sys->end_date, p_sys->i_pts );
}
- i_buffer += i_copy;
- }
+ p_sys->i_state = STATE_HEADER;
+ break;
- if( i_pts <= 0 )
- {
- i_pts = p_pack->i_last_pts +
- (mtime_t)1000000 *
- (mtime_t)p_pack->i_frame_size /
- (mtime_t)p_pack->i_sample_rate;
- }
- p_pack->i_last_pts = i_pts;
+ case STATE_HEADER:
+ /* 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;
+ }
- 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 = i_pts;
- p_sout_buffer->i_pts = i_pts;
+ /* 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,
+ &p_sys->i_raw_blocks );
+ 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 */
+
+ /* 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;
+ }
+
+ if( p_header[0] != 0xff || (p_header[1] & 0xf6) != 0xf0 )
+ {
+ 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:
+ if( !(p_buf = GetOutBuffer( p_dec, &p_out_buffer )) )
+ {
+ //p_dec->b_error = VLC_TRUE;
+ return NULL;
+ }
- sout_InputSendBuffer( p_pack->p_sout_input,
- p_sout_buffer );
+ /* When we reach this point we already know we have enough
+ * data available. */
+
+ /* Skip the ADTS header */
+ block_SkipBytes( &p_sys->bytestream, p_sys->i_header_size );
+
+ /* Copy the whole frame into the buffer */
+ 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;
+
+ return p_out_buffer;
+ }
}
- input_DeletePES( p_pack->p_fifo->p_packets_mgt, p_pes );
+ return NULL;
}
+/*****************************************************************************
+ * GetOutBuffer:
+ *****************************************************************************/
+static uint8_t *GetOutBuffer( decoder_t *p_dec, void **pp_out_buffer )
+{
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ block_t *p_block;
+
+ if( p_dec->fmt_out.audio.i_rate != p_sys->i_rate )
+ {
+ 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 = 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 );
-static void PacketizeThreadADTS( packetizer_thread_t *p_pack )
+ p_block->i_length = aout_DateIncrement( &p_sys->end_date,
+ p_sys->i_frame_length ) - p_block->i_pts;
+
+ *pp_out_buffer = p_block;
+ return p_block->p_buffer;
+}
+
+/*****************************************************************************
+ * ClosePacketizer: clean up the packetizer
+ *****************************************************************************/
+static void ClosePacketizer( vlc_object_t *p_this )
{
- msg_Err( p_pack->p_fifo, "adts stream unsupported" );
- p_pack->p_fifo->b_error = 1;
+ 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 );
}
/*****************************************************************************
- * EndThread : packetizer thread destruction
+ * ADTSSyncInfo: parse MPEG 4 audio ADTS sync info
*****************************************************************************/
-static void EndThread ( packetizer_thread_t *p_pack)
+static int ADTSSyncInfo( decoder_t * p_dec, const byte_t * p_buf,
+ unsigned int * pi_channels,
+ unsigned int * pi_sample_rate,
+ unsigned int * pi_frame_length,
+ unsigned int * pi_header_size,
+ unsigned int * pi_raw_blocks_in_frame )
{
- if( p_pack->p_sout_input )
+ int i_id, i_profile, i_sample_rate_idx, i_frame_size;
+ vlc_bool_t b_crc;
+
+ /* Fixed header between frames */
+ i_id = ( (p_buf[1] >> 3) & 0x01 ) ? 2 : 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 = i_sample_rates[i_sample_rate_idx];
+ *pi_channels = ((p_buf[2] & 0x01) << 2) | ((p_buf[3] >> 6) & 0x03);
+
+ /* Variable header */
+ i_frame_size = ((p_buf[3] & 0x03) << 11) | (p_buf[4] << 3) |
+ ((p_buf[5] >> 5) & 0x7);
+ *pi_raw_blocks_in_frame = (p_buf[6] & 0x02) + 1;
+
+ if( !*pi_sample_rate || !*pi_channels || !i_frame_size )
{
- sout_InputDelete( p_pack->p_sout_input );
+ return 0;
}
- if( p_pack->p_wf )
+
+ /* Fixme */
+ *pi_frame_length = 1024;
+
+ /* Build the decoder specific info header */
+ if( !p_dec->fmt_out.i_extra )
{
- free( p_pack->p_wf );
+ p_dec->fmt_out.i_extra = 2;
+ p_dec->fmt_out.p_extra = malloc( 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);
}
-}
+ /* ADTS header length */
+ *pi_header_size = b_crc ? 9 : 7;
+
+ return i_frame_size - *pi_header_size;
+}
projects / vlc / blobdiff