Ajout des fichiers pour la gestion du lpcm.

Il reste � impl�menter le lpcm au niveau de l'input et �crire le d�codage.

Makefile.in

@@ -241,6 +241,9 @@ ac3_decoder_obj =		ac3_decoder/ac3_decoder_thread.o \
 						ac3_decoder/ac3_imdct.o \
 						ac3_decoder/ac3_downmix.o
 						
+lpcm_decoder_obj =		lpcm_decoder/lpcm_decoder_thread.o \
+						lpcm_decoder/lpcm_decoder.o
+
 audio_decoder_obj =		audio_decoder/audio_decoder_thread.o \
 						audio_decoder/audio_decoder.o \
 						audio_decoder/audio_math.o
@@ -288,6 +291,7 @@ C_OBJ = $(interface_obj) \
 		$(audio_output_obj) \
 		$(video_output_obj) \
 		$(ac3_decoder_obj) \
+		$(lpcm_decoder_obj) \
 		$(audio_decoder_obj) \
 		$(spu_decoder_obj) \
 		$(generic_decoder_obj) \

include/input.h

@@ -170,7 +170,7 @@ typedef struct es_descriptor_t
 #define MPEG2_AUDIO_ES          0x04
 #define AC3_AUDIO_ES            0x81
 #define DVD_SPU_ES             0x82           /* 0x82 might violate the norm */
-
+#define LPCM_AUDIO_ES           0x83
 /*****************************************************************************
  * program_descriptor_t
  *****************************************************************************

include/lpcm_decoder.h

+/*****************************************************************************
+ * lpcm_decoder.h : lpcm decoder interface
+ *****************************************************************************
+ * Copyright (C) 1999, 2000 VideoLAN
+ *
+ * Authors:
+ *
+ * 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-1307, USA.
+ *****************************************************************************/
+
+typedef struct lpcmdec_s lpcmdec_t;
+
+typedef struct lpcm_sync_info_s {
+    int sample_rate;	/* sample rate in Hz */
+    int frame_size;	/* frame size in bytes */
+    int bit_rate;	/* nominal bit rate in kbps */
+} lpcm_sync_info_t;
+
+typedef struct lpcm_byte_stream_s {
+    u8 * p_byte;
+    u8 * p_end;
+    void * info;
+} lpcm_byte_stream_t;
+
+
+int lpcm_init (lpcmdec_t * p_lpcmdec);
+int lpcm_sync_frame (lpcmdec_t * p_lpcmdec, lpcm_sync_info_t * p_sync_info);
+int lpcm_decode_frame (lpcmdec_t * p_lcpmdec, s16 * buffer);
+//static lpcm_byte_stream_t * lpcm_byte_stream (lcpmdec_t * p_lpcmdec);
+
+
+void lpcm_byte_stream_next (lpcm_byte_stream_t * p_byte_stream);
+
+typedef struct lpcm_bit_stream_s {
+    u32 buffer;
+    int i_available;
+    lpcm_byte_stream_t byte_stream;
+
+} lpcm_bit_stream_t;
+
+struct lpcmdec_s {
+    /*
+     * Input properties
+     */
+
+    /* The bit stream structure handles the PES stream at the bit level */
+    lpcm_bit_stream_t	bit_stream;
+};
+
+
+static lpcm_byte_stream_t * lpcm_byte_stream (lpcmdec_t * p_lpcmdec)
+{
+    return &(p_lpcmdec->bit_stream.byte_stream);
+}

include/lpcm_decoder_thread.h

+/*****************************************************************************
+ * lpcm_decoder_thread.h : lpcm decoder thread interface
+ *****************************************************************************
+ * Copyright (C) 1999, 2000 VideoLAN
+ *
+ * Authors:
+ *
+ * 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-1307, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * lpcmdec_thread_t : lpcm decoder thread descriptor
+ *****************************************************************************/
+typedef struct lpcmdec_thread_s
+{
+    /*
+     * Thread properties
+     */
+    vlc_thread_t        thread_id;                /* id for thread functions */
+    boolean_t           b_die;                                 /* `die' flag */
+    boolean_t           b_error;                             /* `error' flag */
+
+    /*
+     * Input properties
+     */
+    decoder_fifo_t      fifo;                  /* stores the PES stream data */
+    input_thread_t *    p_input;
+    ts_packet_t *       p_ts;
+    int			sync_ptr;	/* sync ptr from lpcm magic header */
+
+    /*
+     * Decoder properties
+     */
+
+    lpcmdec_t            lpcm_decoder;
+
+    /*
+     * Output properties
+     */
+    aout_fifo_t *       p_aout_fifo; /* stores the decompressed audio frames */
+    aout_thread_t *     p_aout;           /* needed to create the audio fifo */
+
+} lpcmdec_thread_t;
+
+/*****************************************************************************
+ * Prototypes
+ *****************************************************************************/
+lpcmdec_thread_t *      lpcmdec_CreateThread( input_thread_t * p_input );
+void                    lpcmdec_DestroyThread( lpcmdec_thread_t * p_lcpmdec );

src/input/input.c

@@ -60,6 +60,9 @@
 #include "ac3_decoder.h"              /* ac3dec_t (for ac3_decoder_thread.h) */
 #include "ac3_decoder_thread.h"                           /* ac3dec_thread_t */
 
+#include "lpcm_decoder.h"
+#include "lpcm_decoder_thread.h"
+
 #include "video.h"                          /* picture_t (for video_output.h) */
 #include "video_output.h"                                   /* vout_thread_t */
 
@@ -444,6 +447,9 @@ static void EndThread( input_thread_t * p_input )
         case AC3_AUDIO_ES:
             ac3dec_DestroyThread( (ac3dec_thread_t *)(p_input->pp_selected_es[i_es_loop]->p_dec) );
             break;
+        case LPCM_AUDIO_ES:
+            lpcmdec_DestroyThread((lpcmdec_thread_t *)(p_input->pp_selected_es[i_es_loop]->p_dec) );
+            break;
         case DVD_SPU_ES:
             spudec_DestroyThread( (spudec_thread_t *)(p_input->pp_selected_es[i_es_loop]->p_dec) );
             break;
@@ -1225,6 +1231,10 @@ static __inline__ void input_ParsePES( input_thread_t *p_input,
                 p_fifo = &(((ac3dec_thread_t *)(p_es_descriptor->p_dec))->fifo);
                 break;
 
+	    case LPCM_AUDIO_ES:
+                p_fifo = &(((lpcmdec_thread_t *)(p_es_descriptor->p_dec))->fifo);
+                break;
+
             case DVD_SPU_ES:
                 /* we skip the first byte at the beginning of the
                  * subpicture payload, it only contains the SPU ID. */

src/input/input_ctrl.c

@@ -30,7 +30,7 @@
 
 #include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/uio.h>                                            /* "input.h" */
-
+#include <stdio.h>
 #include <netinet/in.h>                                             /* ntohs */
 
 #include "config.h"
@@ -53,6 +53,9 @@
 #include "ac3_decoder.h"              /* ac3dec_t (for ac3_decoder_thread.h) */
 #include "ac3_decoder_thread.h"                           /* ac3dec_thread_t */
 
+#include "lpcm_decoder.h"
+#include "lpcm_decoder_thread.h"
+
 #include "video.h"                          /* picture_t (for video_output.h) */
 #include "video_output.h"                                   /* vout_thread_t */
 
@@ -122,7 +125,9 @@ 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:
+                        fprintf (stderr, "Start an AC3 decoder\n");
                         /* Spawn ac3 thread */
                         if ( ((ac3dec_thread_t *)(p_input->p_es[i_es_loop].p_dec) =
                             ac3dec_CreateThread(p_input)) == NULL )
@@ -133,6 +138,19 @@ int input_AddPgrmElem( input_thread_t *p_input, int i_current_id )
                         }
                         break;
 
+		             case LPCM_AUDIO_ES:
+                        /* Spawn lpcm thread */
+                        fprintf (stderr, "Start a LPCM decoder\n");
+                        if ( ((lpcmdec_thread_t *)(p_input->p_es[i_es_loop].p_dec) =
+                            lpcmdec_CreateThread(p_input)) == NULL )
+                        {
+                            intf_ErrMsg( "LPCM Debug: Could not start lpcm decoder\n" );
+                            vlc_mutex_unlock( &p_input->es_lock );
+                            return( -1 );
+                        }
+                        break;
+
+
                     case DVD_SPU_ES:
                         /* Spawn spu thread */
                         if ( ((spudec_thread_t *)(p_input->p_es[i_es_loop].p_dec) =
@@ -249,6 +267,10 @@ int input_DelPgrmElem( input_thread_t *p_input, int i_current_id )
                         ac3dec_DestroyThread( (ac3dec_thread_t *)(p_input->pp_selected_es[i_selected_es_loop]->p_dec) );
                         break;
 			
+                    case LPCM_AUDIO_ES:
+                        lpcmdec_DestroyThread( (lpcmdec_thread_t *)(p_input->pp_selected_es[i_selected_es_loop]->p_dec) );
+                        break;
+
                     case DVD_SPU_ES:
                         spudec_DestroyThread( (spudec_thread_t *)(p_input->pp_selected_es[i_selected_es_loop]->p_dec) );
                         break;

src/input/input_psi.c

@@ -654,6 +654,15 @@ static void DecodePgrmMapSection( u8* p_pms, input_thread_t* p_input )
                               }
                           break;
 
+                      case LPCM_AUDIO_ES:
+                          if ( p_main->b_audio )
+                          {
+                              /* Spawn an lpcm thread */
+                              input_AddPgrmElem( p_input,
+                                  p_input->p_es[i_es_loop].i_id );
+                              }
+                          break;
+
                      case DVD_SPU_ES:
                           if ( p_main->b_video )
                           {

src/lpcm_decoder/lpcm_decoder.c

+/*****************************************************************************
+ * lpcm_decoder.c: core lpcm decoder
+ *****************************************************************************
+ * Copyright (C) 1999, 2000 VideoLAN
+ *
+ * Authors:
+ *
+ * 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-1307, USA.
+ *****************************************************************************/
+#include <stdio.h>
+#include "defs.h"
+
+#include "int_types.h"
+#include "lpcm_decoder.h"
+
+int lpcm_init (lpcmdec_t * p_lpcmdec)
+{
+    fprintf (stderr, "LPCM Debug: lpmcm init called\n");
+    return 0;
+}
+
+int lpcm_decode_frame (lpcmdec_t * p_lpcmdec, s16 * buffer)
+{
+/*
+ * XXX was part of ac3dec, is to change
+    
+    int i;
+
+    if (parse_bsi (p_ac3dec))
+        return 1;
+
+    for (i = 0; i < 6; i++) {
+        if (parse_audblk (p_ac3dec, i))
+            return 1;
+        if (exponent_unpack (p_ac3dec))
+            return 1;
+        bit_allocate (p_ac3dec);
+        mantissa_unpack (p_ac3dec);
+        if  (p_ac3dec->bsi.acmod == 0x2)
+            rematrix (p_ac3dec);
+        imdct (p_ac3dec);
+        downmix (p_ac3dec, buffer);
+
+        buffer += 2*256;
+    }
+
+    parse_auxdata (p_ac3dec);
+*/
+    
+    return 0;
+}