Skip to content

V
vlc
Commit d3daf21f authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options 

* modules/packetizer/mpegaudio.c: updated mpegaudio to the new decoder api.
* modules/packetizer/mpegaudio.c: moved the packetizer with the decoder (they share most of their code).
parent 12336778
Hide whitespace changes
Inline Side-by-side
Showing with 504 additions and 660 deletions
modules/codec/mpeg_audio.c
View file @ d3daf21f
......@@ -2,11 +2,12 @@
* mpeg_audio.c: parse MPEG audio sync info and packetize the stream
*****************************************************************************
* Copyright (C) 2001-2003 VideoLAN
* $Id: mpeg_audio.c,v 1.17 2003/09/02 20:19:25 gbazin Exp $
* $Id: mpeg_audio.c,v 1.18 2003/10/04 12:04:06 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
* Christophe Massiot <massiot@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
......@@ -30,32 +31,67 @@
#include <string.h> /* strdup() */
#include <vlc/vlc.h>
#include <vlc/aout.h>
#include <vlc/decoder.h>
#include <vlc/input.h>
#include <vlc/aout.h>
#include <vlc/sout.h>
#include "vlc_block_helper.h"
/*****************************************************************************
* dec_thread_t : decoder thread descriptor
* decoder_sys_t : decoder descriptor
*****************************************************************************/
typedef struct dec_thread_t
struct decoder_sys_t
{
/* Module mode */
vlc_bool_t b_packetizer;
/*
* Thread properties
* Input properties
*/
vlc_thread_t thread_id; /* id for thread functions */
int i_state;
block_t *p_chain;
block_bytestream_t bytestream;
/*
* Input properties
* Decoder output properties
*/
decoder_fifo_t * p_fifo; /* stores the PES stream data */
bit_stream_t bit_stream;
aout_instance_t * p_aout; /* opaque */
aout_input_t * p_aout_input; /* opaque */
audio_sample_format_t aout_format;
aout_buffer_t * p_aout_buffer; /* current aout buffer being filled */
/*
* Output properties
* Packetizer output properties
*/
aout_instance_t * p_aout; /* opaque */
aout_input_t * p_aout_input; /* opaque */
audio_sample_format_t output_format;
} dec_thread_t;
sout_packetizer_input_t *p_sout_input;
sout_format_t sout_format;
sout_buffer_t * p_sout_buffer; /* current sout buffer */
/*
* Common properties
*/
uint8_t *p_out_buffer; /* output buffer */
audio_date_t end_date;
unsigned int i_current_layer;
mtime_t pts;
int i_frame_size, i_free_frame_size;
unsigned int i_channels_conf, i_channels;
unsigned int i_rate, i_max_frame_size, i_frame_length;
unsigned int i_layer, i_bit_rate;
};
enum {
STATE_NOSYNC,
STATE_SYNC,
STATE_HEADER,
STATE_NEXT_SYNC,
STATE_DATA
};
#define MAX_FRAME_SIZE 10000
/* This isn't the place to put mad-specific stuff. However, it makes the
......@@ -64,15 +100,22 @@ typedef struct dec_thread_t
* bigger buffer. This has no implication on other plug-ins, and we only
* lose 8 bytes per frame. --Meuuh */
#define MAD_BUFFER_GUARD 8
#define MPGA_HEADER_SIZE 4
/****************************************************************************
* Local prototypes
****************************************************************************/
static int Open ( vlc_object_t * );
static int RunDecoder ( decoder_fifo_t * );
static int OpenDecoder ( vlc_object_t * );
static int OpenPacketizer( vlc_object_t * );
static void EndThread ( dec_thread_t * );
static int InitDecoder ( decoder_t * );
static int RunDecoder ( decoder_t *, block_t * );
static int EndDecoder ( decoder_t * );
static int GetOutBuffer ( decoder_t *, uint8_t ** );
static int GetAoutBuffer( decoder_t *, aout_buffer_t ** );
static int GetSoutBuffer( decoder_t *, sout_buffer_t ** );
static int SendOutBuffer( decoder_t * );
static int SyncInfo( uint32_t i_header, unsigned int * pi_channels,
unsigned int * pi_sample_rate, unsigned int * pi_bit_rate,
......@@ -86,13 +129,18 @@ static int SyncInfo( uint32_t i_header, unsigned int * pi_channels,
vlc_module_begin();
set_description( _("MPEG audio layer I/II/III parser") );
set_capability( "decoder", 100 );
set_callbacks( Open, NULL );
set_callbacks( OpenDecoder, NULL );
add_submodule();
set_description( _("MPEG audio layer I/II/III packetizer") );
set_capability( "packetizer", 10 );
set_callbacks( OpenPacketizer, NULL );
vlc_module_end();
/*****************************************************************************
* OpenDecoder: probe the decoder and return score
*****************************************************************************/
static int Open( vlc_object_t *p_this )
static int OpenDecoder( vlc_object_t *p_this )
{
decoder_t *p_dec = (decoder_t*)p_this;
......@@ -101,328 +149,506 @@ static int Open( vlc_object_t *p_this )
return VLC_EGENERIC;
}
p_dec->pf_run = RunDecoder;
p_dec->pf_init = InitDecoder;
p_dec->pf_decode = RunDecoder;
p_dec->pf_end = EndDecoder;
/* Allocate the memory needed to store the decoder's structure */
if( ( p_dec->p_sys =
(decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL )
{
msg_Err( p_dec, "out of memory" );
return VLC_EGENERIC;
}
p_dec->p_sys->b_packetizer = VLC_FALSE;
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: this function is called just after the thread is created
* InitDecoder: Initalize the decoder
*****************************************************************************/
static int RunDecoder( decoder_fifo_t *p_fifo )
static int InitDecoder( decoder_t *p_dec )
{
dec_thread_t * p_dec;
audio_date_t end_date;
unsigned int i_layer = 0;
byte_t p_sync[MAD_BUFFER_GUARD];
mtime_t pts;
int i_free_frame_size = 0;
p_dec->p_sys->i_state = STATE_NOSYNC;
/* Allocate the memory needed to store the thread's structure */
p_dec = malloc( sizeof(dec_thread_t) );
if( p_dec == NULL )
{
msg_Err( p_fifo, "out of memory" );
DecoderError( p_fifo );
return -1;
}
p_dec->p_sys->p_out_buffer = NULL;
aout_DateSet( &p_dec->p_sys->end_date, 0 );
/* Initialize the thread properties */
p_dec->p_aout = NULL;
p_dec->p_aout_input = NULL;
p_dec->p_fifo = p_fifo;
p_dec->p_sys->p_aout = NULL;
p_dec->p_sys->p_aout_input = NULL;
p_dec->p_sys->p_aout_buffer = NULL;
p_dec->p_sys->aout_format.i_format = VLC_FOURCC('m','p','g','a');
p_dec->p_sys->p_sout_input = NULL;
p_dec->p_sys->p_sout_buffer = NULL;
p_dec->p_sys->sout_format.i_cat = AUDIO_ES;
p_dec->p_sys->sout_format.i_fourcc = VLC_FOURCC('m','p','g','a');
/* Start with the inimum size for a free bitrate frame */
p_dec->p_sys->i_free_frame_size = MPGA_HEADER_SIZE;
p_dec->p_sys->p_chain = NULL;
return VLC_SUCCESS;
}
aout_DateSet( &end_date, 0 );
/****************************************************************************
* RunDecoder: the whole thing
****************************************************************************
* This function is called just after the thread is launched.
****************************************************************************/
static int RunDecoder( decoder_t *p_dec, block_t *p_block )
{
decoder_sys_t *p_sys = p_dec->p_sys;
uint8_t p_header[MAD_BUFFER_GUARD];
uint32_t i_header;
/* Init the bitstream */
if( InitBitstream( &p_dec->bit_stream, p_dec->p_fifo,
NULL, NULL ) != VLC_SUCCESS )
if( !aout_DateGet( &p_sys->end_date ) && !p_block->i_pts )
{
msg_Err( p_fifo, "cannot initialize bitstream" );
DecoderError( p_fifo );
free( p_dec );
return -1;
/* We've just started the stream, wait for the first PTS. */
block_Release( p_block );
return VLC_SUCCESS;
}
/* Init sync buffer. */
NextPTS( &p_dec->bit_stream, &pts, NULL );
GetChunk( &p_dec->bit_stream, p_sync, MAD_BUFFER_GUARD );
if( p_sys->p_chain )
{
block_ChainAppend( &p_sys->p_chain, p_block );
}
else
{
block_ChainAppend( &p_sys->p_chain, p_block );
p_sys->bytestream = block_BytestreamInit( p_dec, p_sys->p_chain, 0 );
}
/* Decoder thread's main loop */
while ( !p_dec->p_fifo->b_die && !p_dec->p_fifo->b_error )
while( 1 )
{
int i_current_frame_size;
unsigned int i_rate, i_original_channels, i_frame_size, i_frame_length;
unsigned int i_new_layer, i_bit_rate;
uint32_t i_header;
aout_buffer_t * p_buffer;
int i;
/* Look for sync word - should be 0xffe */
if ( (p_sync[0] != 0xff) || ((p_sync[1] & 0xe0) != 0xe0) )
switch( p_sys->i_state )
{
msg_Warn( p_dec->p_fifo, "no sync - skipping" );
/* Look inside the sync buffer. */
for ( i = 1; i < MAD_BUFFER_GUARD - 1; i++ )
case STATE_NOSYNC:
while( block_PeekBytes( &p_sys->bytestream, p_header, 2 )
== VLC_SUCCESS )
{
if ( (p_sync[i] == 0xff) && ((p_sync[i + 1] & 0xe0) == 0xe0) )
/* Look for sync word - should be 0xffe */
if( p_header[0] == 0xff && (p_header[1] & 0xe0) == 0xe0 )
{
p_sys->i_state = STATE_SYNC;
break;
}
block_SkipByte( &p_sys->bytestream );
}
if( p_sys->i_state != STATE_SYNC )
{
block_ChainRelease( p_sys->p_chain );
p_sys->p_chain = NULL;
/* Need more data */
return VLC_SUCCESS;
}
if ( i < MAD_BUFFER_GUARD - 1 )
case STATE_SYNC:
/* New frame, set the Presentation Time Stamp */
p_sys->pts = p_sys->bytestream.p_block->i_pts;
if( p_sys->pts != 0 &&
p_sys->pts != aout_DateGet( &p_sys->end_date ) )
{
/* Found it ! */
memmove( p_sync, &p_sync[i], MAD_BUFFER_GUARD - i );
GetChunk( &p_dec->bit_stream, &p_sync[MAD_BUFFER_GUARD - i],
i );
aout_DateSet( &p_sys->end_date, p_sys->pts );
}
else
p_sys->i_state = STATE_HEADER;
break;
case STATE_HEADER:
/* Get MPGA frame header (MPGA_HEADER_SIZE bytes) */
if( block_PeekBytes( &p_sys->bytestream, p_header,
MPGA_HEADER_SIZE ) != VLC_SUCCESS )
{
if ( p_sync[MAD_BUFFER_GUARD - 1] == 0xff
&& ShowBits( &p_dec->bit_stream, 3 ) == 0x3 )
{
/* Found it ! */
p_sync[0] = p_sync[MAD_BUFFER_GUARD - 1];
GetChunk( &p_dec->bit_stream,
&p_sync[1], MAD_BUFFER_GUARD - 1 );
}
else
/* Need more data */
return VLC_SUCCESS;
}
/* Build frame header */
i_header = (p_header[0]<<24)|(p_header[1]<<16)|(p_header[2]<<8)
|p_header[3];
/* Check if frame is valid and get frame info */
p_sys->i_frame_size = SyncInfo( i_header,
&p_sys->i_channels_conf,
&p_sys->i_rate,
&p_sys->i_bit_rate,
&p_sys->i_frame_length,
&p_sys->i_frame_size,
&p_sys->i_layer );
if( p_sys->i_frame_size == -1 )
{
msg_Dbg( p_dec, "emulated start code" );
block_SkipByte( &p_sys->bytestream );
p_sys->i_state = STATE_NOSYNC;
break;
}
if( p_sys->i_bit_rate == 0 )
{
/* Free birate, but 99% emulated startcode :( */
if( p_dec->p_sys->i_free_frame_size == MPGA_HEADER_SIZE )
{
/* Scan the stream. */
while ( ShowBits( &p_dec->bit_stream, 11 ) != 0x07ff &&
(!p_dec->p_fifo->b_die) &&
(!p_dec->p_fifo->b_error) )
{
RemoveBits( &p_dec->bit_stream, 8 );
}
if ( p_dec->p_fifo->b_die || p_dec->p_fifo->b_error )
break;
NextPTS( &p_dec->bit_stream, &pts, NULL );
GetChunk( &p_dec->bit_stream,p_sync, MAD_BUFFER_GUARD );
msg_Dbg( p_dec, "free bitrate mode");
}
p_sys->i_frame_size = p_sys->i_free_frame_size;
}
}
if ( p_dec->p_fifo->b_die || p_dec->p_fifo->b_error ) break;
/* Set the Presentation Time Stamp */
if ( pts != 0 && pts != aout_DateGet( &end_date ) )
{
aout_DateSet( &end_date, pts );
}
p_sys->i_state = STATE_NEXT_SYNC;
/* Get frame header */
i_header = (p_sync[0] << 24) | (p_sync[1] << 16) | (p_sync[2] << 8)
| p_sync[3];
case STATE_NEXT_SYNC:
/* TODO: If p_block == NULL, flush the buffer without checking the
* next sync word */
/* Check if frame is valid and get frame info */
i_current_frame_size = SyncInfo( i_header,
&i_original_channels, &i_rate,
&i_bit_rate, &i_frame_length,
&i_frame_size, &i_new_layer );
if( i_current_frame_size == -1 )
{
msg_Warn( p_dec->p_fifo, "syncinfo failed" );
/* This is probably an emulated startcode, drop the first byte
* to force looking for the next startcode. */
memmove( p_sync, &p_sync[1], MAD_BUFFER_GUARD - 1 );
p_sync[MAD_BUFFER_GUARD - 1] = GetBits( &p_dec->bit_stream, 8 );
continue;
}
/* Check if next expected frame contains the sync word */
if( block_PeekOffsetBytes( &p_sys->bytestream,
p_sys->i_frame_size, p_header,
MAD_BUFFER_GUARD ) != VLC_SUCCESS )
{
/* Need more data */
return VLC_SUCCESS;
}
if( i_bit_rate == 0 )
{
/* free birate, but 99% emulated startcode :( */
i_current_frame_size = i_free_frame_size;
}
if( p_header[0] == 0xff && (p_header[1] & 0xe0) == 0xe0 )
{
/* Startcode is fine, let's try the header as an extra check */
int i_next_frame_size;
unsigned int i_next_channels, i_next_rate, i_next_bit_rate;
unsigned int i_next_frame_length, i_next_max_frame_size;
unsigned int i_next_layer;
if ( (unsigned int)i_current_frame_size > i_frame_size )
{
msg_Warn( p_dec->p_fifo, "frame too big %d > %d",
i_current_frame_size, i_frame_size );
memmove( p_sync, &p_sync[1], MAD_BUFFER_GUARD - 1 );
p_sync[MAD_BUFFER_GUARD - 1] = GetBits( &p_dec->bit_stream, 8 );
continue;
}
/* Build frame header */
i_header = (p_header[0]<<24)|(p_header[1]<<16)|(p_header[2]<<8)
|p_header[3];
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 + MAD_BUFFER_GUARD)
|| (p_dec->output_format.i_frame_length != i_frame_length)
|| (i_layer != i_new_layer) ) )
{
/* Parameters changed - this should not happen. */
aout_DecDelete( p_dec->p_aout, p_dec->p_aout_input );
p_dec->p_aout_input = NULL;
}
i_next_frame_size = SyncInfo( i_header,
&i_next_channels,
&i_next_rate,
&i_next_bit_rate,
&i_next_frame_length,
&i_next_max_frame_size,
&i_next_layer );
/* Creating the audio input if not created yet. */
if( p_dec->p_aout_input == NULL )
{
i_layer = i_new_layer;
if ( i_layer == 3 )
{
p_dec->output_format.i_format = VLC_FOURCC('m','p','g','3');
if( i_next_frame_size == -1 )
{
msg_Dbg( p_dec, "emulated start code on next frame" );
block_SkipByte( &p_sys->bytestream );
p_sys->i_state = STATE_NOSYNC;
break;
}
/* Free bitrate only */
if( p_sys->i_bit_rate == 0 )
{
if( i_next_bit_rate != 0 )
{
p_sys->i_frame_size++;
break;
}
if( (unsigned int)p_sys->i_frame_size >
p_sys->i_max_frame_size )
{
msg_Dbg( p_dec, "frame too big %d > %d "
"(emulated startcode ?)", p_sys->i_frame_size,
p_sys->i_max_frame_size );
block_SkipByte( &p_sys->bytestream );
p_sys->i_state = STATE_NOSYNC;
p_sys->i_free_frame_size = MPGA_HEADER_SIZE;
break;
}
}
/* Check info is in sync with previous one */
if( i_next_channels != p_sys->i_channels_conf ||
i_next_rate != p_sys->i_rate ||
i_next_layer != p_sys->i_layer ||
i_next_frame_length != p_sys->i_frame_length )
{
/* Free bitrate only */
if( p_sys->i_bit_rate == 0 )
{
p_sys->i_frame_size++;
break;
}
msg_Dbg( p_dec, "parameters changed unexpectedly "
"(emulated startcode ?)" );
block_SkipByte( &p_sys->bytestream );
p_sys->i_state = STATE_NOSYNC;
break;
}
}
else
{
p_dec->output_format.i_format = VLC_FOURCC('m','p','g','a');
msg_Dbg( p_dec, "emulated startcode "
"(no startcode on following frame)" );
p_sys->i_state = STATE_NOSYNC;
block_SkipByte( &p_sys->bytestream );
break;
}
if( GetOutBuffer( p_dec, &p_sys->p_out_buffer ) != VLC_SUCCESS )
{
return VLC_EGENERIC;
}
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
+ MAD_BUFFER_GUARD;
p_dec->output_format.i_frame_length = i_frame_length;
aout_DateInit( &end_date, i_rate );
aout_DateSet( &end_date, 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 )
/* Free bitrate only */
if( p_sys->i_bit_rate == 0 )
{
p_dec->p_fifo->b_error = 1;
break;
p_sys->i_free_frame_size = p_sys->i_frame_size;
}
}
if ( !aout_DateGet( &end_date ) )
{
byte_t p_junk[MAX_FRAME_SIZE];
int i_skip = i_current_frame_size - MAD_BUFFER_GUARD;
p_sys->i_state = STATE_DATA;
/* We've just started the stream, wait for the first PTS. */
while( i_skip > 0 )
case STATE_DATA:
/* Copy the whole frame into the buffer */
if( block_GetBytes( &p_sys->bytestream, p_sys->p_out_buffer,
p_sys->i_frame_size ) != VLC_SUCCESS )
{
int i_read;
/* Need more data */
return VLC_SUCCESS;
}
i_read = __MIN( i_current_frame_size - MAD_BUFFER_GUARD, MAX_FRAME_SIZE );
GetChunk( &p_dec->bit_stream, p_junk, i_read );
p_sys->p_chain = block_BytestreamFlush( &p_sys->bytestream );
i_skip -= i_read;
/* Get beginning of next frame for libmad */
if( !p_sys->b_packetizer )
{
memcpy( p_sys->p_out_buffer + p_sys->i_frame_size,
p_header, MAD_BUFFER_GUARD );
}
NextPTS( &p_dec->bit_stream, &pts, NULL );
GetChunk( &p_dec->bit_stream, p_sync, MAD_BUFFER_GUARD );
continue;
}
p_buffer = aout_DecNewBuffer( p_dec->p_aout, p_dec->p_aout_input,
i_frame_length );
if ( p_buffer == NULL )
{
p_dec->p_fifo->b_error = 1;
break;
SendOutBuffer( p_dec );
p_sys->i_state = STATE_NOSYNC;
/* Make sure we don't reuse the same pts twice */
if( p_sys->pts == p_sys->bytestream.p_block->i_pts )
p_sys->pts = p_sys->bytestream.p_block->i_pts = 0;
}
p_buffer->start_date = aout_DateGet( &end_date );
p_buffer->end_date = aout_DateIncrement( &end_date,
i_frame_length );
}
/* Get the whole frame. */
memcpy( p_buffer->p_buffer, p_sync, MAD_BUFFER_GUARD );
if ( i_current_frame_size )
return VLC_SUCCESS;
}
/*****************************************************************************
* GetOutBuffer:
*****************************************************************************/
static int GetOutBuffer( decoder_t *p_dec, uint8_t **pp_out_buffer )
{
decoder_sys_t *p_sys = p_dec->p_sys;
int i_ret;
if( p_sys->b_packetizer )
{
i_ret = GetSoutBuffer( p_dec, &p_sys->p_sout_buffer );
*pp_out_buffer =
p_sys->p_sout_buffer ? p_sys->p_sout_buffer->p_buffer : NULL;
}
else
{
i_ret = GetAoutBuffer( p_dec, &p_sys->p_aout_buffer );
*pp_out_buffer =
p_sys->p_aout_buffer ? p_sys->p_aout_buffer->p_buffer : NULL;
}
return i_ret;
}
/*****************************************************************************
* GetAoutBuffer:
*****************************************************************************/
static int GetAoutBuffer( decoder_t *p_dec, aout_buffer_t **pp_buffer )
{
decoder_sys_t *p_sys = p_dec->p_sys;
if( p_sys->p_aout_input != NULL &&
( p_sys->aout_format.i_rate != p_sys->i_rate
|| p_sys->aout_format.i_original_channels != p_sys->i_channels_conf
|| (int)p_sys->aout_format.i_bytes_per_frame !=
p_sys->i_max_frame_size + MAD_BUFFER_GUARD
|| p_sys->aout_format.i_frame_length != p_sys->i_frame_length
|| p_sys->i_current_layer != p_sys->i_layer ) )
{
/* Parameters changed - this should not happen. */
aout_DecDelete( p_sys->p_aout, p_sys->p_aout_input );
p_sys->p_aout_input = NULL;
}
/* Creating the audio input if not created yet. */
if( p_sys->p_aout_input == NULL )
{
p_sys->i_current_layer = p_sys->i_layer;
if( p_sys->i_layer == 3 )
{
GetChunk( &p_dec->bit_stream, p_buffer->p_buffer + MAD_BUFFER_GUARD,
i_current_frame_size - MAD_BUFFER_GUARD );
p_sys->aout_format.i_format = VLC_FOURCC('m','p','g','3');
}
else
{
/* Free bit-rate stream. Peek at next frame header. */
i = MAD_BUFFER_GUARD;
for ( ; ; )
{
int i_next_real_frame_size;
unsigned int i_next_channels, i_next_rate, i_next_bit_rate;
unsigned int i_next_frame_length, i_next_frame_size;
unsigned int i_next_layer;
while ( ShowBits( &p_dec->bit_stream, 11 ) != 0x07ff &&
(!p_dec->p_fifo->b_die) &&
(!p_dec->p_fifo->b_error) &&
i < (int)i_frame_size + MAD_BUFFER_GUARD )
{
((uint8_t *)p_buffer->p_buffer)[i++] =
GetBits( &p_dec->bit_stream, 8 );
}
if ( p_dec->p_fifo->b_die || p_dec->p_fifo->b_error
|| i == (int)i_frame_size + MAD_BUFFER_GUARD )
break;
i_header = ShowBits( &p_dec->bit_stream, 8 );
i_next_real_frame_size = SyncInfo( i_header,
&i_next_channels, &i_next_rate,
&i_next_bit_rate, &i_next_frame_length,
&i_next_frame_size, &i_next_layer );
if ( i_next_real_frame_size != 0 ||
i_next_channels != i_original_channels ||
i_next_rate != i_rate ||
i_next_bit_rate != i_bit_rate ||
i_next_frame_length != i_frame_length ||
i_next_frame_size != i_frame_size ||
i_next_layer != i_new_layer )
{
/* This is an emulated start code, try again. */
/* there is at least 1 byte free */
((uint8_t *)p_buffer->p_buffer)[i++] =
GetBits( &p_dec->bit_stream, 8 );
continue;
}
i_free_frame_size = i;
break;
}
if ( p_dec->p_fifo->b_die || p_dec->p_fifo->b_error )
break;
if ( i == (int)i_frame_size + MAD_BUFFER_GUARD )
{
/* Couldn't find the next start-code. This is sooo
* embarassing. */
aout_DecDeleteBuffer( p_dec->p_aout, p_dec->p_aout_input,
p_buffer );
NextPTS( &p_dec->bit_stream, &pts, NULL );
GetChunk( &p_dec->bit_stream, p_sync, MAD_BUFFER_GUARD );
continue;
}
p_sys->aout_format.i_format = VLC_FOURCC('m','p','g','a');
}
if( p_dec->p_fifo->b_die )
p_sys->aout_format.i_rate = p_sys->i_rate;
p_sys->aout_format.i_original_channels = p_sys->i_channels_conf;
p_sys->aout_format.i_physical_channels
= p_sys->i_channels_conf & AOUT_CHAN_PHYSMASK;
p_sys->aout_format.i_bytes_per_frame = p_sys->i_max_frame_size
+ MAD_BUFFER_GUARD;
p_sys->aout_format.i_frame_length = p_sys->i_frame_length;
aout_DateInit( &p_sys->end_date, p_sys->i_rate );
aout_DateSet( &p_sys->end_date, p_sys->pts );
p_sys->p_aout_input = aout_DecNew( p_dec,
&p_sys->p_aout,
&p_sys->aout_format );
if( p_sys->p_aout_input == NULL )
{
aout_DecDeleteBuffer( p_dec->p_aout, p_dec->p_aout_input,
p_buffer );
break;
*pp_buffer = NULL;
return VLC_EGENERIC;
}
/* Get beginning of next frame. */
NextPTS( &p_dec->bit_stream, &pts, NULL );
GetChunk( &p_dec->bit_stream, p_buffer->p_buffer + i_current_frame_size,
MAD_BUFFER_GUARD );
memcpy( p_sync, p_buffer->p_buffer + i_current_frame_size,
MAD_BUFFER_GUARD );
}
*pp_buffer = aout_DecNewBuffer( p_sys->p_aout, p_sys->p_aout_input,
p_sys->i_frame_length );
if( *pp_buffer == NULL )
{
return VLC_EGENERIC;
}
p_buffer->i_nb_bytes = i_current_frame_size + MAD_BUFFER_GUARD;
(*pp_buffer)->start_date = aout_DateGet( &p_sys->end_date );
(*pp_buffer)->end_date =
aout_DateIncrement( &p_sys->end_date, p_sys->i_frame_length );
/* Send the buffer to the aout core. */
aout_DecPlay( p_dec->p_aout, p_dec->p_aout_input, p_buffer );
return VLC_SUCCESS;
}
/*****************************************************************************
* GetSoutBuffer:
*****************************************************************************/
static int GetSoutBuffer( decoder_t *p_dec, sout_buffer_t **pp_buffer )
{
decoder_sys_t *p_sys = p_dec->p_sys;
if( p_sys->p_sout_input != NULL &&
( p_sys->sout_format.i_sample_rate != (int)p_sys->i_rate
|| p_sys->sout_format.i_channels != (int)p_sys->i_channels ) )
{
/* Parameters changed - this should not happen. */
}
if( p_dec->p_fifo->b_error )
/* Creating the sout input if not created yet. */
if( p_sys->p_sout_input == NULL )
{
DecoderError( p_dec->p_fifo );
p_sys->sout_format.i_sample_rate = p_sys->i_rate;
p_sys->sout_format.i_channels = p_sys->i_channels;
p_sys->sout_format.i_block_align = 0;
p_sys->sout_format.i_bitrate = p_sys->i_bit_rate;
p_sys->sout_format.i_extra_data = 0;
p_sys->sout_format.p_extra_data = NULL;
aout_DateInit( &p_sys->end_date, p_sys->i_rate );
aout_DateSet( &p_sys->end_date, p_sys->pts );
p_sys->p_sout_input = sout_InputNew( p_dec, &p_sys->sout_format );
if( p_sys->p_sout_input == NULL )
{
msg_Err( p_dec, "cannot add a new stream" );
*pp_buffer = NULL;
return VLC_EGENERIC;
}
msg_Info( p_dec, "A/52 channels:%d samplerate:%d bitrate:%d",
p_sys->i_channels, p_sys->i_rate, p_sys->i_bit_rate );
}
EndThread( p_dec );
*pp_buffer = sout_BufferNew( p_sys->p_sout_input->p_sout,
p_sys->i_frame_size );
if( *pp_buffer == NULL )
{
return VLC_EGENERIC;
}
(*pp_buffer)->i_pts =
(*pp_buffer)->i_dts = aout_DateGet( &p_sys->end_date );
return 0;
(*pp_buffer)->i_length =
aout_DateIncrement( &p_sys->end_date, p_sys->i_frame_length )
- (*pp_buffer)->i_pts;
return VLC_SUCCESS;
}
/*****************************************************************************
* EndThread : thread destruction
* SendOutBuffer:
*****************************************************************************/
static void EndThread( dec_thread_t * p_dec )
static int SendOutBuffer( decoder_t *p_dec )
{
if ( p_dec->p_aout_input != NULL )
decoder_sys_t *p_sys = p_dec->p_sys;
if( p_sys->b_packetizer )
{
aout_DecDelete( p_dec->p_aout, p_dec->p_aout_input );
sout_InputSendBuffer( p_sys->p_sout_input, p_sys->p_sout_buffer );
p_sys->p_sout_buffer = NULL;
}
else
{
/* We have all we need, send the buffer to the aout core. */
aout_DecPlay( p_sys->p_aout, p_sys->p_aout_input,
p_sys->p_aout_buffer );
p_sys->p_aout_buffer = NULL;
}
p_sys->p_out_buffer = NULL;
return VLC_SUCCESS;
}
/*****************************************************************************
* EndDecoder: clean up the decoder
*****************************************************************************/
static int EndDecoder( decoder_t *p_dec )
{
if( p_dec->p_sys->p_aout_input != NULL )
{
if( p_dec->p_sys->p_aout_buffer )
{
aout_DecDeleteBuffer( p_dec->p_sys->p_aout,
p_dec->p_sys->p_aout_input,
p_dec->p_sys->p_aout_buffer );
}
aout_DecDelete( p_dec->p_sys->p_aout, p_dec->p_sys->p_aout_input );
}
if( p_dec->p_sys->p_sout_input != NULL )
{
if( p_dec->p_sys->p_sout_buffer )
{
sout_BufferDelete( p_dec->p_sys->p_sout_input->p_sout,
p_dec->p_sys->p_sout_buffer );
}
CloseBitstream( &p_dec->bit_stream );
free( p_dec );
sout_InputDelete( p_dec->p_sys->p_sout_input );
}
if( p_dec->p_sys->p_chain ) block_ChainRelease( p_dec->p_sys->p_chain );
free( p_dec->p_sys );
return VLC_SUCCESS;
}
/*****************************************************************************
......@@ -515,18 +741,16 @@ static int SyncInfo( uint32_t i_header, unsigned int * pi_channels,
switch( *pi_layer )
{
case 1:
i_current_frame_size = ( 12000 *
*pi_bit_rate / *pi_sample_rate
+ b_padding ) * 4;
*pi_frame_size = ( 12000 *
i_max_bit_rate / *pi_sample_rate + 1 ) * 4;
i_current_frame_size = ( 12000 * *pi_bit_rate /
*pi_sample_rate + b_padding ) * 4;
*pi_frame_size = ( 12000 * i_max_bit_rate /
*pi_sample_rate + 1 ) * 4;
*pi_frame_length = 384;
break;
case 2:
i_current_frame_size = 144000 *
*pi_bit_rate / *pi_sample_rate
+ b_padding;
i_current_frame_size = 144000 * *pi_bit_rate /
*pi_sample_rate + b_padding;
*pi_frame_size = 144000 * i_max_bit_rate / *pi_sample_rate + 1;
*pi_frame_length = 1152;
break;
......@@ -550,4 +774,3 @@ static int SyncInfo( uint32_t i_header, unsigned int * pi_channels,
return i_current_frame_size;
}
modules/packetizer/Modules.am
View file @ d3daf21f
SOURCES_packetizer_copy = copy.c
SOURCES_packetizer_mpegaudio = mpegaudio.c
SOURCES_packetizer_mpegvideo = mpegvideo.c
SOURCES_packetizer_mpeg4video = mpeg4video.c
SOURCES_packetizer_mpeg4audio = mpeg4audio.c
modules/packetizer/mpegaudio.c deleted 100644 → 0
View file @ 12336778
/*****************************************************************************
* mpegaudio.c
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: mpegaudio.c,v 1.10 2003/09/10 22:59:55 fenrir Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
*
* 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
* GNU General Public License for more details.
*
* 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.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#include <stdlib.h> /* malloc(), free() */
#include <vlc/vlc.h>
#include <vlc/decoder.h>
#include <vlc/input.h>
#include <vlc/sout.h>
/*****************************************************************************
* Module descriptor
*****************************************************************************/
static int Open ( vlc_object_t * );
static int Run ( decoder_fifo_t * );
vlc_module_begin();
set_description( _("MPEG-I/II audio packetizer") );
set_capability( "packetizer", 50 );
set_callbacks( Open, NULL );
vlc_module_end();
/*****************************************************************************
* Local prototypes
*****************************************************************************/
typedef struct packetizer_s
{
/* Input properties */
decoder_fifo_t *p_fifo;
bit_stream_t bit_stream;
/* Output properties */
sout_packetizer_input_t *p_sout_input;
sout_format_t output_format;
mtime_t i_last_pts;
} packetizer_t;
static int InitThread ( packetizer_t * );
static void PacketizeThread( packetizer_t * );
static void EndThread ( packetizer_t * );
static int mpegaudio_bitrate[2][3][16] =
{
{
/* v1 l1 */
{ 0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, 0},
/* v1 l2 */
{ 0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 0},
/* v1 l3 */
{ 0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 0}
},
{
/* v2 l1 */
{ 0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, 0},
/* v2 l2 */
{ 0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 0},
/* v2 l3 */
{ 0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 0}
}
};
static int mpegaudio_samplerate[2][4] = /* version 1 then 2 */
{
{ 44100, 48000, 32000, 0 },
{ 22050, 24000, 16000, 0 }
};
/*****************************************************************************
* OpenDecoder: probe the packetizer and return score
*****************************************************************************
* Tries to launch a decoder and return score so that the interface is able
* to choose.
*****************************************************************************/
static int Open( vlc_object_t *p_this )
{
decoder_t *p_dec = (decoder_t*)p_this;
if( p_dec->p_fifo->i_fourcc != VLC_FOURCC( 'm', 'p', 'g', 'a') )
{
return VLC_EGENERIC;
}
p_dec->pf_run = Run;
return VLC_SUCCESS;
}
/*****************************************************************************
* RunDecoder: this function is called just after the thread is created
*****************************************************************************/
static int Run( decoder_fifo_t *p_fifo )
{
packetizer_t *p_pack;
int b_error;
msg_Info( p_fifo, "Running mpegaudio packetizer" );
p_pack = malloc( sizeof( packetizer_t ) );
memset( p_pack, 0, sizeof( packetizer_t ) );
p_pack->p_fifo = p_fifo;
if( InitThread( p_pack ) != 0 )
{
DecoderError( p_fifo );
return VLC_EGENERIC;
}
while( ( !p_pack->p_fifo->b_die )&&( !p_pack->p_fifo->b_error ) )
{
PacketizeThread( p_pack );
}
if( ( b_error = p_pack->p_fifo->b_error ) )
{
DecoderError( p_pack->p_fifo );
}
EndThread( p_pack );
free( p_pack );
if( b_error )
{
return VLC_EGENERIC;
}
return VLC_SUCCESS;
}
/*****************************************************************************
* InitThread: initialize data before entering main loop
*****************************************************************************/
static int InitThread( packetizer_t *p_pack )
{
p_pack->output_format.i_cat = AUDIO_ES;
p_pack->output_format.i_fourcc = p_pack->p_fifo->i_fourcc;
p_pack->output_format.i_sample_rate = 0;
p_pack->output_format.i_channels = 0;
p_pack->output_format.i_block_align = 0;
p_pack->output_format.i_bitrate = 0;
p_pack->output_format.i_extra_data = 0;
p_pack->output_format.p_extra_data = NULL;
p_pack->p_sout_input = NULL;
p_pack->i_last_pts = 0;
if( InitBitstream( &p_pack->bit_stream, p_pack->p_fifo,
NULL, NULL ) != VLC_SUCCESS )
{
msg_Err( p_pack->p_fifo, "cannot initialize bitstream" );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
}
/*****************************************************************************
* PacketizeThread: packetize an unit (here copy a complete pes)
*****************************************************************************/
static void PacketizeThread( packetizer_t *p_pack )
{
sout_buffer_t *p_sout_buffer;
size_t i_size;
mtime_t i_pts;
uint32_t i_sync, i_header;
int i_version, i_layer;
int i_channels, i_samplerate, i_bitrate;
int i_samplesperframe, i_framelength;
int i_skip = 0;
/* search a valid start code */
for( ;; )
{
int i_crc, i_bitrate_index, i_samplerate_index;
int i_padding, i_extention, i_mode, i_modeext, i_copyright;
int i_original, i_emphasis;
RealignBits( &p_pack->bit_stream );
while( ShowBits( &p_pack->bit_stream, 11 ) != 0x07ff &&
!p_pack->p_fifo->b_die && !p_pack->p_fifo->b_error )
{
//msg_Warn( p_pack->p_fifo, "trash..." );
RemoveBits( &p_pack->bit_stream, 8 );
i_skip++;
}
if( p_pack->p_fifo->b_die || p_pack->p_fifo->b_error )
{
return;
}
/* Set the Presentation Time Stamp */
NextPTS( &p_pack->bit_stream, &i_pts, NULL );
i_sync = GetBits( &p_pack->bit_stream, 12 );
i_header = ShowBits( &p_pack->bit_stream, 20 );
i_version = 1 - GetBits( &p_pack->bit_stream, 1 );
i_layer = 3 - GetBits( &p_pack->bit_stream, 2 );
i_crc = 1 - GetBits( &p_pack->bit_stream, 1 );
i_bitrate_index = GetBits( &p_pack->bit_stream, 4 );
i_samplerate_index = GetBits( &p_pack->bit_stream, 2 );
i_padding = GetBits( &p_pack->bit_stream, 1 );
i_extention = GetBits( &p_pack->bit_stream, 1 );
i_mode = GetBits( &p_pack->bit_stream, 2 );
i_modeext = GetBits( &p_pack->bit_stream, 2 );
i_copyright = GetBits( &p_pack->bit_stream, 1 );
i_original = GetBits( &p_pack->bit_stream, 1 );
i_emphasis = GetBits( &p_pack->bit_stream, 2 );
if( i_layer != 3 &&
i_bitrate_index > 0x00 && i_bitrate_index < 0x0f &&
i_samplerate_index != 0x03 &&
i_emphasis != 0x02 )
{
i_channels = ( i_mode == 3 ) ? 1 : 2;
i_bitrate = mpegaudio_bitrate[i_version][i_layer][i_bitrate_index];
i_samplerate = mpegaudio_samplerate[i_version][i_samplerate_index];
if( ( i_sync & 0x01 ) == 0x00 )
{
/* mpeg 2.5 */
i_samplerate /= 2;
}
switch( i_layer )
{
case 0:
i_framelength = ( 12000 * i_bitrate /
i_samplerate + i_padding ) * 4;
break;
case 1:
i_framelength = 144000 * i_bitrate /
i_samplerate + i_padding;
break;
case 2:
i_framelength = ( i_version ? 72000 : 144000 ) *
i_bitrate / i_samplerate + i_padding;
break;
default:
i_framelength = 0;
}
switch( i_layer )
{
case 0:
i_samplesperframe = 384;
break;
case 1:
i_samplesperframe = 1152;
break;
case 2:
i_samplesperframe = i_version ? 576 : 1152;
break;
default:
i_samplesperframe = 0;
}
break;
}
}
if( !p_pack->p_sout_input )
{
/* add a input for the stream ouput */
p_pack->output_format.i_sample_rate = i_samplerate;
p_pack->output_format.i_channels = i_channels;
p_pack->output_format.i_block_align = 1;
p_pack->output_format.i_bitrate = i_bitrate*1000;
p_pack->p_sout_input =
sout_InputNew( p_pack->p_fifo,
&p_pack->output_format );
if( !p_pack->p_sout_input )
{
msg_Err( p_pack->p_fifo,
"cannot add a new stream" );
p_pack->p_fifo->b_error = 1;
return;
}
msg_Dbg( p_pack->p_fifo,
"v:%d l:%d channels:%d samplerate:%d bitrate:%d size:%d",
i_version, i_layer, i_channels, i_samplerate,
i_bitrate, i_framelength );
}
if( i_pts <= 0 && p_pack->i_last_pts <= 0 )
{
msg_Dbg( p_pack->p_fifo, "need a starting pts" );
return;
}
if( i_pts <= 0 )
{
i_pts = p_pack->i_last_pts +
(uint64_t)1000000 *
(uint64_t)i_samplesperframe /
(uint64_t)i_samplerate;
}
p_pack->i_last_pts = i_pts;
i_size = __MAX( i_framelength, 4 );
// msg_Dbg( p_pack->p_fifo, "frame length %d b", i_size );
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;
return;
}
p_sout_buffer->p_buffer[0] = ( i_sync >> 4 )&0xff;
p_sout_buffer->p_buffer[1] =
( ( i_sync << 4 )&0xf0 ) | ( ( i_header >> 16 )&0x0f );
p_sout_buffer->p_buffer[2] = ( i_header >> 8 )&0xff;
p_sout_buffer->p_buffer[3] = ( i_header )&0xff;
p_sout_buffer->i_bitrate = i_bitrate;
p_sout_buffer->i_dts = i_pts;
p_sout_buffer->i_pts = i_pts;
p_sout_buffer->i_length =
(uint64_t)1000000 *
(uint64_t)i_samplesperframe /
(uint64_t)i_samplerate;
/* we are already aligned */
GetChunk( &p_pack->bit_stream,
p_sout_buffer->p_buffer + 4,
i_size - 4 );
sout_InputSendBuffer( p_pack->p_sout_input,
p_sout_buffer );
}
/*****************************************************************************
* EndThread : packetizer thread destruction
*****************************************************************************/
static void EndThread ( packetizer_t *p_pack)
{
if( p_pack->p_sout_input )
{
sout_InputDelete( p_pack->p_sout_input );
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment