/*****************************************************************************
- * a52.c: ATSC A/52 aka AC-3 decoder plugin for vlc.
- * This plugin makes use of liba52 to decode A/52 audio
- * (http://liba52.sf.net/).
+ * a52.c: parse A/52 audio sync info and packetize the stream
*****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
- * $Id: a52.c,v 1.2 2002/08/11 22:46:34 massiot Exp $
+ * Copyright (C) 2001-2002 the VideoLAN team
+ * $Id$
*
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
+ * Authors: Stéphane Borel <stef@via.ecp.fr>
* Christophe Massiot <massiot@via.ecp.fr>
- *
+ * Gildas Bazin <gbazin@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
*
* 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 <stdlib.h> /* malloc(), free() */
-#include <string.h> /* strdup() */
-#ifdef HAVE_STDINT_H
-# include <stdint.h> /* int16_t .. */
-#elif HAVE_INTTYPES_H
-# include <inttypes.h> /* int16_t .. */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
#endif
-#ifdef USE_A52DEC_TREE /* liba52 header file */
-# include "include/a52.h"
-#else
-# include "a52dec/a52.h"
-#endif
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_codec.h>
+#include <vlc_aout.h>
+#include <vlc_block_helper.h>
+#include <vlc_modules.h>
-#define A52_FRAME_SIZE 1536
+#include "a52.h"
/*****************************************************************************
- * a52_thread_t : a52 decoder thread descriptor
+ * Module descriptor
*****************************************************************************/
-typedef struct a52_thread_s
-{
- /*
- * liba52 properties
- */
- a52_state_t * p_a52_state;
- vlc_bool_t b_dynrng;
+static int OpenDecoder ( vlc_object_t * );
+static int OpenPacketizer( vlc_object_t * );
+static void CloseCommon ( vlc_object_t * );
+
+vlc_module_begin ()
+ set_description( N_("A/52 parser") )
+ set_capability( "decoder", 100 )
+ set_callbacks( OpenDecoder, CloseCommon )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_ACODEC )
+
+ add_submodule ()
+ set_description( N_("A/52 audio packetizer") )
+ set_capability( "packetizer", 10 )
+ set_callbacks( OpenPacketizer, CloseCommon )
+vlc_module_end ()
- /* The bit stream structure handles the PES stream at the bit level */
- bit_stream_t bit_stream;
+/*****************************************************************************
+ * decoder_sys_t : decoder descriptor
+ *****************************************************************************/
+
+struct decoder_sys_t
+{
+ /* Module mode */
+ bool b_packetizer;
/*
* Input properties
*/
- decoder_fifo_t * p_fifo; /* stores the PES stream data */
- data_packet_t * p_data;
+ int i_state;
+
+ block_bytestream_t bytestream;
/*
- * Output properties
+ * Common properties
*/
- aout_instance_t * p_aout; /* opaque */
- aout_input_t * p_aout_input; /* opaque */
- audio_sample_format_t output_format;
- mtime_t last_date;
-} a52_thread_t;
+ date_t end_date;
-/*****************************************************************************
+ mtime_t i_pts;
+
+ vlc_a52_header_t frame;
+};
+
+enum {
+
+ STATE_NOSYNC,
+ STATE_SYNC,
+ STATE_HEADER,
+ STATE_NEXT_SYNC,
+ STATE_GET_DATA,
+ STATE_SEND_DATA
+};
+
+/****************************************************************************
* Local prototypes
- *****************************************************************************/
-static int OpenDecoder ( vlc_object_t * );
-static int RunDecoder ( decoder_fifo_t * );
-static int DecodeFrame ( a52_thread_t *, byte_t * );
-static int InitThread ( a52_thread_t *, decoder_fifo_t * );
-static void EndThread ( a52_thread_t * );
+ ****************************************************************************/
+static void *DecodeBlock ( decoder_t *, block_t ** );
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
-#define DYNRNG_TEXT N_("A/52 dynamic range compression")
-#define DYNRNG_LONGTEXT N_( \
- "Dynamic range compression makes the loud sounds softer, and the soft " \
- "sounds louder, so you can more easily listen to the stream in a noisy " \
- "environment without disturbing anyone. If you disable the dynamic range "\
- "compression the playback will be more adapted to a movie theater or a " \
- "listening room.")
-
-vlc_module_begin();
- add_category_hint( N_("Miscellaneous"), NULL );
- add_bool( "a52-dynrng", 1, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT );
- set_description( _("a52 ATSC A/52 aka AC-3 audio decoder module") );
- set_capability( "decoder", 60 );
- set_callbacks( OpenDecoder, NULL );
-vlc_module_end();
+static uint8_t *GetOutBuffer ( decoder_t *, block_t ** );
+static aout_buffer_t *GetAoutBuffer( decoder_t * );
+static block_t *GetSoutBuffer( decoder_t * );
/*****************************************************************************
- * OpenDecoder: probe the decoder and return score
- *****************************************************************************
- * Tries to launch a decoder and return score so that the interface is able
- * to choose.
+ * OpenCommon: probe the decoder/packetizer and return score
*****************************************************************************/
-static int OpenDecoder( vlc_object_t *p_this )
+static int OpenCommon( vlc_object_t *p_this, bool b_packetizer )
{
- decoder_fifo_t *p_fifo = (decoder_fifo_t*) p_this;
-
- if( p_fifo->i_fourcc != VLC_FOURCC('a','5','2',' ') )
- {
+ decoder_t *p_dec = (decoder_t*)p_this;
+ decoder_sys_t *p_sys;
+ vlc_fourcc_t i_codec;
+
+ switch( p_dec->fmt_in.i_codec )
+ {
+ case VLC_CODEC_A52:
+ i_codec = VLC_CODEC_A52;
+ break;
+ case VLC_CODEC_EAC3:
+ /* XXX ugly hack, a52 does not support eac3 so no eac3 pass-through
+ * support */
+ if( !b_packetizer )
+ return VLC_EGENERIC;
+ i_codec = VLC_CODEC_EAC3;
+ break;
+ default:
return VLC_EGENERIC;
}
- p_fifo->pf_run = RunDecoder;
+ /* 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->b_packetizer = b_packetizer;
+ p_sys->i_state = STATE_NOSYNC;
+ date_Set( &p_sys->end_date, 0 );
+ p_sys->i_pts = VLC_TS_INVALID;
+
+ p_sys->bytestream = block_BytestreamInit();
+
+ /* Set output properties */
+ p_dec->fmt_out.i_cat = AUDIO_ES;
+ p_dec->fmt_out.i_codec = i_codec;
+ p_dec->fmt_out.audio.i_rate = 0; /* So end_date gets initialized */
+ p_dec->fmt_out.audio.i_bytes_per_frame = 0;
+
+ /* Set callback */
+ if( b_packetizer )
+ p_dec->pf_packetize = (block_t *(*)(decoder_t *, block_t **))
+ DecodeBlock;
+ else
+ p_dec->pf_decode_audio = (aout_buffer_t *(*)(decoder_t *, block_t **))
+ DecodeBlock;
return VLC_SUCCESS;
}
-/*****************************************************************************
- * RunDecoder: this function is called just after the thread is created
- *****************************************************************************/
-static int RunDecoder( decoder_fifo_t *p_fifo )
+static int OpenDecoder( vlc_object_t *p_this )
{
- a52_thread_t *p_dec;
+ /* HACK: Don't use this codec if we don't have an a52 audio filter */
+ if( !module_exists( "a52tofloat32" ) )
+ return VLC_EGENERIC;
+ return OpenCommon( p_this, false );
+}
- /* Allocate the memory needed to store the thread's structure */
- p_dec = (a52_thread_t *)malloc( sizeof(a52_thread_t) );
- if( p_dec == NULL )
- {
- msg_Err( p_fifo, "out of memory" );
- DecoderError( p_fifo );
- return -1;
- }
+static int OpenPacketizer( vlc_object_t *p_this )
+{
+ return OpenCommon( p_this, true );
+}
- if( InitThread( p_dec, p_fifo ) )
- {
- msg_Err( p_dec->p_fifo, "could not initialize thread" );
- DecoderError( p_fifo );
- free( p_dec );
- return -1;
- }
+/****************************************************************************
+ * DecodeBlock: the whole thing
+ ****************************************************************************
+ * This function is called just after the thread is launched.
+ ****************************************************************************/
+static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
+{
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ uint8_t p_header[VLC_A52_HEADER_SIZE];
+ uint8_t *p_buf;
+ block_t *p_out_buffer;
+
+ if( !pp_block || !*pp_block ) return NULL;
- /* liba52 decoder thread's main loop */
- while( !p_dec->p_fifo->b_die && !p_dec->p_fifo->b_error )
+ if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
{
- int i_frame_size, i_flags, i_rate, i_bit_rate;
- mtime_t pts;
- /* Temporary buffer to store the raw frame to be decoded */
- byte_t p_frame_buffer[3840];
-
- /* Look for sync word - should be 0x0b77 */
- RealignBits( &p_dec->bit_stream );
- while( (ShowBits( &p_dec->bit_stream, 16 ) ) != 0x0b77 &&
- (!p_dec->p_fifo->b_die) && (!p_dec->p_fifo->b_error))
+ if( (*pp_block)->i_flags&BLOCK_FLAG_CORRUPTED )
{
- RemoveBits( &p_dec->bit_stream, 8 );
+ p_sys->i_state = STATE_NOSYNC;
+ block_BytestreamEmpty( &p_sys->bytestream );
}
+ date_Set( &p_sys->end_date, 0 );
+ block_Release( *pp_block );
+ return NULL;
+ }
- /* Get A/52 frame header */
- GetChunk( &p_dec->bit_stream, p_frame_buffer, 7 );
- if( p_dec->p_fifo->b_die ) break;
+ if( !date_Get( &p_sys->end_date ) && (*pp_block)->i_pts <= VLC_TS_INVALID)
+ {
+ /* We've just started the stream, wait for the first PTS. */
+ block_Release( *pp_block );
+ return NULL;
+ }
- /* Check if frame is valid and get frame info */
- i_frame_size = a52_syncinfo( p_frame_buffer, &i_flags, &i_rate,
- &i_bit_rate );
+ block_BytestreamPush( &p_sys->bytestream, *pp_block );
- if( !i_frame_size )
+ while( 1 )
+ {
+ switch( p_sys->i_state )
{
- msg_Warn( p_dec->p_fifo, "a52_syncinfo failed" );
- continue;
- }
+ case STATE_NOSYNC:
+ while( block_PeekBytes( &p_sys->bytestream, p_header, 2 )
+ == VLC_SUCCESS )
+ {
+ if( p_header[0] == 0x0b && p_header[1] == 0x77 )
+ {
+ p_sys->i_state = STATE_SYNC;
+ break;
+ }
+ block_SkipByte( &p_sys->bytestream );
+ }
+ if( p_sys->i_state != STATE_SYNC )
+ {
+ block_BytestreamFlush( &p_sys->bytestream );
- if( (p_dec->p_aout_input != NULL) &&
- ( (p_dec->output_format.i_rate != i_rate)
- /* || (p_dec->output_format.i_channels != i_channels) */ ) )
- {
- /* Parameters changed - this should not happen. */
- aout_InputDelete( p_dec->p_aout, p_dec->p_aout_input );
- p_dec->p_aout_input = NULL;
- }
+ /* Need more data */
+ return NULL;
+ }
- /* Creating the audio input if not created yet. */
- if( p_dec->p_aout_input == NULL )
- {
- p_dec->output_format.i_rate = i_rate;
- /* p_dec->output_format.i_channels = i_channels; */
- p_dec->p_aout_input = aout_InputNew( p_dec->p_fifo,
- &p_dec->p_aout,
- &p_dec->output_format );
+ 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 > VLC_TS_INVALID &&
+ p_sys->i_pts != date_Get( &p_sys->end_date ) )
+ {
+ date_Set( &p_sys->end_date, p_sys->i_pts );
+ }
+ p_sys->i_state = STATE_HEADER;
+
+ case STATE_HEADER:
+ /* Get A/52 frame header (VLC_A52_HEADER_SIZE bytes) */
+ if( block_PeekBytes( &p_sys->bytestream, p_header,
+ VLC_A52_HEADER_SIZE ) != VLC_SUCCESS )
+ {
+ /* Need more data */
+ return NULL;
+ }
- if ( p_dec->p_aout_input == NULL )
+ /* Check if frame is valid and get frame info */
+ if( vlc_a52_header_Parse( &p_sys->frame, p_header, VLC_A52_HEADER_SIZE ) )
{
- p_dec->p_fifo->b_error = 1;
+ msg_Dbg( p_dec, "emulated sync word" );
+ block_SkipByte( &p_sys->bytestream );
+ p_sys->i_state = STATE_NOSYNC;
break;
}
- }
- /* Set the Presentation Time Stamp */
- CurrentPTS( &p_dec->bit_stream, &pts, NULL );
- if ( pts != 0 )
- {
- p_dec->last_date = pts;
- }
+ p_sys->i_state = STATE_NEXT_SYNC;
- /* Get the complete frame */
- GetChunk( &p_dec->bit_stream, p_frame_buffer + 7,
- i_frame_size - 7 );
- if( p_dec->p_fifo->b_die ) break;
+ case STATE_NEXT_SYNC:
+ /* TODO: If pp_block == NULL, flush the buffer without checking the
+ * next sync word */
- if( DecodeFrame( p_dec, p_frame_buffer ) )
- {
- p_dec->p_fifo->b_error = 1;
+ /* Check if next expected frame contains the sync word */
+ if( block_PeekOffsetBytes( &p_sys->bytestream,
+ p_sys->frame.i_size, p_header, 2 )
+ != VLC_SUCCESS )
+ {
+ /* Need more data */
+ return NULL;
+ }
+
+ if( p_sys->b_packetizer &&
+ p_header[0] == 0 && p_header[1] == 0 )
+ {
+ /* A52 wav files and audio CD's use stuffing */
+ p_sys->i_state = STATE_GET_DATA;
+ break;
+ }
+
+ if( p_header[0] != 0x0b || p_header[1] != 0x77 )
+ {
+ 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;
- }
- }
- /* If b_error is set, the decoder thread enters the error loop */
- if( p_dec->p_fifo->b_error )
- {
- DecoderError( p_dec->p_fifo );
- }
+ 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->frame.i_size ) != VLC_SUCCESS )
+ {
+ /* Need more data */
+ return NULL;
+ }
+ p_sys->i_state = STATE_SEND_DATA;
- /* End of the a52 decoder thread */
- EndThread( p_dec );
+ case STATE_SEND_DATA:
+ if( !(p_buf = GetOutBuffer( p_dec, &p_out_buffer )) )
+ {
+ //p_dec->b_error = true;
+ return NULL;
+ }
- return 0;
-}
+ /* Copy the whole frame into the buffer. When we reach this point
+ * we already know we have enough data available. */
+ block_GetBytes( &p_sys->bytestream,
+ p_buf, __MIN( p_sys->frame.i_size, p_out_buffer->i_buffer ) );
-/*****************************************************************************
- * InitThread: initialize data before entering main loop
- *****************************************************************************/
-static int InitThread( a52_thread_t * p_dec, decoder_fifo_t * p_fifo )
-{
- /* Initialize the thread properties */
- p_dec->p_aout = NULL;
- p_dec->p_aout_input = NULL;
- p_dec->p_fifo = p_fifo;
- p_dec->output_format.i_format = AOUT_FMT_FLOAT32;
- p_dec->output_format.i_channels = 2; /* FIXME ! */
- p_dec->last_date = 0;
-
- /* Initialize liba52 */
- p_dec->p_a52_state = a52_init( 0 );
- if( p_dec->p_a52_state == NULL )
- {
- msg_Err( p_dec->p_fifo, "unable to initialize liba52" );
- return -1;
- }
+ /* 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 = VLC_TS_INVALID;
- p_dec->b_dynrng = config_GetInt( p_dec->p_fifo, "a52-dynrng" );
+ /* So p_block doesn't get re-added several times */
+ *pp_block = block_BytestreamPop( &p_sys->bytestream );
- /* Init the Bitstream */
- InitBitstream( &p_dec->bit_stream, p_dec->p_fifo,
- NULL, NULL );
+ p_sys->i_state = STATE_NOSYNC;
- return 0;
+ return p_out_buffer;
+ }
+ }
+
+ return NULL;
}
/*****************************************************************************
- * Interleave: helper function to interleave channels
+ * CloseCommon: clean up the decoder
*****************************************************************************/
-static void Interleave( float * p_out, const float * p_in, int i_channels )
+static void CloseCommon( vlc_object_t *p_this )
{
- int i, j;
+ decoder_t *p_dec = (decoder_t*)p_this;
+ decoder_sys_t *p_sys = p_dec->p_sys;
- for ( j = 0; j < i_channels; j++ )
- {
- for ( i = 0; i < 256; i++ )
- {
- p_out[i * i_channels + j] = p_in[j * 256 + i];
- }
- }
+ block_BytestreamRelease( &p_sys->bytestream );
+
+ free( p_sys );
}
/*****************************************************************************
- * DecodeFrame: decode an ATSC A/52 frame.
+ * GetOutBuffer:
*****************************************************************************/
-static int DecodeFrame( a52_thread_t * p_dec, byte_t * p_frame_buffer )
+static uint8_t *GetOutBuffer( decoder_t *p_dec, block_t **pp_out_buffer )
{
- sample_t i_sample_level = 1;
- aout_buffer_t * p_buffer;
- int i, i_flags;
- int i_bytes_per_block = 256 * p_dec->output_format.i_channels
- * sizeof(float);
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ uint8_t *p_buf;
- if( !p_dec->last_date )
+ if( p_dec->fmt_out.audio.i_rate != p_sys->frame.i_rate )
{
- /* We've just started the stream, wait for the first PTS. */
- return 0;
+ msg_Dbg( p_dec, "A/52 channels:%d samplerate:%d bitrate:%d",
+ p_sys->frame.i_channels, p_sys->frame.i_rate, p_sys->frame.i_bitrate );
+
+ date_Init( &p_sys->end_date, p_sys->frame.i_rate, 1 );
+ date_Set( &p_sys->end_date, p_sys->i_pts );
}
- p_buffer = aout_BufferNew( p_dec->p_aout, p_dec->p_aout_input,
- A52_FRAME_SIZE );
- if ( p_buffer == NULL ) return -1;
- p_buffer->start_date = p_dec->last_date;
- p_dec->last_date += (mtime_t)(A52_FRAME_SIZE * 1000000)
- / p_dec->output_format.i_rate;
- p_buffer->end_date = p_dec->last_date;
+ p_dec->fmt_out.audio.i_rate = p_sys->frame.i_rate;
+ p_dec->fmt_out.audio.i_channels = p_sys->frame.i_channels;
+ if( p_dec->fmt_out.audio.i_bytes_per_frame < p_sys->frame.i_size )
+ p_dec->fmt_out.audio.i_bytes_per_frame = p_sys->frame.i_size;
+ p_dec->fmt_out.audio.i_frame_length = p_sys->frame.i_samples;
- /* FIXME */
- i_flags = A52_STEREO | A52_ADJUST_LEVEL;
+ p_dec->fmt_out.audio.i_original_channels = p_sys->frame.i_channels_conf;
+ p_dec->fmt_out.audio.i_physical_channels =
+ p_sys->frame.i_channels_conf & AOUT_CHAN_PHYSMASK;
- /* Do the actual decoding now */
- a52_frame( p_dec->p_a52_state, p_frame_buffer,
- &i_flags, &i_sample_level, 0 );
+ p_dec->fmt_out.i_bitrate = p_sys->frame.i_bitrate;
- if( !p_dec->b_dynrng )
+ if( p_sys->b_packetizer )
{
- a52_dynrng( p_dec->p_a52_state, NULL, NULL );
+ block_t *p_sout_buffer = GetSoutBuffer( p_dec );
+ p_buf = p_sout_buffer ? p_sout_buffer->p_buffer : NULL;
+ *pp_out_buffer = p_sout_buffer;
}
-
- for ( i = 0; i < 6; i++ )
+ else
{
- sample_t * p_samples;
+ aout_buffer_t *p_aout_buffer = GetAoutBuffer( p_dec );
+ p_buf = p_aout_buffer ? p_aout_buffer->p_buffer : NULL;
+ *pp_out_buffer = p_aout_buffer;
+ }
- if( a52_block( p_dec->p_a52_state ) )
- {
- msg_Warn( p_dec->p_fifo, "a52_block failed for block %i", i );
- }
+ return p_buf;
+}
- p_samples = a52_samples( p_dec->p_a52_state );
+/*****************************************************************************
+ * GetAoutBuffer:
+ *****************************************************************************/
+static aout_buffer_t *GetAoutBuffer( decoder_t *p_dec )
+{
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ aout_buffer_t *p_buf;
- /* Interleave the *$£%ù samples */
- Interleave( (float *)(p_buffer->p_buffer + i * i_bytes_per_block),
- p_samples, p_dec->output_format.i_channels );
- }
+ p_buf = decoder_NewAudioBuffer( p_dec, p_sys->frame.i_samples );
+ if( p_buf == NULL ) return NULL;
- aout_BufferPlay( p_dec->p_aout, p_dec->p_aout_input, p_buffer );
+ p_buf->i_pts = date_Get( &p_sys->end_date );
+ p_buf->i_length = date_Increment( &p_sys->end_date,
+ p_sys->frame.i_samples ) - p_buf->i_pts;
- return 0;
+ return p_buf;
}
/*****************************************************************************
- * EndThread : liba52 decoder thread destruction
+ * GetSoutBuffer:
*****************************************************************************/
-static void EndThread( a52_thread_t * p_dec )
+static block_t *GetSoutBuffer( decoder_t *p_dec )
{
- if ( p_dec->p_aout_input != NULL )
- {
- aout_InputDelete( p_dec->p_aout, p_dec->p_aout_input );
- }
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ block_t *p_block;
+
+ p_block = block_New( p_dec, p_sys->frame.i_size );
+ if( p_block == NULL ) return NULL;
+
+ p_block->i_pts = p_block->i_dts = date_Get( &p_sys->end_date );
+
+ p_block->i_length =
+ date_Increment( &p_sys->end_date, p_sys->frame.i_samples ) - p_block->i_pts;
- a52_free( p_dec->p_a52_state );
- free( p_dec );
+ return p_block;
}
projects / vlc / blobdiff