[vlc-devel] [PATCH 13/17] a52tofloat32: move to liba52 codec
Thomas Guillem
thomas at gllm.fr
Wed Jul 27 17:27:29 CEST 2016
This decoder works (for now) only if the input is correctly packetized.
The "a52-upmix" option is dropped (internal upmixing).
---
configure.ac | 10 +-
extras/package/rpm/vlc.altlinux.spec | 2 +-
modules/MODULES_LIST | 2 +-
modules/audio_filter/Makefile.am | 8 +-
modules/audio_filter/converter/a52tofloat32.c | 420 --------------------------
modules/codec/Makefile.am | 7 +
modules/codec/liba52.c | 384 +++++++++++++++++++++++
po/POTFILES.in | 2 +-
8 files changed, 401 insertions(+), 434 deletions(-)
delete mode 100644 modules/audio_filter/converter/a52tofloat32.c
create mode 100644 modules/codec/liba52.c
diff --git a/configure.ac b/configure.ac
index 81551ee..7fbc4df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2678,13 +2678,13 @@ then
CPPFLAGS_test="-I${with_a52}/include"
fi
VLC_SAVE_FLAGS
- CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_test} ${CPPFLAGS_a52tofloat32}"
- LDFLAGS="${LDFLAGS} ${LDFLAGS_test} ${LIBS_a52tofloat32}"
+ CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_test} ${CPPFLAGS_liba52}"
+ LDFLAGS="${LDFLAGS} ${LDFLAGS_test} ${LIBS_liba52}"
AC_CHECK_HEADERS(a52dec/a52.h, [
AC_CHECK_LIB(a52, a52_free, [
- VLC_ADD_PLUGIN([a52tofloat32])
- VLC_ADD_LIBS([a52tofloat32],[${LDFLAGS_test} -la52])
- VLC_ADD_CPPFLAGS([a52tofloat32],[${CPPFLAGS_test}])
+ VLC_ADD_PLUGIN([liba52])
+ VLC_ADD_LIBS([liba52],[${LDFLAGS_test} -la52])
+ VLC_ADD_CPPFLAGS([liba52],[${CPPFLAGS_test}])
],[
AC_MSG_ERROR([Could not find liba52 on your system: you may get it from http://liba52.sf.net/. Alternatively you can use --disable-a52 to disable the a52 plugin.])
], [$LIBM])
diff --git a/extras/package/rpm/vlc.altlinux.spec b/extras/package/rpm/vlc.altlinux.spec
index 021ca24..d7db35a 100644
--- a/extras/package/rpm/vlc.altlinux.spec
+++ b/extras/package/rpm/vlc.altlinux.spec
@@ -1310,7 +1310,7 @@ strfile %buildroot%_gamesdatadir/fortune/vlc %buildroot%_gamesdatadir/fortune/vl
%_vlc_pluginsdir/codec/libflac_plugin.so*
%files plugin-a52
-%_vlc_pluginsdir/audio_filter/liba52tofloat32_plugin.so*
+%_vlc_pluginsdir/codec/libliba52_plugin.so*
%files plugin-h264
%_vlc_pluginsdir/codec/libx264_plugin.so*
diff --git a/modules/MODULES_LIST b/modules/MODULES_LIST
index d3579c1..85b0532 100644
--- a/modules/MODULES_LIST
+++ b/modules/MODULES_LIST
@@ -1,7 +1,6 @@
List of vlc plugins (475)
$Id$
* a52: A/52 basic parser/packetizer
- * a52tofloat32: A/52 audio converter & decoder plugin, using liba52
* aa: Ascii art video output
* access_alsa: Alsa access module
* access_archive: libarchive based access and stream filter
@@ -207,6 +206,7 @@ $Id$
* keychain: Keystore for iOS, Mac OS X and tvOS
* kva: OS/2 video output
* kwallet: store secrets via KDE Kwallet
+ * liba52: A/52 audio decoder plugin, using liba52
* libass: Subtitle renderers using libass
* libbluray: Library to access Blu-Ray drives
* libmpeg2: Mpeg2 video decoder using libmpeg2
diff --git a/modules/audio_filter/Makefile.am b/modules/audio_filter/Makefile.am
index 3b42bbf..af4442d 100644
--- a/modules/audio_filter/Makefile.am
+++ b/modules/audio_filter/Makefile.am
@@ -76,16 +76,12 @@ audio_filter_LTLIBRARIES += \
libtrivial_channel_mixer_plugin.la
# Converters
-liba52tofloat32_plugin_la_SOURCES = audio_filter/converter/a52tofloat32.c
-liba52tofloat32_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_a52tofloat32)
-liba52tofloat32_plugin_la_LIBADD = $(LIBM) $(LIBS_a52tofloat32)
-liba52tofloat32_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(audio_filterdir)'
libdtstofloat32_plugin_la_SOURCES = audio_filter/converter/dtstofloat32.c
libdtstofloat32_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(DCA_CFLAGS)
libdtstofloat32_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(audio_filterdir)'
libdtstofloat32_plugin_la_LIBADD = $(LIBM) $(DCA_LIBS)
-EXTRA_LTLIBRARIES += liba52tofloat32_plugin.la libdtstofloat32_plugin.la
-audio_filter_LTLIBRARIES += $(LTLIBa52tofloat32) $(LTLIBdtstofloat32)
+EXTRA_LTLIBRARIES += libdtstofloat32_plugin.la
+audio_filter_LTLIBRARIES += $(LTLIBdtstofloat32)
libmad_plugin_la_SOURCES = audio_filter/converter/mpgatofixed32.c
libmad_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(MAD_CFLAGS)
diff --git a/modules/audio_filter/converter/a52tofloat32.c b/modules/audio_filter/converter/a52tofloat32.c
deleted file mode 100644
index d2016bf..0000000
--- a/modules/audio_filter/converter/a52tofloat32.c
+++ /dev/null
@@ -1,420 +0,0 @@
-/*****************************************************************************
- * a52tofloat32.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/).
- *****************************************************************************
- * Copyright (C) 2001-2009 VLC authors and VideoLAN
- * $Id$
- *
- * Authors: Gildas Bazin <gbazin at videolan.org>
- * Christophe Massiot <massiot at via.ecp.fr>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-/*****************************************************************************
- * NOTA BENE: this module requires the linking against a library which is
- * known to require licensing under the GNU General Public License version 2
- * (or later). Therefore, the result of compiling this module will normally
- * be subject to the terms of that later license.
- *****************************************************************************/
-
-
-/*****************************************************************************
- * Preamble
- *****************************************************************************/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc_common.h>
-#include <vlc_plugin.h>
-#include <vlc_cpu.h>
-
-#include <stdint.h> /* int16_t .. */
-
-#ifdef USE_A52DEC_TREE /* liba52 header file */
-# include "include/a52.h"
-#else
-# include "a52dec/a52.h"
-#endif
-
-#include <vlc_aout.h>
-#include <vlc_block.h>
-#include <vlc_filter.h>
-
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-static int OpenFilter ( vlc_object_t * );
-static void CloseFilter( vlc_object_t * );
-static block_t *Convert( filter_t *, block_t * );
-
-/* liba52 channel order */
-static const uint32_t pi_channels_in[] =
-{ AOUT_CHAN_LFE, AOUT_CHAN_LEFT, AOUT_CHAN_CENTER, AOUT_CHAN_RIGHT,
- AOUT_CHAN_REARLEFT, AOUT_CHAN_REARCENTER, AOUT_CHAN_REARRIGHT, 0 };
-
-/*****************************************************************************
- * Local structures
- *****************************************************************************/
-struct filter_sys_t
-{
- a52_state_t * p_liba52; /* liba52 internal structure */
- bool b_dynrng; /* see below */
- int i_flags; /* liba52 flags, see a52dec/doc/liba52.txt */
- bool b_dontwarn;
- int i_nb_channels; /* number of float32 per sample */
-
- uint8_t pi_chan_table[AOUT_CHAN_MAX]; /* channel reordering */
-};
-
-/*****************************************************************************
- * 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.")
-#define UPMIX_TEXT N_("Enable internal upmixing")
-#define UPMIX_LONGTEXT N_( \
- "Enable the internal upmixing algorithm (not recommended).")
-
-vlc_module_begin ()
- set_shortname( "A/52" )
- set_description( N_("ATSC A/52 (AC-3) audio decoder") )
- set_category( CAT_INPUT )
- set_subcategory( SUBCAT_INPUT_ACODEC )
- add_bool( "a52-dynrng", true, DYNRNG_TEXT, DYNRNG_LONGTEXT, false )
- add_bool( "a52-upmix", false, UPMIX_TEXT, UPMIX_LONGTEXT, true )
- set_capability( "audio converter", 100 )
- set_callbacks( OpenFilter, CloseFilter )
-vlc_module_end ()
-
-/*****************************************************************************
- * Open:
- *****************************************************************************/
-static int Open( vlc_object_t *p_this, filter_sys_t *p_sys,
- const audio_format_t *restrict input,
- const audio_format_t *restrict output )
-{
- p_sys->b_dynrng = var_InheritBool( p_this, "a52-dynrng" );
- p_sys->b_dontwarn = 0;
-
- /* No upmixing: it's not necessary and some other filters may want to do
- * it themselves. */
- if ( aout_FormatNbChannels( output ) > aout_FormatNbChannels( input ) )
- {
- if ( ! var_InheritBool( p_this, "a52-upmix" ) )
- {
- return VLC_EGENERIC;
- }
- }
-
- /* We'll do our own downmixing, thanks. */
- p_sys->i_nb_channels = aout_FormatNbChannels( output );
- switch ( output->i_physical_channels & ~AOUT_CHAN_LFE )
- {
- case AOUT_CHAN_CENTER:
- if ( (output->i_original_channels & AOUT_CHAN_CENTER)
- || (output->i_original_channels
- & (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)) )
- {
- p_sys->i_flags = A52_MONO;
- }
- else if ( output->i_original_channels & AOUT_CHAN_LEFT )
- {
- p_sys->i_flags = A52_CHANNEL1;
- }
- else
- {
- p_sys->i_flags = A52_CHANNEL2;
- }
- break;
-
- case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT:
- if ( output->i_original_channels & AOUT_CHAN_DOLBYSTEREO )
- {
- p_sys->i_flags = A52_DOLBY;
- }
- else if ( input->i_original_channels == AOUT_CHAN_CENTER )
- {
- p_sys->i_flags = A52_MONO;
- }
- else if ( input->i_original_channels & AOUT_CHAN_DUALMONO )
- {
- p_sys->i_flags = A52_CHANNEL;
- }
- else if ( !(output->i_original_channels & AOUT_CHAN_RIGHT) )
- {
- p_sys->i_flags = A52_CHANNEL1;
- }
- else if ( !(output->i_original_channels & AOUT_CHAN_LEFT) )
- {
- p_sys->i_flags = A52_CHANNEL2;
- }
- else
- {
- p_sys->i_flags = A52_STEREO;
- }
- break;
-
- case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER:
- p_sys->i_flags = A52_3F;
- break;
-
- case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARCENTER:
- p_sys->i_flags = A52_2F1R;
- break;
-
- case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
- | AOUT_CHAN_REARCENTER:
- p_sys->i_flags = A52_3F1R;
- break;
-
- case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
- | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT:
- p_sys->i_flags = A52_2F2R;
- break;
-
- case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
- | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT:
- p_sys->i_flags = A52_3F2R;
- break;
-
- default:
- msg_Warn( p_this, "unknown sample format!" );
- free( p_sys );
- return VLC_EGENERIC;
- }
- if ( output->i_physical_channels & AOUT_CHAN_LFE )
- {
- p_sys->i_flags |= A52_LFE;
- }
- p_sys->i_flags |= A52_ADJUST_LEVEL;
-
- /* Initialize liba52 */
- p_sys->p_liba52 = a52_init( 0 );
- if( p_sys->p_liba52 == NULL )
- {
- msg_Err( p_this, "unable to initialize liba52" );
- free( p_sys );
- return VLC_EGENERIC;
- }
-
- aout_CheckChannelReorder( pi_channels_in, NULL,
- output->i_physical_channels,
- p_sys->pi_chan_table );
-
- return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * Interleave: helper function to interleave channels
- *****************************************************************************/
-static void Interleave( sample_t *restrict p_out, const sample_t *restrict p_in,
- unsigned i_nb_channels, uint8_t *restrict pi_chan_table )
-{
- /* We do not only have to interleave, but also reorder the channels */
- for( unsigned j = 0; j < i_nb_channels; j++ )
- {
- for( unsigned i = 0; i < 256; i++ )
- {
-#ifdef LIBA52_FIXED
- union { uint32_t u; int32_t i; } spl;
-
- spl.u = ((uint32_t)p_in[j * 256 + i]) << 4;
- p_out[i * i_nb_channels + pi_chan_table[j]] = spl.i;
-#else
- p_out[i * i_nb_channels + pi_chan_table[j]] = p_in[j * 256 + i];
-#endif
- }
- }
-}
-
-/*****************************************************************************
- * Duplicate: helper function to duplicate a unique channel
- *****************************************************************************/
-static void Duplicate( sample_t *restrict p_out, const sample_t *restrict p_in )
-{
- for( unsigned i = 256; i--; )
- {
-#ifdef LIBA52_FIXED
- union { uint32_t u; int32_t i; } spl;
-
- spl.u = ((uint32_t)*(p_in++)) << 4;
- *p_out++ = spl.i;
- *p_out++ = spl.i;
-#else
- sample_t s = *(p_in++);
-
- *p_out++ = s;
- *p_out++ = s;
-#endif
- }
-}
-
-/*****************************************************************************
- * Exchange: helper function to exchange left & right channels
- *****************************************************************************/
-static void Exchange( sample_t *restrict p_out, const sample_t *restrict p_in )
-{
- const sample_t *p_first = p_in + 256;
- const sample_t *p_second = p_in;
-
- for( unsigned i = 0; i < 256; i++ )
- {
-#ifdef LIBA52_FIXED
- uint32_t spl[2];
-
- spl[0] = ((uint32_t)*p_first++) << 4;
- spl[1] = ((uint32_t)*p_second++) << 4;
- memcpy( p_out, spl, sizeof(spl) );
- p_out += 2;
-#else
- *p_out++ = *p_first++;
- *p_out++ = *p_second++;
-#endif
- }
-}
-
-/*****************************************************************************
- * Convert: decode an ATSC A/52 frame.
- *****************************************************************************/
-
-static block_t *Convert( filter_t *p_filter, block_t *p_in_buf )
-{
- filter_sys_t *p_sys = p_filter->p_sys;
-#ifdef LIBA52_FIXED
- sample_t i_sample_level = (1 << 24);
-#else
- sample_t i_sample_level = 1;
-#endif
- int i_flags = p_sys->i_flags;
- size_t i_bytes_per_block = 256 * p_sys->i_nb_channels * sizeof(sample_t);
-
- block_t *p_out_buf = block_Alloc( 6 * i_bytes_per_block );
- if( unlikely(p_out_buf == NULL) )
- goto out;
-
- /* Do the actual decoding now. */
- a52_frame( p_sys->p_liba52, p_in_buf->p_buffer,
- &i_flags, &i_sample_level, 0 );
-
- if ( (i_flags & A52_CHANNEL_MASK) != (p_sys->i_flags & A52_CHANNEL_MASK)
- && !p_sys->b_dontwarn )
- {
- msg_Warn( p_filter,
- "liba52 couldn't do the requested downmix 0x%x->0x%x",
- p_sys->i_flags & A52_CHANNEL_MASK,
- i_flags & A52_CHANNEL_MASK );
-
- p_sys->b_dontwarn = 1;
- }
-
- if( !p_sys->b_dynrng )
- {
- a52_dynrng( p_sys->p_liba52, NULL, NULL );
- }
-
- for( unsigned i = 0; i < 6; i++ )
- {
- sample_t * p_samples;
-
- if( a52_block( p_sys->p_liba52 ) )
- {
- msg_Warn( p_filter, "a52_block failed for block %d", i );
- }
-
- p_samples = a52_samples( p_sys->p_liba52 );
-
- if ( ((p_sys->i_flags & A52_CHANNEL_MASK) == A52_CHANNEL1
- || (p_sys->i_flags & A52_CHANNEL_MASK) == A52_CHANNEL2
- || (p_sys->i_flags & A52_CHANNEL_MASK) == A52_MONO)
- && (p_filter->fmt_out.audio.i_physical_channels
- & (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)) )
- {
- Duplicate( (sample_t *)(p_out_buf->p_buffer + i * i_bytes_per_block),
- p_samples );
- }
- else if ( p_filter->fmt_out.audio.i_original_channels
- & AOUT_CHAN_REVERSESTEREO )
- {
- Exchange( (sample_t *)(p_out_buf->p_buffer + i * i_bytes_per_block),
- p_samples );
- }
- else
- {
- /* Interleave the *$£%ù samples. */
- Interleave( (sample_t *)(p_out_buf->p_buffer + i * i_bytes_per_block),
- p_samples, p_sys->i_nb_channels, p_sys->pi_chan_table);
- }
- }
-
- p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
- p_out_buf->i_dts = p_in_buf->i_dts;
- p_out_buf->i_pts = p_in_buf->i_pts;
- p_out_buf->i_length = p_in_buf->i_length;
-out:
- block_Release( p_in_buf );
- return p_out_buf;
-}
-
-/*****************************************************************************
- * OpenFilter:
- *****************************************************************************/
-static int OpenFilter( vlc_object_t *p_this )
-{
- filter_t *p_filter = (filter_t *)p_this;
- filter_sys_t *p_sys;
- int i_ret;
-
- if( p_filter->fmt_in.i_codec != VLC_CODEC_A52 )
- return VLC_EGENERIC;
-#ifdef LIBA52_FIXED
- if( p_filter->fmt_out.audio.i_format != VLC_CODEC_S32N )
-#else
- if( p_filter->fmt_out.audio.i_format != VLC_CODEC_FL32 )
-#endif
- return VLC_EGENERIC;
-
- /* Allocate the memory needed to store the module's structure */
- p_filter->p_sys = p_sys = malloc( sizeof(filter_sys_t) );
- if( p_sys == NULL )
- return VLC_ENOMEM;
-
- i_ret = Open( VLC_OBJECT(p_filter), p_sys,
- &p_filter->fmt_in.audio, &p_filter->fmt_out.audio );
-
- p_filter->pf_audio_filter = Convert;
- p_filter->fmt_out.audio.i_rate = p_filter->fmt_in.audio.i_rate;
-
- return i_ret;
-}
-
-/*****************************************************************************
- * CloseFilter : deallocate data structures
- *****************************************************************************/
-static void CloseFilter( vlc_object_t *p_this )
-{
- filter_t *p_filter = (filter_t *)p_this;
- filter_sys_t *p_sys = p_filter->p_sys;
-
- a52_free( p_sys->p_liba52 );
- free( p_sys );
-}
diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index 67e69b0..1bdf0c1 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -16,6 +16,13 @@ endif
libspdif_plugin_la_SOURCES = codec/spdif.c
codec_LTLIBRARIES += libspdif_plugin.la
+libliba52_plugin_la_SOURCES = codec/liba52.c
+libliba52_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_liba52)
+libliba52_plugin_la_LIBADD = $(LIBM) $(LIBS_liba52)
+libliba52_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+EXTRA_LTLIBRARIES += libliba52_plugin.la
+codec_LTLIBRARIES += $(LTLIBliba52)
+
libadpcm_plugin_la_SOURCES = codec/adpcm.c
codec_LTLIBRARIES += libadpcm_plugin.la
diff --git a/modules/codec/liba52.c b/modules/codec/liba52.c
new file mode 100644
index 0000000..7f27779
--- /dev/null
+++ b/modules/codec/liba52.c
@@ -0,0 +1,384 @@
+/*****************************************************************************
+ * liba52.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/).
+ *****************************************************************************
+ * Copyright (C) 2001-2009 VLC authors and VideoLAN
+ * $Id$
+ *
+ * Authors: Gildas Bazin <gbazin at videolan.org>
+ * Christophe Massiot <massiot at via.ecp.fr>
+ * Thomas Guillem <thomas at gllm.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * NOTA BENE: this module requires the linking against a library which is
+ * known to require licensing under the GNU General Public License version 2
+ * (or later). Therefore, the result of compiling this module will normally
+ * be subject to the terms of that later license.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_cpu.h>
+
+#include <stdint.h> /* int16_t .. */
+
+#ifdef USE_A52DEC_TREE /* liba52 header file */
+# include "include/a52.h"
+#else
+# include "a52dec/a52.h"
+#endif
+
+#include <vlc_aout.h>
+#include <vlc_block.h>
+#include <vlc_codec.h>
+
+static int Open ( vlc_object_t * );
+static void Close( vlc_object_t * );
+
+struct decoder_sys_t
+{
+ a52_state_t *p_liba52; /* liba52 internal structure */
+ bool b_dynrng; /* see below */
+ int i_flags; /* liba52 flags, see a52dec/doc/liba52.txt */
+ bool b_dontwarn;
+ int i_nb_channels; /* number of float32 per sample */
+
+ uint8_t pi_chan_table[AOUT_CHAN_MAX]; /* channel reordering */
+ bool b_synced;
+};
+
+#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 ()
+ set_shortname( "A/52" )
+ set_description( N_("ATSC A/52 (AC-3) audio decoder") )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_ACODEC )
+ add_bool( "a52-dynrng", true, DYNRNG_TEXT, DYNRNG_LONGTEXT, false )
+ set_capability( "decoder", 100 )
+ set_callbacks( Open, Close )
+vlc_module_end ()
+
+/*
+ * helper function to interleave channels
+ */
+static void Interleave( sample_t *restrict p_out, const sample_t *restrict p_in,
+ unsigned i_nb_channels, uint8_t *restrict pi_chan_table )
+{
+ /* We do not only have to interleave, but also reorder the channels */
+ for( unsigned j = 0; j < i_nb_channels; j++ )
+ {
+ for( unsigned i = 0; i < 256; i++ )
+ {
+#ifdef LIBA52_FIXED
+ union { uint32_t u; int32_t i; } spl;
+
+ spl.u = ((uint32_t)p_in[j * 256 + i]) << 4;
+ p_out[i * i_nb_channels + pi_chan_table[j]] = spl.i;
+#else
+ p_out[i * i_nb_channels + pi_chan_table[j]] = p_in[j * 256 + i];
+#endif
+ }
+ }
+}
+
+/*
+ * helper function to duplicate a unique channel
+ */
+static void Duplicate( sample_t *restrict p_out, const sample_t *restrict p_in )
+{
+ for( unsigned i = 256; i--; )
+ {
+#ifdef LIBA52_FIXED
+ union { uint32_t u; int32_t i; } spl;
+
+ spl.u = ((uint32_t)*(p_in++)) << 4;
+ *p_out++ = spl.i;
+ *p_out++ = spl.i;
+#else
+ sample_t s = *(p_in++);
+
+ *p_out++ = s;
+ *p_out++ = s;
+#endif
+ }
+}
+
+/*
+ * Helper function to exchange left & right channels
+ */
+static void Exchange( sample_t *restrict p_out, const sample_t *restrict p_in )
+{
+ const sample_t *p_first = p_in + 256;
+ const sample_t *p_second = p_in;
+
+ for( unsigned i = 0; i < 256; i++ )
+ {
+#ifdef LIBA52_FIXED
+ uint32_t spl[2];
+
+ spl[0] = ((uint32_t)*p_first++) << 4;
+ spl[1] = ((uint32_t)*p_second++) << 4;
+ memcpy( p_out, spl, sizeof(spl) );
+ p_out += 2;
+#else
+ *p_out++ = *p_first++;
+ *p_out++ = *p_second++;
+#endif
+ }
+}
+
+static block_t *Decode( decoder_t *p_dec, block_t **pp_block )
+{
+ decoder_sys_t *p_sys = p_dec->p_sys;
+
+ if (pp_block == NULL || *pp_block == NULL)
+ return NULL;
+ block_t *p_in_buf = *pp_block;
+
+#ifdef LIBA52_FIXED
+ sample_t i_sample_level = (1 << 24);
+#else
+ sample_t i_sample_level = 1;
+#endif
+ int i_flags = p_sys->i_flags;
+ size_t i_bytes_per_block = 256 * p_sys->i_nb_channels * sizeof(sample_t);
+
+
+ /* Every A/52 frame is composed of 6 blocks, each with an output of 256
+ * samples for each channel. */
+ block_t *p_out_buf = decoder_NewAudioBuffer( p_dec, 6 * i_bytes_per_block );
+ if( unlikely(p_out_buf == NULL) )
+ goto out;
+
+ /* Do the actual decoding now. */
+ a52_frame( p_sys->p_liba52, p_in_buf->p_buffer,
+ &i_flags, &i_sample_level, 0 );
+
+ if ( (i_flags & A52_CHANNEL_MASK) != (p_sys->i_flags & A52_CHANNEL_MASK)
+ && !p_sys->b_dontwarn )
+ {
+ msg_Warn( p_dec,
+ "liba52 couldn't do the requested downmix 0x%x->0x%x",
+ p_sys->i_flags & A52_CHANNEL_MASK,
+ i_flags & A52_CHANNEL_MASK );
+
+ p_sys->b_dontwarn = 1;
+ }
+
+ if( !p_sys->b_dynrng )
+ {
+ a52_dynrng( p_sys->p_liba52, NULL, NULL );
+ }
+
+ for( unsigned i = 0; i < 6; i++ )
+ {
+ if( a52_block( p_sys->p_liba52 ) )
+ msg_Warn( p_dec, "a52_block failed for block %d", i );
+
+ sample_t *p_samples = a52_samples( p_sys->p_liba52 );
+
+ if ( ((p_sys->i_flags & A52_CHANNEL_MASK) == A52_CHANNEL1
+ || (p_sys->i_flags & A52_CHANNEL_MASK) == A52_CHANNEL2
+ || (p_sys->i_flags & A52_CHANNEL_MASK) == A52_MONO)
+ && (p_dec->fmt_out.audio.i_physical_channels
+ & (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)) )
+ {
+ Duplicate( (sample_t *)(p_out_buf->p_buffer + i * i_bytes_per_block),
+ p_samples );
+ }
+ else if ( p_dec->fmt_out.audio.i_original_channels
+ & AOUT_CHAN_REVERSESTEREO )
+ {
+ Exchange( (sample_t *)(p_out_buf->p_buffer + i * i_bytes_per_block),
+ p_samples );
+ }
+ else
+ {
+ /* Interleave the *$£%ù samples. */
+ Interleave( (sample_t *)(p_out_buf->p_buffer + i * i_bytes_per_block),
+ p_samples, p_sys->i_nb_channels, p_sys->pi_chan_table);
+ }
+ }
+
+ p_out_buf->i_nb_samples = A52_FRAME_NB; /* 6 * 256 */
+ p_out_buf->i_dts = p_in_buf->i_dts;
+ p_out_buf->i_pts = p_in_buf->i_pts;
+ p_out_buf->i_length = p_in_buf->i_length;
+out:
+ block_Release( p_in_buf );
+ *pp_block = NULL;
+ return p_out_buf;
+}
+
+static int channels_vlc2a52( const audio_format_t *p_audio, int *p_flags )
+{
+ int i_flags = 0;
+
+ switch ( p_audio->i_physical_channels & ~AOUT_CHAN_LFE )
+ {
+ case AOUT_CHAN_CENTER:
+ if ( (p_audio->i_original_channels & AOUT_CHAN_CENTER)
+ || (p_audio->i_original_channels
+ & (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)) )
+ i_flags = A52_MONO;
+ else if ( p_audio->i_original_channels & AOUT_CHAN_LEFT )
+ i_flags = A52_CHANNEL1;
+ else
+ i_flags = A52_CHANNEL2;
+ break;
+
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT:
+ if ( p_audio->i_original_channels & AOUT_CHAN_DOLBYSTEREO )
+ i_flags = A52_DOLBY;
+ else if ( p_audio->i_original_channels == AOUT_CHAN_CENTER )
+ i_flags = A52_MONO;
+ else if ( p_audio->i_original_channels & AOUT_CHAN_DUALMONO )
+ i_flags = A52_CHANNEL;
+ else if ( !(p_audio->i_original_channels & AOUT_CHAN_RIGHT) )
+ i_flags = A52_CHANNEL1;
+ else if ( !(p_audio->i_original_channels & AOUT_CHAN_LEFT) )
+ i_flags = A52_CHANNEL2;
+ else
+ i_flags = A52_STEREO;
+ break;
+
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER:
+ i_flags = A52_3F;
+ break;
+
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARCENTER:
+ i_flags = A52_2F1R;
+ break;
+
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+ | AOUT_CHAN_REARCENTER:
+ i_flags = A52_3F1R;
+ break;
+
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT:
+ i_flags = A52_2F2R;
+ break;
+
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT:
+ i_flags = A52_3F2R;
+ break;
+
+ default:
+ return VLC_EGENERIC;
+ }
+
+ if ( p_audio->i_physical_channels & AOUT_CHAN_LFE )
+ i_flags |= A52_LFE;
+ *p_flags = i_flags;
+ return VLC_SUCCESS;
+}
+
+static int Open( vlc_object_t *p_this )
+{
+ decoder_t *p_dec = (decoder_t *)p_this;
+ decoder_sys_t *p_sys;
+
+ if( p_dec->fmt_in.i_codec != VLC_CODEC_A52
+ || p_dec->fmt_in.audio.i_rate == 0
+ || p_dec->fmt_in.audio.i_physical_channels == 0
+ || p_dec->fmt_in.audio.i_original_channels == 0
+ || p_dec->fmt_in.audio.i_bytes_per_frame == 0
+ || p_dec->fmt_in.audio.i_frame_length == 0 )
+ return VLC_EGENERIC;
+
+ /* Allocate the memory needed to store the module's structure */
+ p_dec->p_sys = p_sys = malloc( sizeof(decoder_sys_t) );
+ if( p_sys == NULL )
+ return VLC_ENOMEM;
+
+ p_sys->b_dynrng = var_InheritBool( p_this, "a52-dynrng" );
+ p_sys->b_dontwarn = 0;
+
+ p_sys->i_nb_channels = aout_FormatNbChannels( &p_dec->fmt_in.audio );
+ if( channels_vlc2a52( &p_dec->fmt_in.audio, &p_sys->i_flags )
+ != VLC_SUCCESS )
+ {
+ msg_Warn( p_this, "unknown sample format!" );
+ free( p_sys );
+ return VLC_EGENERIC;
+ }
+ p_sys->i_flags |= A52_ADJUST_LEVEL;
+
+ /* Initialize liba52 */
+ p_sys->p_liba52 = a52_init( 0 );
+ if( p_sys->p_liba52 == NULL )
+ {
+ msg_Err( p_this, "unable to initialize liba52" );
+ free( p_sys );
+ return VLC_EGENERIC;
+ }
+
+ static const uint32_t pi_channels_in[] = {
+ AOUT_CHAN_LFE, AOUT_CHAN_LEFT, AOUT_CHAN_CENTER, AOUT_CHAN_RIGHT,
+ AOUT_CHAN_REARLEFT, AOUT_CHAN_REARCENTER, AOUT_CHAN_REARRIGHT, 0
+ };
+
+ aout_CheckChannelReorder( pi_channels_in, NULL,
+ p_dec->fmt_in.audio.i_physical_channels,
+ p_sys->pi_chan_table );
+
+ p_dec->fmt_out.i_cat = AUDIO_ES;
+ p_dec->fmt_out.audio = p_dec->fmt_in.audio;
+#ifdef LIBA52_FIXED
+ p_dec->fmt_out.audio.i_format = VLC_CODEC_S32N;
+#else
+ p_dec->fmt_out.audio.i_format = VLC_CODEC_FL32;
+#endif
+ p_dec->fmt_out.i_codec = p_dec->fmt_out.audio.i_format;
+
+ aout_FormatPrepare( &p_dec->fmt_out.audio );
+
+ if( decoder_UpdateAudioFormat( p_dec ) )
+ {
+ es_format_Init( &p_dec->fmt_out, UNKNOWN_ES, 0 );
+ Close( p_this );
+ return VLC_EGENERIC;
+ }
+
+ p_dec->pf_decode_audio = Decode;
+ p_dec->pf_flush = NULL;
+ return VLC_SUCCESS;
+}
+
+static void Close( vlc_object_t *p_this )
+{
+ decoder_t *p_dec = (decoder_t *)p_this;
+ decoder_sys_t *p_sys = p_dec->p_sys;
+
+ a52_free( p_sys->p_liba52 );
+ free( p_sys );
+}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6475b94..395fce8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -284,7 +284,6 @@ modules/audio_filter/channel_mixer/simple.c
modules/audio_filter/channel_mixer/trivial.c
modules/audio_filter/chorus_flanger.c
modules/audio_filter/compressor.c
-modules/audio_filter/converter/a52tofloat32.c
modules/audio_filter/converter/dtstofloat32.c
modules/audio_filter/converter/format.c
modules/audio_filter/converter/mpgatofixed32.c
@@ -369,6 +368,7 @@ modules/codec/gstreamer/gstdecode.c
modules/codec/jpeg.c
modules/codec/kate.c
modules/codec/libass.c
+modules/codec/liba52.c
modules/codec/libmpeg2.c
modules/codec/lpcm.c
modules/codec/mft.c
--
2.8.1
More information about the vlc-devel
mailing list