]> git.sesse.net Git - vlc/blobdiff - modules/codec/a52.c
input: Expose input_ItemHasErrorWhenReading.
[vlc] / modules / codec / a52.c
index 9ec4ccf25e9482940cbf9abfbf8d10f0328220d2..fec3f80ae1d0c838fa3b3cbefd8d0b4adc6d5ab7 100644 (file)
@@ -1,19 +1,18 @@
 /*****************************************************************************
- * 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.1 2002/08/11 01:27:01 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_input.h>
+#include <vlc_block_helper.h>
 
-#define A52_FRAME_SIZE 1536 
+#define A52_HEADER_SIZE 7
 
 /*****************************************************************************
- * a52_thread_t : a52 decoder thread descriptor
+ * decoder_sys_t : decoder descriptor
  *****************************************************************************/
-typedef struct a52_thread_s
+struct decoder_sys_t
 {
-    /*
-     * 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;
+    /* 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;
+    audio_date_t   end_date;
 
-/*****************************************************************************
+    mtime_t i_pts;
+    int i_frame_size, i_bit_rate;
+    unsigned int i_rate, i_channels, i_channels_conf;
+
+    int i_input_rate;
+};
+
+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 *, const byte_t * );
-static int  InitThread     ( a52_thread_t *, decoder_fifo_t * );
-static void EndThread      ( a52_thread_t * );
+ ****************************************************************************/
+static int  OpenDecoder   ( vlc_object_t * );
+static int  OpenPacketizer( vlc_object_t * );
+static void CloseDecoder  ( vlc_object_t * );
+static void *DecodeBlock  ( decoder_t *, block_t ** );
+
+static int  SyncInfo      ( const uint8_t *, unsigned int *, unsigned int *,
+                            unsigned int *, int * );
+
+static uint8_t       *GetOutBuffer ( decoder_t *, void ** );
+static aout_buffer_t *GetAoutBuffer( decoder_t * );
+static block_t       *GetSoutBuffer( decoder_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 );
+    set_description( N_("A/52 parser") );
+    set_capability( "decoder", 100 );
+    set_callbacks( OpenDecoder, CloseDecoder );
+    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, CloseDecoder );
 vlc_module_end();
 
 /*****************************************************************************
  * OpenDecoder: probe the decoder and return score
- *****************************************************************************
- * Tries to launch a decoder and return score so that the interface is able
- * to choose.
  *****************************************************************************/
 static int OpenDecoder( vlc_object_t *p_this )
 {
-    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;
+
+    if( p_dec->fmt_in.i_codec != VLC_FOURCC('a','5','2',' ')
+          && p_dec->fmt_in.i_codec != VLC_FOURCC('a','5','2','b') )
+    {
         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 = false;
+    p_sys->i_state = STATE_NOSYNC;
+    aout_DateSet( &p_sys->end_date, 0 );
+
+    p_sys->bytestream = block_BytestreamInit();
+    p_sys->i_input_rate = INPUT_RATE_DEFAULT;
+
+    /* Set output properties */
+    p_dec->fmt_out.i_cat = AUDIO_ES;
+    p_dec->fmt_out.i_codec = VLC_FOURCC('a','5','2',' ');
+    p_dec->fmt_out.audio.i_rate = 0; /* So end_date gets initialized */
+
+    /* Set callback */
+    p_dec->pf_decode_audio = (aout_buffer_t *(*)(decoder_t *, block_t **))
+        DecodeBlock;
+    p_dec->pf_packetize    = (block_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 OpenPacketizer( vlc_object_t *p_this )
 {
-    a52_thread_t *p_dec;
+    decoder_t *p_dec = (decoder_t*)p_this;
 
-    /* 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;
-    }
+    int i_ret = OpenDecoder( p_this );
 
-    if( InitThread( p_dec, p_fifo ) )
-    {
-        msg_Err( p_dec->p_fifo, "could not initialize thread" );
-        DecoderError( p_fifo );
-        free( p_dec );
-        return -1;
-    }
+    if( i_ret == VLC_SUCCESS ) p_dec->p_sys->b_packetizer = true;
+
+    return i_ret;
+}
 
-    /* liba52 decoder thread's main loop */
-    while( !p_dec->p_fifo->b_die && !p_dec->p_fifo->b_error )
+/****************************************************************************
+ * 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[A52_HEADER_SIZE];
+    uint8_t *p_buf;
+    void *p_out_buffer;
+
+    if( !pp_block || !*pp_block ) return NULL;
+
+    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_BytestreamFlush( &p_sys->bytestream );
         }
+//        aout_DateSet( &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( !aout_DateGet( &p_sys->end_date ) && !(*pp_block)->i_pts )
+    {
+        /* We've just started the stream, wait for the first PTS. */
+        block_Release( *pp_block );
+        return NULL;
+    }
 
-        /* Check if frame is valid and get frame info */
-        i_frame_size = a52_syncinfo( p_frame_buffer, &i_flags, &i_rate,
-                                     &i_bit_rate );
+    if( (*pp_block)->i_rate > 0 )
+        p_sys->i_input_rate = (*pp_block)->i_rate;
 
-        if( !i_frame_size )
-        {
-            msg_Warn( p_dec->p_fifo, "a52_syncinfo failed" );
-            continue;
-        }
+    block_BytestreamPush( &p_sys->bytestream, *pp_block );
 
-        if( (p_dec->p_aout_input != NULL) &&
-            ( (p_dec->output_format.i_rate != i_rate)
-               /* || (p_dec->output_format.i_channels != i_channels) */ ) )
+    while( 1 )
+    {
+        switch( p_sys->i_state )
         {
-            /* Parameters changed - this should not happen. */
-            aout_InputDelete( p_dec->p_aout, p_dec->p_aout_input );
-            p_dec->p_aout_input = NULL;
-        }
+        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 );
 
-        /* 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 );
+                /* Need more data */
+                return NULL;
+            }
 
-            if ( p_dec->p_aout_input == NULL )
+        case STATE_SYNC:
+            /* New frame, set the Presentation Time Stamp */
+            p_sys->i_pts = p_sys->bytestream.p_block->i_pts;
+            if( p_sys->i_pts != 0 &&
+                p_sys->i_pts != aout_DateGet( &p_sys->end_date ) )
             {
-                p_dec->p_fifo->b_error = 1;
+                aout_DateSet( &p_sys->end_date, p_sys->i_pts );
+            }
+            p_sys->i_state = STATE_HEADER;
+
+        case STATE_HEADER:
+            /* Get A/52 frame header (A52_HEADER_SIZE bytes) */
+            if( block_PeekBytes( &p_sys->bytestream, p_header,
+                                 A52_HEADER_SIZE ) != VLC_SUCCESS )
+            {
+                /* Need more data */
+                return NULL;
+            }
+
+            /* Check if frame is valid and get frame info */
+            p_sys->i_frame_size = SyncInfo( p_header,
+                                            &p_sys->i_channels,
+                                            &p_sys->i_channels_conf,
+                                            &p_sys->i_rate,
+                                            &p_sys->i_bit_rate );
+            if( !p_sys->i_frame_size )
+            {
+                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;
 
-        /* Set the Presentation Time Stamp */
-        CurrentPTS( &p_dec->bit_stream, &pts, NULL );
-        if ( pts != 0 )
-        {
-            p_dec->last_date = pts;
-        }
+        case STATE_NEXT_SYNC:
+            /* TODO: If pp_block == NULL, flush the buffer without checking the
+             * next sync word */
 
-        /* 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;
+            /* Check if next expected frame contains the sync word */
+            if( block_PeekOffsetBytes( &p_sys->bytestream,
+                                       p_sys->i_frame_size, p_header, 2 )
+                != VLC_SUCCESS )
+            {
+                /* Need more data */
+                return NULL;
+            }
 
-        if( DecodeFrame( p_dec, p_frame_buffer ) )
-        {
-            p_dec->p_fifo->b_error = 1;
+            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->i_frame_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, p_sys->i_frame_size );
 
-/*****************************************************************************
- * 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 = 0;
 
-    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 p_out_buffer;
+        }
+    }
 
-    return 0;
+    return NULL;
 }
 
 /*****************************************************************************
- * Interleave: helper function to interleave channels
+ * CloseDecoder: clean up the decoder
  *****************************************************************************/
-static void Interleave( float * p_out, const float * p_in, int i_channels )
+static void CloseDecoder( 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, const byte_t * p_frame_buffer )
+static uint8_t *GetOutBuffer( decoder_t *p_dec, void **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->i_rate )
     {
-        /* We've just started the stream, wait for the first PTS. */
-        return 0;
+        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 );
+
+        aout_DateInit( &p_sys->end_date, p_sys->i_rate );
+        aout_DateSet( &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->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 = A52_FRAME_NB;
 
-    /* FIXME */
-    i_flags = A52_STEREO | A52_ADJUST_LEVEL;
+    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;
 
-    /* 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->i_bit_rate;
 
-    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 = p_dec->pf_aout_buffer_new( p_dec, A52_FRAME_NB  );
+    if( p_buf == NULL ) return NULL;
 
-    aout_BufferPlay( p_dec->p_aout, p_dec->p_aout_input, p_buffer );
+    p_buf->start_date = aout_DateGet( &p_sys->end_date );
+    p_buf->end_date = aout_DateIncrement( &p_sys->end_date,
+                                          A52_FRAME_NB * p_sys->i_input_rate / INPUT_RATE_DEFAULT );
 
-    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 )
+    decoder_sys_t *p_sys = p_dec->p_sys;
+    block_t *p_block;
+
+    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 );
+
+    p_block->i_length =
+        aout_DateIncrement( &p_sys->end_date,
+                            A52_FRAME_NB * p_sys->i_input_rate / INPUT_RATE_DEFAULT ) -
+            p_block->i_pts;
+
+    return p_block;
+}
+
+/*****************************************************************************
+ * SyncInfo: parse A/52 sync info
+ *****************************************************************************
+ * This code is borrowed from liba52 by Aaron Holtzman & Michel Lespinasse,
+ * since we don't want to oblige S/PDIF people to use liba52 just to get
+ * their SyncInfo...
+ *****************************************************************************/
+static int SyncInfo( const uint8_t * p_buf,
+                     unsigned int * pi_channels,
+                     unsigned int * pi_channels_conf,
+                     unsigned int * pi_sample_rate, int * pi_bit_rate )
+{
+    static const uint8_t halfrate[12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3 };
+    static const int rate[] = { 32,  40,  48,  56,  64,  80,  96, 112,
+                                128, 160, 192, 224, 256, 320, 384, 448,
+                                512, 576, 640 };
+    static const uint8_t lfeon[8] = { 0x10, 0x10, 0x04, 0x04,
+                                      0x04, 0x01, 0x04, 0x01 };
+    int frmsizecod;
+    int bitrate;
+    int half;
+    int acmod;
+
+    if ((p_buf[0] != 0x0b) || (p_buf[1] != 0x77))        /* syncword */
+        return 0;
+
+    if (p_buf[5] >= 0x60)                /* bsid >= 12 */
+        return 0;
+    half = halfrate[p_buf[5] >> 3];
+
+    /* acmod, dsurmod and lfeon */
+    acmod = p_buf[6] >> 5;
+    if ( (p_buf[6] & 0xf8) == 0x50 )
+    {
+        /* Dolby surround = stereo + Dolby */
+        *pi_channels = 2;
+        *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
+                            | AOUT_CHAN_DOLBYSTEREO;
+    }
+    else switch ( acmod )
     {
-        aout_InputDelete( p_dec->p_aout, p_dec->p_aout_input );
+    case 0x0:
+        /* Dual-mono = stereo + dual-mono */
+        *pi_channels = 2;
+        *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
+                            | AOUT_CHAN_DUALMONO;
+        break;
+    case 0x1:
+        /* Mono */
+        *pi_channels = 1;
+        *pi_channels_conf = AOUT_CHAN_CENTER;
+        break;
+    case 0x2:
+        /* Stereo */
+        *pi_channels = 2;
+        *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
+        break;
+    case 0x3:
+        /* 3F */
+        *pi_channels = 3;
+        *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
+                            | AOUT_CHAN_CENTER;
+        break;
+    case 0x4:
+        /* 2F1R */
+        *pi_channels = 3;
+        *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
+                            | AOUT_CHAN_REARCENTER;
+        break;
+    case 0x5:
+        /* 3F1R */
+        *pi_channels = 4;
+        *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+                            | AOUT_CHAN_REARCENTER;
+        break;
+    case 0x6:
+        /* 2F2R */
+        *pi_channels = 4;
+        *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
+                            | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
+        break;
+    case 0x7:
+        /* 3F2R */
+        *pi_channels = 5;
+        *pi_channels_conf = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+                            | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
+        break;
+    default:
+        return 0;
     }
 
-    a52_free( p_dec->p_a52_state );
-    free( p_dec );
-}
+    if ( p_buf[6] & lfeon[acmod] )
+    {
+        (*pi_channels)++;
+        *pi_channels_conf |= AOUT_CHAN_LFE;
+    }
 
+    frmsizecod = p_buf[4] & 63;
+    if (frmsizecod >= 38)
+        return 0;
+    bitrate = rate [frmsizecod >> 1];
+    *pi_bit_rate = (bitrate * 1000) >> half;
+
+    switch (p_buf[4] & 0xc0) {
+    case 0:
+        *pi_sample_rate = 48000 >> half;
+        return 4 * bitrate;
+    case 0x40:
+        *pi_sample_rate = 44100 >> half;
+        return 2 * (320 * bitrate / 147 + (frmsizecod & 1));
+    case 0x80:
+        *pi_sample_rate = 32000 >> half;
+        return 6 * bitrate;
+    default:
+        return 0;
+    }
+}