* Modification de l'input afin de spawner un d�codeur ac3 lorsqu'un tel flux

est d�tect� ;

* Impl�mentation du d�codeur ac3 ;

* Il est rewlz(ac3dec) - 2h00 :-)

Makefile

@@ -176,7 +176,14 @@ video_output_obj = 		video_output/video_output.o \
 						video_output/video_$(video).o \
 						video_output/video_yuv_c.o
 
-ac3_decoder_obj =		ac3_decoder/ac3_decoder.o
+ac3_decoder_obj =		ac3_decoder/ac3_decoder.o \
+						ac3_decoder/ac3_parse.o \
+						ac3_decoder/ac3_exponent.o \
+						ac3_decoder/ac3_bit_allocate.o \
+						ac3_decoder/ac3_mantissa.o \
+						ac3_decoder/ac3_rematrix.o \
+						ac3_decoder/ac3_imdct.o \
+						ac3_decoder/ac3_downmix.o
 
 audio_decoder_obj =		audio_decoder/audio_decoder.o \
 						audio_decoder/audio_math.o

include/ac3_bit_allocate.h

+void bit_allocate( ac3dec_thread_t * );

include/ac3_decoder.h

@@ -3,6 +3,320 @@
  * (c)1999 VideoLAN
  *****************************************************************************/
 
+/* Exponent strategy constants */
+#define EXP_REUSE       (0)
+#define EXP_D15         (1)
+#define EXP_D25         (2)
+#define EXP_D45         (3)
+
+/* Delta bit allocation constants */
+#define DELTA_BIT_REUSE         (0)
+#define DELTA_BIT_NEW           (1)
+#define DELTA_BIT_NONE          (2)
+#define DELTA_BIT_RESERVED      (3)
+
+/* The following structures are filled in by their corresponding parse_*
+ * functions. See http://www.atsc.org/Standards/A52/a_52.pdf for
+ * full details on each field. Indented fields are used to denote
+ * conditional fields.
+ */
+
+typedef struct syncinfo_s
+{
+	/* Sync word == 0x0B77 */
+	/* u16   syncword; */
+	/* crc for the first 5/8 of the sync block */
+	/* u16   crc1; */
+	/* Stream Sampling Rate (kHz) 0 = 48, 1 = 44.1, 2 = 32, 3 = reserved */
+	u16		fscod;	
+	/* Frame size code */
+	u16		frmsizecod;
+
+	/* Information not in the AC-3 bitstream, but derived */
+	/* Frame size in 16 bit words */
+	u16 frame_size;
+	/* Bit rate in kilobits */
+	u16 bit_rate;
+
+} syncinfo_t;
+
+typedef struct bsi_s
+{
+	/* Bit stream identification == 0x8 */
+	u16 bsid;	
+	/* Bit stream mode */
+	u16 bsmod;
+	/* Audio coding mode */
+	u16 acmod;
+	/* If we're using the centre channel then */
+		/* centre mix level */
+		u16 cmixlev;
+	/* If we're using the surround channel then */
+		/* surround mix level */
+		u16 surmixlev;
+	/* If we're in 2/0 mode then */
+		/* Dolby surround mix level - NOT USED - */
+		u16 dsurmod;
+	/* Low frequency effects on */
+	u16 lfeon;
+	/* Dialogue Normalization level */
+	u16 dialnorm;
+	/* Compression exists */
+	u16 compre;
+		/* Compression level */
+		u16 compr;
+	/* Language code exists */
+	u16 langcode;
+		/* Language code */
+		u16 langcod;
+	/* Audio production info exists*/
+	u16 audprodie;
+		u16 mixlevel;
+		u16 roomtyp;
+	/* If we're in dual mono mode (acmod == 0) then extra stuff */
+		u16 dialnorm2;
+		u16 compr2e;
+			u16 compr2;
+		u16 langcod2e;
+			u16 langcod2;
+		u16 audprodi2e;
+			u16 mixlevel2;
+			u16 roomtyp2;
+	/* Copyright bit */
+	u16 copyrightb;
+	/* Original bit */
+	u16 origbs;
+	/* Timecode 1 exists */
+	u16 timecod1e;
+		/* Timecode 1 */
+		u16 timecod1;
+	/* Timecode 2 exists */
+	u16 timecod2e;
+		/* Timecode 2 */
+		u16 timecod2;
+	/* Additional bit stream info exists */
+	u16 addbsie;
+		/* Additional bit stream length - 1 (in bytes) */
+		u16 addbsil;
+		/* Additional bit stream information (max 64 bytes) */
+		u8	addbsi[64];
+
+	/* Information not in the AC-3 bitstream, but derived */
+	/* Number of channels (excluding LFE)
+	 * Derived from acmod */
+	u16 nfchans;
+
+} bsi_t;
+
+/* more pain */
+typedef struct audblk_s
+{
+	/* block switch bit indexed by channel num */
+	u16 blksw[5];
+	/* dither enable bit indexed by channel num */
+	u16 dithflag[5];
+	/* dynamic range gain exists */
+	u16 dynrnge;
+		/* dynamic range gain */
+		u16 dynrng;
+	/* if acmod==0 then */
+	/* dynamic range 2 gain exists */
+	u16 dynrng2e;
+		/* dynamic range 2 gain */
+		u16 dynrng2;
+	/* coupling strategy exists */
+	u16 cplstre;
+		/* coupling in use */
+		u16 cplinu;
+			/* channel coupled */
+			u16 chincpl[5];
+			/* if acmod==2 then */
+				/* Phase flags in use */
+				u16 phsflginu;
+			/* coupling begin frequency code */
+			u16 cplbegf;
+			/* coupling end frequency code */
+			u16 cplendf;
+			/* coupling band structure bits */
+			u16 cplbndstrc[18];
+			/* Do coupling co-ords exist for this channel? */
+			u16 cplcoe[5];
+			/* Master coupling co-ordinate */
+			u16 mstrcplco[5];
+			/* Per coupling band coupling co-ordinates */
+			u16 cplcoexp[5][18];
+			u16	cplcomant[5][18];
+			/* Phase flags for dual mono */
+			u16 phsflg[18];
+	/* Is there a rematrixing strategy */
+	u16 rematstr;
+		/* Rematrixing bits */
+		u16 rematflg[4];
+	/* Coupling exponent strategy */
+	u16 cplexpstr;
+	/* Exponent strategy for full bandwidth channels */
+	u16 chexpstr[5];
+	/* Exponent strategy for lfe channel */
+	u16 lfeexpstr;
+	/* Channel bandwidth for independent channels */
+	u16 chbwcod[5];
+		/* The absolute coupling exponent */
+		u16 cplabsexp;
+		/* Coupling channel exponents (D15 mode gives 18 * 12 /3  encoded exponents */
+		u16 cplexps[18 * 12 / 3];
+	/* Sanity checking constant */
+	u32	magic2;
+	/* fbw channel exponents */
+	u16 exps[5][252 / 3];
+	/* channel gain range */
+	u16 gainrng[5];
+	/* low frequency exponents */
+	u16 lfeexps[3];
+
+	/* Bit allocation info */
+	u16 baie;
+		/* Slow decay code */
+		u16 sdcycod;
+		/* Fast decay code */
+		u16 fdcycod;
+		/* Slow gain code */
+		u16 sgaincod;
+		/* dB per bit code */
+		u16 dbpbcod;
+		/* masking floor code */
+		u16 floorcod;
+
+	/* SNR offset info */
+	u16 snroffste;
+		/* coarse SNR offset */
+		u16 csnroffst;
+		/* coupling fine SNR offset */
+		u16 cplfsnroffst;
+		/* coupling fast gain code */
+		u16 cplfgaincod;
+		/* fbw fine SNR offset */
+		u16 fsnroffst[5];
+		/* fbw fast gain code */
+		u16 fgaincod[5];
+		/* lfe fine SNR offset */
+		u16 lfefsnroffst;
+		/* lfe fast gain code */
+		u16 lfefgaincod;
+	
+	/* Coupling leak info */
+	u16 cplleake;
+		/* coupling fast leak initialization */
+		u16 cplfleak;
+		/* coupling slow leak initialization */
+		u16 cplsleak;
+	
+	/* delta bit allocation info */
+	u16 deltbaie;
+		/* coupling delta bit allocation exists */
+		u16 cpldeltbae;
+		/* fbw delta bit allocation exists */
+		u16 deltbae[5];
+		/* number of cpl delta bit segments */
+		u16 cpldeltnseg;
+			/* coupling delta bit allocation offset */
+			u16 cpldeltoffst[8];
+			/* coupling delta bit allocation length */
+			u16 cpldeltlen[8];
+			/* coupling delta bit allocation length */
+			u16 cpldeltba[8];
+		/* number of delta bit segments */
+		u16 deltnseg[5];
+			/* fbw delta bit allocation offset */
+			u16 deltoffst[5][8];
+			/* fbw delta bit allocation length */
+			u16 deltlen[5][8];
+			/* fbw delta bit allocation length */
+			u16 deltba[5][8];
+
+	/* skip length exists */
+	u16 skiple;
+		/* skip length */
+		u16 skipl;
+
+	/* channel mantissas */
+//	u16	chmant[5][256];
+
+	/* coupling mantissas */
+	float cplfbw[ 256 ];
+//	u16	cplmant[256];
+
+	/* coupling mantissas */
+//	u16	lfemant[7];
+
+	/*  -- Information not in the bitstream, but derived thereof  -- */
+
+	/* Number of coupling sub-bands */
+	u16 ncplsubnd;
+
+	/* Number of combined coupling sub-bands
+	 * Derived from ncplsubnd and cplbndstrc */
+	u16 ncplbnd;
+
+	/* Number of exponent groups by channel
+	 * Derived from strmant, endmant */
+	u16 nchgrps[5];
+
+	/* Number of coupling exponent groups
+	 * Derived from cplbegf, cplendf, cplexpstr */
+	u16 ncplgrps;
+			
+	/* End mantissa numbers of fbw channels */
+	u16 endmant[5];
+
+	/* Start and end mantissa numbers for the coupling channel */
+	u16 cplstrtmant;
+	u16 cplendmant;
+
+	/* Decoded exponent info */
+	u16 fbw_exp[5][256];
+	u16 cpl_exp[256];
+	u16 lfe_exp[7];
+
+	/* Bit allocation pointer results */
+	u16 fbw_bap[5][256];
+	//FIXME figure out exactly how many entries there should be (253-37?) 
+	u16 cpl_bap[256];
+	u16 lfe_bap[7];
+
+} audblk_t;
+
+/* Everything you wanted to know about band structure */
+/*
+ * The entire frequency domain is represented by 256 real
+ * floating point fourier coefficients. Only the lower 253
+ * coefficients are actually utilized however. We use arrays
+ * of 256 to be efficient in some cases.
+ *
+ * The 5 full bandwidth channels (fbw) can have their higher
+ * frequencies coupled together. These coupled channels then
+ * share their high frequency components.
+ *
+ * This coupling band is broken up into 18 sub-bands starting
+ * at mantissa number 37. Each sub-band is 12 bins wide.
+ *
+ * There are 50 bit allocation sub-bands which cover the entire
+ * frequency range. The sub-bands are of non-uniform width, and
+ * approximate a 1/6 octave scale.
+ */
+
+typedef struct stream_coeffs_s
+{
+	float fbw[5][256];
+	float lfe[256];
+
+} stream_coeffs_t;
+
+typedef struct stream_samples_s
+{
+	float channel[6][256];
+
+} stream_samples_t;
+
 #define AC3DEC_FRAME_SIZE (2*256)
 
 /*****************************************************************************
@@ -34,6 +348,13 @@ typedef struct ac3dec_thread_s
      */
     unsigned int        total_bits_read;
 
+    syncinfo_t          syncinfo;
+    bsi_t               bsi;
+    audblk_t            audblk;
+
+    stream_coeffs_t     coeffs;
+    stream_samples_t    samples;
+
     /*
      * Output properties
      */

include/ac3_downmix.h

+void downmix( ac3dec_thread_t *, s16 * );

include/ac3_exponent.h

+#define UNPACK_FBW  1
+#define UNPACK_CPL  2
+#define UNPACK_LFE  4
+
+void exponent_unpack( ac3dec_thread_t * );

include/ac3_imdct.h

+void imdct( ac3dec_thread_t * p_ac3dec );
+void imdct_init( void );

include/ac3_mantissa.h

+void mantissa_unpack( ac3dec_thread_t * );

include/ac3_parse.h

+void parse_syncinfo( ac3dec_thread_t * );
+void parse_bsi( ac3dec_thread_t * );
+void parse_audblk( ac3dec_thread_t * );
+void parse_auxdata( ac3dec_thread_t * );

include/ac3_rematrix.h

+void rematrix( ac3dec_thread_t * );

include/input.h

@@ -164,7 +164,7 @@ typedef struct
 #define MPEG2_VIDEO_ES          0x02
 #define MPEG1_AUDIO_ES          0x03
 #define MPEG2_AUDIO_ES          0x04
-
+#define AC3_AUDIO_ES            0x81
 
 /******************************************************************************
  * program_descriptor_t

src/ac3_decoder/ac3_decoder.c

@@ -6,6 +6,10 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
 #include <unistd.h>                                              /* getpid() */
 
 #include <stdio.h>                                           /* "intf_msg.h" */
@@ -28,6 +32,13 @@
 #include "audio_output.h"
 
 #include "ac3_decoder.h"
+#include "ac3_parse.h"
+#include "ac3_exponent.h"
+#include "ac3_bit_allocate.h"
+#include "ac3_mantissa.h"
+#include "ac3_rematrix.h"
+#include "ac3_imdct.h"
+#include "ac3_downmix.h"
 
 /*****************************************************************************
  * Local prototypes
@@ -85,6 +96,8 @@ ac3dec_thread_t * ac3dec_CreateThread( input_thread_t * p_input )
     p_ac3dec->p_aout = p_input->p_aout;
     p_ac3dec->p_aout_fifo = NULL;
 
+    imdct_init();
+
     /* Spawn the ac3 decoder thread */
     if ( vlc_thread_create(&p_ac3dec->thread_id, "ac3 decoder", (vlc_thread_func_t)RunThread, (void *)p_ac3dec) )
     {
@@ -177,6 +190,10 @@ static int InitThread( ac3dec_thread_t * p_ac3dec )
  *****************************************************************************/
 static void RunThread( ac3dec_thread_t * p_ac3dec )
 {
+    int i;
+    mtime_t mdate = 0;
+    byte_t byte;
+
     intf_DbgMsg( "ac3dec debug: running ac3 decoder thread (%p) (pid == %i)\n", p_ac3dec, getpid() );
 
     /* Initializing the ac3 decoder thread */
@@ -185,14 +202,39 @@ static void RunThread( ac3dec_thread_t * p_ac3dec )
         p_ac3dec->b_error = 1;
     }
 
+    i = open( "/tmp/taxi.ac3", O_WRONLY|O_CREAT|O_TRUNC );
     /* ac3 decoder thread's main loop */
     while ( (!p_ac3dec->b_die) && (!p_ac3dec->b_error) )
     {
-        if ( decode_find_sync(p_ac3dec) == 0 )
+	    byte = GetByte( &(p_ac3dec->bit_stream) );
+	    write( i, &byte, 1 );
+#if 0
+        decode_find_sync( p_ac3dec );
+	parse_syncinfo( p_ac3dec );
+	parse_bsi( p_ac3dec );
+        for ( i = 0; i < 6; i++ )
         {
-            fprintf( stderr, "ac3dec debug: decode_find_sync() == 0\n" );
+            parse_audblk( p_ac3dec );
+            exponent_unpack( p_ac3dec );
+            bit_allocate( p_ac3dec );
+            mantissa_unpack( p_ac3dec );
+            if ( p_ac3dec->bsi.acmod == 0x2 )
+            {
+                rematrix( p_ac3dec );
+            }
+            imdct( p_ac3dec );
+
+	    vlc_mutex_lock( &p_ac3dec->p_aout_fifo->data_lock );
+	    downmix( p_ac3dec, ((ac3dec_frame_t *)p_ac3dec->p_aout_fifo->buffer)[ p_ac3dec->p_aout_fifo->l_end_frame ] );
+	    p_ac3dec->p_aout_fifo->date[p_ac3dec->p_aout_fifo->l_end_frame] = mdate;
+	    p_ac3dec->p_aout_fifo->l_end_frame = (p_ac3dec->p_aout_fifo->l_end_frame + 1) & AOUT_FIFO_SIZE;
+	    vlc_mutex_unlock( &p_ac3dec->p_aout_fifo->data_lock );
+	    mdate += 5333;
         }
+        parse_auxdata( p_ac3dec );
+#endif
     }
+    close( i );
 
     /* If b_error is set, the ac3 decoder thread enters the error loop */
     if ( p_ac3dec->b_error )

src/ac3_decoder/ac3_exponent.c

+#include <unistd.h>                                              /* getpid() */
+
+#include <stdio.h>                                           /* "intf_msg.h" */
+#include <stdlib.h>                                      /* malloc(), free() */
+#include <sys/soundcard.h>                               /* "audio_output.h" */
+#include <sys/uio.h>                                            /* "input.h" */
+
+#include "common.h"
+#include "config.h"
+#include "mtime.h"
+#include "vlc_thread.h"
+#include "debug.h"                                      /* "input_netlist.h" */
+
+#include "intf_msg.h"                        /* intf_DbgMsg(), intf_ErrMsg() */
+
+#include "input.h"                                           /* pes_packet_t */
+#include "input_netlist.h"                         /* input_NetlistFreePES() */
+#include "decoder_fifo.h"         /* DECODER_FIFO_(ISEMPTY|START|INCSTART)() */
+
+#include "audio_output.h"
+
+#include "ac3_decoder.h"
+#include "ac3_exponent.h"
+
+static const s16 exps_1[128] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5 };
+static const s16 exps_2[128] = { 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 0, 0, 0 };
+static const s16 exps_3[128] = { 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2, 3, 4, 0, 1, 2 };
+
+static __inline__ void exp_unpack_ch( u16 type, u16 expstr, u16 ngrps, u16 initial_exp, u16 exps[], u16 * dest )
+{
+	u16 i,j;
+	s16 exp_acc;
+	/*
+	s16 exp_1,exp_2,exp_3;
+	*/
+
+	if(expstr == EXP_REUSE)
+		return;
+
+	/* Handle the initial absolute exponent */
+	exp_acc = initial_exp;
+	j = 0;
+
+	/* In the case of a fbw channel then the initial absolute values is 
+	 * also an exponent */
+	if(type != UNPACK_CPL)
+		dest[j++] = exp_acc;
+
+	/* Loop through the groups and fill the dest array appropriately */
+	for ( i = 0; i < ngrps; i++ )
+	{
+		/*
+		if ( exps[i] > 124 )
+		{
+			//FIXME set an error flag and mute the frame
+			printf( "\n!! Invalid exponent !!\n" );
+			exit( 1 );
+		}
+		*/
+
+		/*
+		exp_1 = exps[i] / 25;
+		exp_2 = (exps[i] - (exp_1 * 25)) / 5;
+		exp_3 = exps[i] - (exp_1 * 25) - (exp_2 * 5) ;
+		*/
+
+		switch ( expstr )
+		{
+			case EXP_D45:
+				exp_acc += (exps_1[exps[i]] - 2);
+				dest[j++] = exp_acc;
+				dest[j++] = exp_acc;
+				dest[j++] = exp_acc;
+				dest[j++] = exp_acc;
+				exp_acc += (exps_2[exps[i]] - 2);
+				dest[j++] = exp_acc;
+				dest[j++] = exp_acc;
+				dest[j++] = exp_acc;
+				dest[j++] = exp_acc;
+				exp_acc += (exps_3[exps[i]] - 2);
+				dest[j++] = exp_acc;
+				dest[j++] = exp_acc;
+				dest[j++] = exp_acc;
+				dest[j++] = exp_acc;
+			break;
+
+			case EXP_D25:
+				exp_acc += (exps_1[exps[i]] - 2);
+				dest[j++] = exp_acc;
+				dest[j++] = exp_acc;
+				exp_acc += (exps_2[exps[i]] - 2);
+				dest[j++] = exp_acc;
+				dest[j++] = exp_acc;
+				exp_acc += (exps_3[exps[i]] - 2);
+				dest[j++] = exp_acc;
+				dest[j++] = exp_acc;
+			break;
+
+			case EXP_D15:
+				exp_acc += (exps_1[exps[i]] - 2);
+				dest[j++] = exp_acc;
+				exp_acc += (exps_2[exps[i]] - 2);
+				dest[j++] = exp_acc;
+				exp_acc += (exps_3[exps[i]] - 2);
+				dest[j++] = exp_acc;
+			break;
+		}
+	}
+}
+
+void exponent_unpack( ac3dec_thread_t * p_ac3dec )
+{
+	u16 i;
+
+	for(i=0; i< p_ac3dec->bsi.nfchans; i++)
+		exp_unpack_ch(UNPACK_FBW, p_ac3dec->audblk.chexpstr[i], p_ac3dec->audblk.nchgrps[i], p_ac3dec->audblk.exps[i][0],
+				&p_ac3dec->audblk.exps[i][1], p_ac3dec->audblk.fbw_exp[i]);
+
+	if(p_ac3dec->audblk.cplinu)
+		exp_unpack_ch(UNPACK_CPL, p_ac3dec->audblk.cplexpstr, p_ac3dec->audblk.ncplgrps, p_ac3dec->audblk.cplabsexp << 1,
+				p_ac3dec->audblk.cplexps, &p_ac3dec->audblk.cpl_exp[p_ac3dec->audblk.cplstrtmant]);
+
+	if(p_ac3dec->bsi.lfeon)
+		exp_unpack_ch(UNPACK_LFE, p_ac3dec->audblk.lfeexpstr, 2, p_ac3dec->audblk.lfeexps[0],
+				&p_ac3dec->audblk.lfeexps[1], p_ac3dec->audblk.lfe_exp);
+}

src/ac3_decoder/ac3_rematrix.c

+#include <unistd.h>                                              /* getpid() */
+
+#include <stdio.h>                                           /* "intf_msg.h" */
+#include <stdlib.h>                                      /* malloc(), free() */
+#include <sys/soundcard.h>                               /* "audio_output.h" */
+#include <sys/uio.h>                                            /* "input.h" */
+
+#include "common.h"
+#include "config.h"
+#include "mtime.h"
+#include "vlc_thread.h"
+#include "debug.h"                                      /* "input_netlist.h" */
+
+#include "intf_msg.h"                        /* intf_DbgMsg(), intf_ErrMsg() */
+
+#include "input.h"                                           /* pes_packet_t */
+#include "input_netlist.h"                         /* input_NetlistFreePES() */
+#include "decoder_fifo.h"         /* DECODER_FIFO_(ISEMPTY|START|INCSTART)() */
+
+#include "audio_output.h"
+
+#include "ac3_decoder.h"
+#include "ac3_parse.h"
+#include "ac3_exponent.h"
+#include "ac3_bit_allocate.h"
+#include "ac3_mantissa.h"
+#include "ac3_rematrix.h"
+
+struct rematrix_band_s
+{
+	u32 start;
+	u32 end;
+};
+
+static struct rematrix_band_s rematrix_band[] = { {13,24}, {25,36}, {37 ,60}, {61,252}};
+
+static __inline__ u32 min( u32 a, u32 b )
+{
+	return( a < b ? a : b );
+}
+
+/* This routine simply does stereo rematixing for the 2 channel 
+ * stereo mode */
+void rematrix( ac3dec_thread_t * p_ac3dec )
+{
+	u32 num_bands;
+	u32 start;
+	u32 end;
+	u32 i,j;
+	float left,right;
+
+	if(p_ac3dec->audblk.cplinu || p_ac3dec->audblk.cplbegf > 2)
+		num_bands = 4;
+	else if (p_ac3dec->audblk.cplbegf > 0)
+		num_bands = 3;
+	else
+		num_bands = 2;
+
+	for(i=0;i < num_bands; i++)
+	{
+		if(!p_ac3dec->audblk.rematflg[i])
+			continue;
+
+		start = rematrix_band[i].start;
+		end = min(rematrix_band[i].end ,12 * p_ac3dec->audblk.cplbegf + 36);
+	
+		for(j=start;j < end; j++)
+		{
+			left  = 0.5f * (p_ac3dec->coeffs.fbw[0][j] + p_ac3dec->coeffs.fbw[1][j]);
+			right = 0.5f * (p_ac3dec->coeffs.fbw[0][j] - p_ac3dec->coeffs.fbw[1][j]);
+			p_ac3dec->coeffs.fbw[0][j] = left;
+			p_ac3dec->coeffs.fbw[1][j] = right;
+		}
+	}
+}

src/input/input.c

@@ -349,6 +349,10 @@ static void EndThread( input_thread_t * p_input )
                     adec_DestroyThread( (adec_thread_t*)(p_input->pp_selected_es[i_es_loop]->p_dec) );
                     break;
 
+                case AC3_AUDIO_ES:
+                    ac3dec_DestroyThread( (ac3dec_thread_t *)(p_input->pp_selected_es[i_es_loop]->p_dec) );
+                    break;
+
                 default:
                     break;
             }
@@ -979,20 +983,26 @@ static __inline__ void input_DemuxPES( input_thread_t *p_input,
                PES fifo */
             switch( p_es_descriptor->i_type )
             {
-            case MPEG1_VIDEO_ES:
-            case MPEG2_VIDEO_ES:
-                p_fifo = &(((vdec_thread_t*)(p_es_descriptor->p_dec))->fifo);
-                break;
-            case MPEG1_AUDIO_ES:
-            case MPEG2_AUDIO_ES:
-                p_fifo = &(((adec_thread_t*)(p_es_descriptor->p_dec))->fifo);
-                break;
-            default:
-                /* This should never happen. */
-                intf_DbgMsg("Unknown stream type (%d, %d): PES trashed\n",
-                            p_es_descriptor->i_id, p_es_descriptor->i_type);
-                p_fifo = NULL;
-                break;
+                case MPEG1_VIDEO_ES:
+                case MPEG2_VIDEO_ES:
+                    p_fifo = &(((vdec_thread_t*)(p_es_descriptor->p_dec))->fifo);
+                    break;
+
+                case MPEG1_AUDIO_ES:
+                case MPEG2_AUDIO_ES:
+                    p_fifo = &(((adec_thread_t*)(p_es_descriptor->p_dec))->fifo);
+                    break;
+
+                case AC3_AUDIO_ES:
+                    p_fifo = &(((ac3dec_thread_t *)(p_es_descriptor->p_dec))->fifo);
+                    break;
+
+                default:
+                    /* This should never happen */
+                    intf_DbgMsg("Unknown stream type (%d, %d): PES trashed\n",
+                        p_es_descriptor->i_id, p_es_descriptor->i_type);
+                    p_fifo = NULL;
+                    break;
             }
 
             if( p_fifo != NULL )

src/input/input_ctrl.c

@@ -101,6 +101,17 @@ int input_AddPgrmElem( input_thread_t *p_input, int i_current_id )
                 /* Spawn the decoder. */
                 switch( p_input->p_es[i_es_loop].i_type )
                 {
+                    case AC3_AUDIO_ES:
+                        /* Spawn ac3 thread */
+                        if ( ((ac3dec_thread_t *)(p_input->p_es[i_es_loop].p_dec) =
+                            ac3dec_CreateThread(p_input)) == NULL )
+                        {
+                            intf_ErrMsg( "Could not start ac3 decoder\n" );
+                            vlc_mutex_unlock( &p_input->es_lock );
+                            return( -1 );
+                        }
+                        break;
+
                     case MPEG1_AUDIO_ES:
                     case MPEG2_AUDIO_ES:
                         /* Spawn audio thread. */
@@ -194,6 +205,10 @@ int input_DelPgrmElem( input_thread_t *p_input, int i_current_id )
                 /* Cancel the decoder. */
                 switch( p_input->pp_selected_es[i_selected_es_loop]->i_type )
                 {
+                    case AC3_AUDIO_ES:
+                        ac3dec_DestroyThread( (ac3dec_thread_t *)(p_input->pp_selected_es[i_selected_es_loop]->p_dec) );
+                        break;
+
                     case MPEG1_AUDIO_ES:
                     case MPEG2_AUDIO_ES:
                         adec_DestroyThread( (adec_thread_t*)(p_input->pp_selected_es[i_selected_es_loop]->p_dec) );

src/input/input_psi.c

@@ -218,6 +218,7 @@ void input_PsiDecode( input_thread_t *p_input, psi_section_t* p_psi_section )
   //intf_DbgMsg( "Section: %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x\n", (u8)p_psi_section->buffer[0], (u8)p_psi_section->buffer[1], (u8)p_psi_section->buffer[2], (u8)p_psi_section->buffer[3], (u8)p_psi_section->buffer[4], (u8)p_psi_section->buffer[5], (u8)p_psi_section->buffer[6], (u8)p_psi_section->buffer[7], (u8)p_psi_section->buffer[8], (u8)p_psi_section->buffer[9], (u8)p_psi_section->buffer[10], (u8)p_psi_section->buffer[11], (u8)p_psi_section->buffer[12], (u8)p_psi_section->buffer[13], (u8)p_psi_section->buffer[14], (u8)p_psi_section->buffer[15], (u8)p_psi_section->buffer[16], (u8)p_psi_section->buffer[17], (u8)p_psi_section->buffer[18], (u8)p_psi_section->buffer[19] );
 
   /* Check the CRC validity if any CRC is carried */
+#if 0
   if( p_psi_section->buffer[1] & 0x80 )
   {
     if( CheckCRC32 (p_psi_section->buffer, p_psi_section->i_length) )
@@ -228,6 +229,7 @@ void input_PsiDecode( input_thread_t *p_input, psi_section_t* p_psi_section )
       return;
     }
   }
+#endif
   
   /* If the section is not immediatly applicable, trash it (DVB drafts disallow
      transmission of such sections, so we didn't implement it) */
@@ -630,25 +632,37 @@ static void DecodePgrmMapSection( u8* p_pms, input_thread_t* p_input )
               {
                   switch( p_input->p_es[i_es_loop].i_type )
                   {
-                  case MPEG1_VIDEO_ES:
-                  case MPEG2_VIDEO_ES:
-                      if( p_main->b_video )
-                      {
-                           /* Spawn a video thread */
-                           input_AddPgrmElem( p_input,
-                                              p_input->p_es[i_es_loop].i_id );
-                      }
-                      break;
-                  case MPEG1_AUDIO_ES:
-                  case MPEG2_AUDIO_ES:
-                      if( p_main->b_audio )
-                      {
-                          /* Spawn an audio thread */
-                          input_AddPgrmElem( p_input,
-                                             p_input->p_es[i_es_loop].i_id );
-                      }
-                      break;
-                  default:
+                      case MPEG1_VIDEO_ES:
+                      case MPEG2_VIDEO_ES:
+                          if( p_main->b_video )
+                          {
+                              /* Spawn a video thread */
+                              input_AddPgrmElem( p_input,
+                                  p_input->p_es[i_es_loop].i_id );
+                          }
+                          break;
+
+                      case AC3_AUDIO_ES:
+                          if ( p_main->b_audio )
+                          {
+                              /* Spawn an ac3 thread */
+                              input_AddPgrmElem( p_input,
+                                  p_input->p_es[i_es_loop].i_id );
+                              }
+                          break;
+
+                      case MPEG1_AUDIO_ES:
+                      case MPEG2_AUDIO_ES:
+                          if( p_main->b_audio )
+                          {
+                              /* Spawn an audio thread */
+                              input_AddPgrmElem( p_input,
+                                  p_input->p_es[i_es_loop].i_id );
+                          }
+                          break;
+
+                      default:
+                          break;
                   }
               }
 #endif