* Just renamed the liba52_adec plugin into a52 to comply with the naming
convention used by the other plugins.

Makefile

@@ -34,7 +34,7 @@ PLUGINS_DIR :=	ac3_adec \
 		idct \
 		imdct \
 		kde \
-		liba52_adec \
+		a52 \
 		lirc \
 		lpcm_adec \
 		macosx \
@@ -95,7 +95,7 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
 		imdct/imdct3dn \
 		imdct/imdctsse \
 		kde/kde \
-		liba52_adec/liba52_adec \
+		a52/a52 \
 		lirc/lirc \
 		lpcm_adec/lpcm_adec \
 		macosx/macosx \

Makefile.opts.in

@@ -84,7 +84,7 @@ LIB_IMDCT = @LIB_IMDCT@
 LIB_IMDCT3DN = @LIB_IMDCT3DN@
 LIB_IMDCTSSE = @LIB_IMDCTSSE@
 LIB_KDE = @LIB_KDE@
-LIB_LIBA52_ADEC = @LIB_LIBA52_ADEC@
+LIB_A52 = @LIB_A52@
 LIB_LIBDVDCSS = @LIB_LIBDVDCSS@
 LIB_LIBDVDREAD = @LIB_LIBDVDREAD@
 LIB_LIRC = @LIB_LIRC@

configure

@@ -67,7 +67,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --disable-qnx           QNX RTOS support (default enabled on QNX RTOS)"
 ac_help="$ac_help
-  --disable-liba52        AC3 support with liba52 (default enabled)"
+  --disable-a52           AC3 support with liba52 (default enabled)"
 ac_help="$ac_help
   --enable-fb             Linux framebuffer support (default disabled)"
 ac_help="$ac_help
@@ -6925,9 +6925,9 @@ done
 
     fi
 
-# Check whether --enable-liba52 or --disable-liba52 was given.
-if test "${enable_liba52+set}" = set; then
-  enableval="$enable_liba52"
+# Check whether --enable-a52 or --disable-a52 was given.
+if test "${enable_a52+set}" = set; then
+  enableval="$enable_a52"
   :
 fi
 
@@ -6968,8 +6968,8 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
 #define $ac_tr_hdr 1
 EOF
  
-      BUILTINS="${BUILTINS} liba52_adec"
-      LIB_LIBA52_ADEC="${LIB_LIBA52_ADEC} -la52"
+      BUILTINS="${BUILTINS} a52"
+      LIB_A52="${LIB_A52} -la52"
      
 else
   echo "$ac_t""no" 1>&6
@@ -8316,7 +8316,7 @@ s%@LIB_IMDCT@%$LIB_IMDCT%g
 s%@LIB_IMDCT3DN@%$LIB_IMDCT3DN%g
 s%@LIB_IMDCTSSE@%$LIB_IMDCTSSE%g
 s%@LIB_KDE@%$LIB_KDE%g
-s%@LIB_LIBA52_ADEC@%$LIB_LIBA52_ADEC%g
+s%@LIB_A52@%$LIB_A52%g
 s%@LIB_LIBDVDCSS@%$LIB_LIBDVDCSS%g
 s%@LIB_LIBDVDREAD@%$LIB_LIBDVDREAD%g
 s%@LIB_LIRC@%$LIB_LIRC%g

configure.in

@@ -1061,15 +1061,15 @@ AC_ARG_ENABLE(qnx,
     fi
 
 dnl
-dnl  Liba52 AC3 decoder plugin
+dnl  a52 AC3 decoder plugin
 dnl
-AC_ARG_ENABLE(liba52,
-  [  --disable-liba52        AC3 support with liba52 (default enabled)])
+AC_ARG_ENABLE(a52,
+  [  --disable-a52           AC3 support with liba52 (default enabled)])
 if ((test "x$enableval" != "xno") && (test x$SYS != xmingw32))
   then
     AC_CHECK_HEADERS(a52dec/a52.h, [
-      BUILTINS="${BUILTINS} liba52_adec"
-      LIB_LIBA52_ADEC="${LIB_LIBA52_ADEC} -la52"
+      BUILTINS="${BUILTINS} a52"
+      LIB_A52="${LIB_A52} -la52"
      ],[])
 fi
 
@@ -1526,7 +1526,7 @@ AC_SUBST(LIB_IMDCT)
 AC_SUBST(LIB_IMDCT3DN)
 AC_SUBST(LIB_IMDCTSSE)
 AC_SUBST(LIB_KDE)
-AC_SUBST(LIB_LIBA52_ADEC)
+AC_SUBST(LIB_A52)
 AC_SUBST(LIB_LIBDVDCSS)
 AC_SUBST(LIB_LIBDVDREAD)
 AC_SUBST(LIB_LIRC)

debian/rules

@@ -9,7 +9,7 @@
 export DH_COMPAT=3
 
 # Compilation options
-export CONFIG_FLAGS="--enable-release --prefix=/usr --enable-gnome --enable-gtk --enable-fb --with-ggi --enable-sdl --enable-esd --enable-qt --with-mad --enable-arts --enable-alsa --enable-lirc --enable-liba52"
+export CONFIG_FLAGS="--enable-release --prefix=/usr --enable-gnome --enable-gtk --enable-fb --with-ggi --enable-sdl --enable-esd --enable-qt --with-mad --enable-arts --enable-alsa --enable-lirc --enable-a52"
 export LIBDVDCSS_FLAGS="--with-dvdcss=local-shared"
 export VIDDIR="usr/share/videolan"
 export PIXDIR="usr/share/pixmaps"

plugins/a52/.cvsignore

+.dep
+*.lo
+*.o.*
+*.lo.*

plugins/a52/Makefile

+a52_SOURCES = a52.c

plugins/a52/a52.h

+/*****************************************************************************
+ * 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.1 2002/02/06 20:44:22 gbazin 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_adec_thread_t : a52 decoder thread descriptor
+ *****************************************************************************/
+typedef struct a52_adec_thread_s
+{
+    /*
+     * liba52 properties
+     */
+    a52_state_t a52_state;
+    int         frame_size;
+    int         flags;
+    int         sample_rate;
+    int         bit_rate;
+    sample_t    *p_decoded_samples;
+
+    /* 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;
+    decoder_config_t   *p_config;
+
+    /*
+     * Output properties
+     */
+    aout_fifo_t        *p_aout_fifo; /* stores the decompressed audio frames */
+    int                i_channels;
+
+    /* temporary buffer to store the raw frame to be decoded */
+    u8 p_frame_buffer[3840];
+
+} a52_adec_thread_t;

src/interface/main.c

@@ -4,7 +4,7 @@
  * and spawn threads.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: main.c,v 1.147 2002/02/05 21:46:41 gbazin Exp $
+ * $Id: main.c,v 1.148 2002/02/06 20:44:23 gbazin Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -1002,7 +1002,7 @@ static void Usage( int i_fashion )
           "\n      --channelserver <host>     \tchannel server address"
           "\n"
           "\n      --mpeg_adec <builtin|mad>  \tchoose MPEG audio decoder"
-          "\n      --ac3_adec <builtin|liba52>  \tchoose AC3 audio decoder"
+          "\n      --ac3_adec <builtin|a52>   \tchoose AC3 audio decoder"
           "\n"
           "\n      --nommx                    \tdisable CPU's MMX support"
           "\n      --no3dnow                  \tdisable CPU's 3D Now! support"
@@ -1083,7 +1083,7 @@ static void Usage( int i_fashion )
     /* Decoder parameters */
     intf_MsgImm( "\nDecoder parameters:"
         "\n  " ADEC_MPEG_VAR "=<builtin|mad>          \tMPEG audio decoder"
-        "\n  " ADEC_AC3_VAR "=<builtin|liba52>        \tAC3 audio decoder" );
+        "\n  " ADEC_AC3_VAR "=<builtin|a52>           \tAC3 audio decoder" );
 }
 
 /*****************************************************************************