Commit 9a9f8a1e authored by Christophe Massiot's avatar Christophe Massiot

More S/PDIF fixes.

parent a29bce0b
This diff is collapsed.
......@@ -442,7 +442,8 @@ PLUGINS="${PLUGINS} misc/dummy/dummy misc/null/null"
PLUGINS="${PLUGINS} control/rc/rc misc/logger/logger access/file access/udp access/http misc/network/ipv4 misc/memcpy/memcpy"
PLUGINS="${PLUGINS} demux/mpeg/es demux/mpeg/audio demux/mpeg/mpeg_system demux/mpeg/ps demux/mpeg/ts"
PLUGINS="${PLUGINS} codec/mpeg_video/idct/idct codec/mpeg_video/idct/idctclassic codec/mpeg_video/motion/motion codec/mpeg_video/mpeg_video codec/spudec/spudec"
#PLUGINS="${PLUGINS} codec/a52old/imdct/imdct codec/a52old/downmix/downmix codec/mpeg_audio/mpeg_audio codec/a52old/a52old codec/lpcm/lpcm codec/spdif/spdif"
PLUGINS="${PLUGINS} codec/spdif"
#PLUGINS="${PLUGINS} codec/a52old/imdct/imdct codec/a52old/downmix/downmix codec/mpeg_audio/mpeg_audio codec/a52old/a52old codec/lpcm/lpcm"
PLUGINS="${PLUGINS} video_filter/deinterlace/deinterlace video_filter/invert video_filter/wall video_filter/transform video_filter/distort video_filter/clone video_filter/crop"
PLUGINS="${PLUGINS} audio_filter/converter/float32tos16"
PLUGINS="${PLUGINS} audio_filter/resampler/trivial"
......@@ -1155,7 +1156,7 @@ then
a52_LDFLAGS="${a52_LDFLAGS} -L${real_a52_tree}/liba52/.libs"
LDFLAGS="${save_LDFLAGS} ${a52_LDFLAGS}"
AC_CHECK_LIB(a52, a52_free, [
BUILTINS="${BUILTINS} codec/a52/a52"
BUILTINS="${BUILTINS} codec/a52"
a52_LDFLAGS="${a52_LDFLAGS} -la52 -lm"
a52_CFLAGS="${a52_CFLAGS} -DUSE_A52DEC_TREE"
],[
......@@ -1186,7 +1187,7 @@ then
LDFLAGS="${save_LDFLAGS} ${test_LDFLAGS}"
AC_CHECK_HEADERS(a52dec/a52.h, [
AC_CHECK_LIB(a52, a52_free, [
BUILTINS="${BUILTINS} codec/a52/a52"
BUILTINS="${BUILTINS} codec/a52"
a52_LDFLAGS="${a52_LDFLAGS} ${test_LDFLAGS} -la52 -lm"
a52_CFLAGS="${a52_CFLAGS} ${test_CFLAGS}"
],[
......
......@@ -129,12 +129,16 @@
#define VOLUME_MAX 1024
#define VOLUME_MIN 0
/* Max number of pre-filters per input, and max-number of post-filters */
/* Max number of pre-filters per input, and max number of post-filters */
#define AOUT_MAX_FILTERS 10
/* Max number of inputs */
#define AOUT_MAX_INPUTS 5
/* Buffers which arrive in advance of more than AOUT_MAX_PREPARE_TIME
* will cause the calling thread to sleep */
#define AOUT_MAX_PREPARE_TIME (mtime_t)(.5*CLOCK_FREQ)
/*****************************************************************************
* Video configuration
*****************************************************************************/
......
......@@ -2,7 +2,7 @@
* oss.c : OSS /dev/dsp module for vlc
*****************************************************************************
* Copyright (C) 2000-2002 VideoLAN
* $Id: oss.c,v 1.4 2002/08/09 23:47:23 massiot Exp $
* $Id: oss.c,v 1.5 2002/08/11 01:27:01 massiot Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -293,39 +293,44 @@ static int OSSThread( aout_instance_t * p_aout )
int i_bytes_per_sample;
aout_buffer_t * p_buffer;
mtime_t next_date;
int i_tmp;
int i_tmp, i_size;
byte_t * p_bytes;
/* Get the presentation date of the next write() operation. It
* is equal to the current date + duration of buffered samples.
* Order is important here, since GetBufInfo is believed to take
* more time than mdate(). */
if( !p_sys->b_initialized )
{
msleep( THREAD_SLEEP );
continue;
}
i_bytes_per_sample = aout_FormatToSize( &p_aout->output.output, 1 );
next_date = (mtime_t)GetBufInfo( p_aout ) * 1000000
/ i_bytes_per_sample
/ p_aout->output.output.i_rate;
next_date += mdate();
if ( p_aout->output.output.i_format != AOUT_FMT_SPDIF )
{
/* Get the presentation date of the next write() operation. It
* is equal to the current date + duration of buffered samples.
* Order is important here, since GetBufInfo is believed to take
* more time than mdate(). */
next_date = (mtime_t)GetBufInfo( p_aout ) * 1000000
/ aout_FormatToByterate( &p_aout->output.output,
p_aout->output.output.i_rate );
next_date += mdate();
}
p_buffer = aout_OutputNextBuffer( p_aout, next_date );
if ( p_buffer != NULL )
{
p_bytes = p_buffer->p_buffer;
i_size = aout_FormatToSize( &p_aout->output.output,
p_buffer->i_nb_samples );
}
else
{
p_bytes = alloca( DEFAULT_FRAME_SIZE * i_bytes_per_sample );
memset( p_bytes, 0, DEFAULT_FRAME_SIZE * i_bytes_per_sample );
i_size = aout_FormatToSize( &p_aout->output.output,
DEFAULT_FRAME_SIZE );
p_bytes = alloca( i_size );
memset( p_bytes, 0, i_size );
}
i_tmp = write( p_sys->i_fd, p_bytes,
DEFAULT_FRAME_SIZE * i_bytes_per_sample );
i_tmp = write( p_sys->i_fd, p_bytes, i_size );
if( i_tmp < 0 )
{
......
......@@ -4,7 +4,7 @@
* (http://liba52.sf.net/).
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: a52.c,v 1.2 2002/08/07 21:36:56 massiot Exp $
* $Id: a52.c,v 1.1 2002/08/11 01:27:01 massiot Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -45,17 +45,43 @@
# include "a52dec/a52.h"
#endif
#include "a52.h"
#define A52DEC_FRAME_SIZE 1536
#define A52_FRAME_SIZE 1536
/*****************************************************************************
* a52_thread_t : a52 decoder thread descriptor
*****************************************************************************/
typedef struct a52_thread_s
{
/*
* liba52 properties
*/
a52_state_t * p_a52_state;
vlc_bool_t b_dynrng;
/* The bit stream structure handles the PES stream at the bit level */
bit_stream_t bit_stream;
/*
* Input properties
*/
decoder_fifo_t * p_fifo; /* stores the PES stream data */
data_packet_t * p_data;
/*
* Output 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;
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static int OpenDecoder ( vlc_object_t * );
static int RunDecoder ( decoder_fifo_t * );
static int DecodeFrame ( a52_thread_t *, u8 * );
static int DecodeFrame ( a52_thread_t *, const byte_t * );
static int InitThread ( a52_thread_t *, decoder_fifo_t * );
static void EndThread ( a52_thread_t * );
......@@ -102,44 +128,44 @@ static int OpenDecoder( vlc_object_t *p_this )
*****************************************************************************/
static int RunDecoder( decoder_fifo_t *p_fifo )
{
a52_thread_t *p_a52;
a52_thread_t *p_dec;
/* Allocate the memory needed to store the thread's structure */
p_a52 = (a52_thread_t *)malloc( sizeof(a52_thread_t) );
if( p_a52 == NULL )
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;
}
if( InitThread( p_a52, p_fifo ) )
if( InitThread( p_dec, p_fifo ) )
{
msg_Err( p_a52->p_fifo, "could not initialize thread" );
msg_Err( p_dec->p_fifo, "could not initialize thread" );
DecoderError( p_fifo );
free( p_a52 );
free( p_dec );
return -1;
}
/* liba52 decoder thread's main loop */
while( !p_a52->p_fifo->b_die && !p_a52->p_fifo->b_error )
while( !p_dec->p_fifo->b_die && !p_dec->p_fifo->b_error )
{
int i_frame_size, i_flags, i_rate, i_bit_rate;
mtime_t pts;
/* Temporary buffer to store the raw frame to be decoded */
u8 p_frame_buffer[3840];
byte_t p_frame_buffer[3840];
/* Look for sync word - should be 0x0b77 */
RealignBits(&p_a52->bit_stream);
while( (ShowBits( &p_a52->bit_stream, 16 ) ) != 0x0b77 &&
(!p_a52->p_fifo->b_die) && (!p_a52->p_fifo->b_error))
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))
{
RemoveBits( &p_a52->bit_stream, 8 );
RemoveBits( &p_dec->bit_stream, 8 );
}
/* Get A/52 frame header */
GetChunk( &p_a52->bit_stream, p_frame_buffer, 7 );
if( p_a52->p_fifo->b_die ) break;
GetChunk( &p_dec->bit_stream, p_frame_buffer, 7 );
if( p_dec->p_fifo->b_die ) break;
/* Check if frame is valid and get frame info */
i_frame_size = a52_syncinfo( p_frame_buffer, &i_flags, &i_rate,
......@@ -147,62 +173,62 @@ static int RunDecoder( decoder_fifo_t *p_fifo )
if( !i_frame_size )
{
msg_Warn( p_a52->p_fifo, "a52_syncinfo failed" );
msg_Warn( p_dec->p_fifo, "a52_syncinfo failed" );
continue;
}
if( (p_a52->p_aout_input != NULL) &&
( (p_a52->output_format.i_rate != i_rate)
/* || (p_a52->output_format.i_channels != i_channels) */ ) )
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_a52->p_aout, p_a52->p_aout_input );
p_a52->p_aout_input = NULL;
aout_InputDelete( p_dec->p_aout, p_dec->p_aout_input );
p_dec->p_aout_input = NULL;
}
/* Creating the audio input if not created yet. */
if( p_a52->p_aout_input == NULL )
if( p_dec->p_aout_input == NULL )
{
p_a52->output_format.i_rate = i_rate;
/* p_a52->output_format.i_channels = i_channels; */
p_a52->p_aout_input = aout_InputNew( p_a52->p_fifo,
&p_a52->p_aout,
&p_a52->output_format );
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 );
if ( p_a52->p_aout_input == NULL )
if ( p_dec->p_aout_input == NULL )
{
p_a52->p_fifo->b_error = 1;
p_dec->p_fifo->b_error = 1;
break;
}
}
/* Set the Presentation Time Stamp */
CurrentPTS( &p_a52->bit_stream, &pts, NULL );
CurrentPTS( &p_dec->bit_stream, &pts, NULL );
if ( pts != 0 )
{
p_a52->last_date = pts;
p_dec->last_date = pts;
}
/* Get the complete frame */
GetChunk( &p_a52->bit_stream, p_frame_buffer + 7,
GetChunk( &p_dec->bit_stream, p_frame_buffer + 7,
i_frame_size - 7 );
if( p_a52->p_fifo->b_die ) break;
if( p_dec->p_fifo->b_die ) break;
if( DecodeFrame( p_a52, p_frame_buffer ) )
if( DecodeFrame( p_dec, p_frame_buffer ) )
{
p_a52->p_fifo->b_error = 1;
p_dec->p_fifo->b_error = 1;
break;
}
}
/* If b_error is set, the decoder thread enters the error loop */
if( p_a52->p_fifo->b_error )
if( p_dec->p_fifo->b_error )
{
DecoderError( p_a52->p_fifo );
DecoderError( p_dec->p_fifo );
}
/* End of the liba52 decoder thread */
EndThread( p_a52 );
/* End of the a52 decoder thread */
EndThread( p_dec );
return 0;
}
......@@ -210,28 +236,28 @@ static int RunDecoder( decoder_fifo_t *p_fifo )
/*****************************************************************************
* InitThread: initialize data before entering main loop
*****************************************************************************/
static int InitThread( a52_thread_t * p_a52, decoder_fifo_t * p_fifo )
static int InitThread( a52_thread_t * p_dec, decoder_fifo_t * p_fifo )
{
/* Initialize the thread properties */
p_a52->p_aout = NULL;
p_a52->p_aout_input = NULL;
p_a52->p_fifo = p_fifo;
p_a52->output_format.i_format = AOUT_FMT_FLOAT32;
p_a52->output_format.i_channels = 2; /* FIXME ! */
p_a52->last_date = 0;
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_a52->p_a52_state = a52_init( 0 );
if( p_a52->p_a52_state == NULL )
p_dec->p_a52_state = a52_init( 0 );
if( p_dec->p_a52_state == NULL )
{
msg_Err( p_a52->p_fifo, "unable to initialize liba52" );
msg_Err( p_dec->p_fifo, "unable to initialize liba52" );
return -1;
}
p_a52->b_dynrng = config_GetInt( p_a52->p_fifo, "a52-dynrng" );
p_dec->b_dynrng = config_GetInt( p_dec->p_fifo, "a52-dynrng" );
/* Init the BitStream */
InitBitstream( &p_a52->bit_stream, p_a52->p_fifo,
/* Init the Bitstream */
InitBitstream( &p_dec->bit_stream, p_dec->p_fifo,
NULL, NULL );
return 0;
......@@ -240,7 +266,7 @@ static int InitThread( a52_thread_t * p_a52, decoder_fifo_t * p_fifo )
/*****************************************************************************
* Interleave: helper function to interleave channels
*****************************************************************************/
static void Interleave( float * p_out, float * p_in, int i_channels )
static void Interleave( float * p_out, const float * p_in, int i_channels )
{
int i, j;
......@@ -256,57 +282,57 @@ static void Interleave( float * p_out, float * p_in, int i_channels )
/*****************************************************************************
* DecodeFrame: decode an ATSC A/52 frame.
*****************************************************************************/
static int DecodeFrame( a52_thread_t * p_a52, u8 * p_frame_buffer )
static int DecodeFrame( a52_thread_t * p_dec, const byte_t * p_frame_buffer )
{
sample_t i_sample_level = 1;
aout_buffer_t * p_buffer;
int i, i_flags;
int i_bytes_per_block = 256 * p_a52->output_format.i_channels
int i_bytes_per_block = 256 * p_dec->output_format.i_channels
* sizeof(float);
if( !p_a52->last_date )
if( !p_dec->last_date )
{
/* We've just started the stream, wait for the first PTS. */
return 0;
}
p_buffer = aout_BufferNew( p_a52->p_aout, p_a52->p_aout_input,
A52DEC_FRAME_SIZE );
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_a52->last_date;
p_a52->last_date += (mtime_t)(A52DEC_FRAME_SIZE * 1000000)
/ p_a52->output_format.i_rate;
p_buffer->end_date = p_a52->last_date;
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;
/* FIXME */
i_flags = A52_STEREO | A52_ADJUST_LEVEL;
/* Do the actual decoding now */
a52_frame( p_a52->p_a52_state, p_frame_buffer,
a52_frame( p_dec->p_a52_state, p_frame_buffer,
&i_flags, &i_sample_level, 0 );
if( !p_a52->b_dynrng )
if( !p_dec->b_dynrng )
{
a52_dynrng( p_a52->p_a52_state, NULL, NULL );
a52_dynrng( p_dec->p_a52_state, NULL, NULL );
}
for ( i = 0; i < 6; i++ )
{
sample_t * p_samples;
if( a52_block( p_a52->p_a52_state ) )
if( a52_block( p_dec->p_a52_state ) )
{
msg_Warn( p_a52->p_fifo, "a52_block failed for block %i", i );
msg_Warn( p_dec->p_fifo, "a52_block failed for block %i", i );
}
p_samples = a52_samples( p_a52->p_a52_state );
p_samples = a52_samples( p_dec->p_a52_state );
/* Interleave the *$% samples */
Interleave( (float *)(p_buffer->p_buffer + i * i_bytes_per_block),
p_samples, p_a52->output_format.i_channels );
p_samples, p_dec->output_format.i_channels );
}
aout_BufferPlay( p_a52->p_aout, p_a52->p_aout_input, p_buffer );
aout_BufferPlay( p_dec->p_aout, p_dec->p_aout_input, p_buffer );
return 0;
}
......@@ -314,14 +340,14 @@ static int DecodeFrame( a52_thread_t * p_a52, u8 * p_frame_buffer )
/*****************************************************************************
* EndThread : liba52 decoder thread destruction
*****************************************************************************/
static void EndThread (a52_thread_t *p_a52)
static void EndThread( a52_thread_t * p_dec )
{
if ( p_a52->p_aout_input != NULL )
if ( p_dec->p_aout_input != NULL )
{
aout_InputDelete( p_a52->p_aout, p_a52->p_aout_input );
aout_InputDelete( p_dec->p_aout, p_dec->p_aout_input );
}
a52_free( p_a52->p_a52_state );
free( p_a52 );
a52_free( p_dec->p_a52_state );
free( p_dec );
}
/*****************************************************************************
* a52.h: 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/).
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: a52.h,v 1.2 2002/08/07 21:36:56 massiot Exp $
*
* Authors: 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
* 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.
*****************************************************************************/
/*****************************************************************************
* a52_thread_t : a52 decoder thread descriptor
*****************************************************************************/
typedef struct a52_thread_s
{
/*
* liba52 properties
*/
a52_state_t * p_a52_state;
vlc_bool_t b_dynrng;
/* The bit stream structure handles the PES stream at the bit level */
bit_stream_t bit_stream;
/*
* Input properties
*/
decoder_fifo_t * p_fifo; /* stores the PES stream data */
data_packet_t * p_data;
/*
* Output 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;
/*****************************************************************************
* spdif.c: A52 pass-through to external decoder with enabled soundcard
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: spdif.c,v 1.2 2002/08/08 00:35:11 sam Exp $
* Copyright (C) 2001-2002 VideoLAN
* $Id: spdif.c,v 1.1 2002/08/11 01:27:01 massiot Exp $
*
* Authors: Stphane Borel <stef@via.ecp.fr>
* Juha Yrjola <jyrjola@cc.hut.fi>
* German Gomez Garcia <german@piraos.com>
* Christophe Massiot <massiot@via.ecp.fr>
*
* 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
......@@ -39,7 +40,33 @@
# include <unistd.h>
#endif
#include "spdif.h"
#define A52_FRAME_SIZE 1536
/*****************************************************************************
* spdif_thread_t : A52 pass-through thread descriptor
*****************************************************************************/
typedef struct spdif_thread_s
{
/*
* Thread properties
*/
vlc_thread_t thread_id; /* id for thread functions */
/*
* Input properties
*/
decoder_fifo_t * p_fifo; /* stores the PES stream data */
/* The bit stream structure handles the PES stream at the bit level */
bit_stream_t bit_stream;
/*
* Output properties
*/
aout_instance_t * p_aout; /* opaque */
aout_input_t * p_aout_input; /* opaque */
audio_sample_format_t output_format;
} spdif_thread_t;
/****************************************************************************
* Local prototypes
......@@ -47,56 +74,10 @@
static int OpenDecoder ( vlc_object_t * );
static int RunDecoder ( decoder_fifo_t * );
static int InitThread ( spdif_thread_t * );
static void EndThread ( spdif_thread_t * );
static void BitstreamCallback ( bit_stream_t *, vlc_bool_t );
static int InitThread ( spdif_thread_t *, decoder_fifo_t * );
static void EndThread ( spdif_thread_t * );
int parse_syncinfo ( spdif_thread_t * );
/****************************************************************************
* Local structures and tables
****************************************************************************/
static const frame_size_t p_frame_size_code[64] =
{
{ 32 ,{64 ,69 ,96 } },
{ 32 ,{64 ,70 ,96 } },
{ 40 ,{80 ,87 ,120 } },
{ 40 ,{80 ,88 ,120 } },
{ 48 ,{96 ,104 ,144 } },
{ 48 ,{96 ,105 ,144 } },
{ 56 ,{112 ,121 ,168 } },
{ 56 ,{112 ,122 ,168 } },
{ 64 ,{128 ,139 ,192 } },
{ 64 ,{128 ,140 ,192 } },
{ 80 ,{160 ,174 ,240 } },
{ 80 ,{160 ,175 ,240 } },
{ 96 ,{192 ,208 ,288 } },
{ 96 ,{192 ,209 ,288 } },
{ 112 ,{224 ,243 ,336 } },
{ 112 ,{224 ,244 ,336 } },
{ 128 ,{256 ,278 ,384 } },
{ 128 ,{256 ,279 ,384 } },
{ 160 ,{320 ,348 ,480 } },
{ 160 ,{320 ,349 ,480 } },
{ 192 ,{384 ,417 ,576 } },
{ 192 ,{384 ,418 ,576 } },
{ 224 ,{448 ,487 ,672 } },
{ 224 ,{448 ,488 ,672 } },
{ 256 ,{512 ,557 ,768 } },
{ 256 ,{512 ,558 ,768 } },
{ 320 ,{640 ,696 ,960 } },
{ 320 ,{640 ,697 ,960 } },
{ 384 ,{768 ,835 ,1152 } },
{ 384 ,{768 ,836 ,1152 } },
{ 448 ,{896 ,975 ,1344 } },
{ 448 ,{896 ,976 ,1344 } },
{ 512 ,{1024 ,1114 ,1536 } },
{ 512 ,{1024 ,1115 ,1536 } },
{ 576 ,{1152 ,1253 ,1728 } },
{ 576 ,{1152 ,1254 ,1728 } },
{ 640 ,{1280 ,1393 ,1920 } },
{ 640 ,{1280 ,1394 ,1920 } }
};
int SyncInfo ( const byte_t *, int *, int *, int * );
/*****************************************************************************
* Module descriptor
......@@ -135,297 +116,267 @@ static int OpenDecoder( vlc_object_t *p_this )
****************************************************************************/
static int RunDecoder( decoder_fifo_t *p_fifo )
{
spdif_thread_t * p_spdif;
mtime_t i_frame_time;
vlc_bool_t b_sync;
/* PTS of the current frame */
mtime_t i_current_pts = 0;
u16 i_length;
spdif_thread_t * p_dec;
mtime_t last_date = 0;
/* Allocate the memory needed to store the thread's structure */
p_spdif = malloc( sizeof(spdif_thread_t) );
if( p_spdif == NULL )
p_dec = malloc( sizeof(spdif_thread_t) );
if( p_dec == NULL )
{
msg_Err( p_fifo, "out of memory" );
DecoderError( p_fifo );
return( -1 );
return -1;
}
p_spdif->p_fifo = p_fifo;
if (InitThread( p_spdif ) )
if ( InitThread( p_dec, p_fifo ) )
{
if( p_fifo->b_error )
{
msg_Err( p_fifo, "could not initialize thread" );
}
msg_Err( p_fifo, "could not initialize thread" );
DecoderError( p_fifo );
free( p_spdif );
return( -1 );
free( p_dec );
return -1;
}
/* Compute the theorical duration of an A52 frame */
i_frame_time = 1000000 * A52_FRAME_SIZE /
p_spdif->info.i_sample_rate;
i_length = p_spdif->info.i_frame_size;
while( !p_spdif->p_fifo->b_die && !p_spdif->p_fifo->b_error )
/* liba52 decoder thread's main loop */