* This plugin makes use of liba52 to decode A/52 audio
* (http://liba52.sf.net/).
*****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
- * $Id: a52tofloat32.c,v 1.15 2003/03/30 18:14:36 gbazin Exp $
+ * Copyright (C) 2001-2009 VLC authors and VideoLAN
+ * $Id$
*
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
+ * Authors: Gildas Bazin <gbazin@videolan.org>
* Christophe Massiot <massiot@via.ecp.fr>
- *
- * 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
+ *
+ * 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 General Public License for more details.
+ * 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 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.
+ * 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
*****************************************************************************/
-#include <vlc/vlc.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 HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_cpu.h>
+
+#include <stdint.h> /* int16_t .. */
+#if !HAVE_FPU
+# define LIBA52_FIXED
+#endif
#ifdef USE_A52DEC_TREE /* liba52 header file */
# include "include/a52.h"
#else
# include "a52dec/a52.h"
#endif
-#include "audio_output.h"
-#include "aout_internal.h"
+#include <vlc_aout.h>
+#include <vlc_block.h>
+#include <vlc_filter.h>
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static int Create ( vlc_object_t * );
-static void Destroy ( vlc_object_t * );
-static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
- aout_buffer_t * );
+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 aout_filter_sys_t
+struct filter_sys_t
{
a52_state_t * p_liba52; /* liba52 internal structure */
- vlc_bool_t b_dynrng; /* see below */
+ bool b_dynrng; /* see below */
int i_flags; /* liba52 flags, see a52dec/doc/liba52.txt */
- vlc_bool_t b_dontwarn;
+ bool b_dontwarn;
int i_nb_channels; /* number of float32 per sample */
+
+ uint8_t pi_chan_table[AOUT_CHAN_MAX]; /* channel reordering */
};
/*****************************************************************************
"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, VLC_FALSE );
- add_bool( "a52-dynrng", 1, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, VLC_FALSE );
- set_description( _("ATSC A/52 aka AC-3 audio decoder") );
- set_capability( "audio filter", 100 );
- set_callbacks( Create, Destroy );
-vlc_module_end();
+#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 ()
/*****************************************************************************
- * Create:
+ * Open:
*****************************************************************************/
-static int Create( vlc_object_t * _p_filter )
+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 )
{
- aout_filter_t * p_filter = (aout_filter_t *)_p_filter;
- struct aout_filter_sys_t * p_sys;
-
- if ( p_filter->input.i_format != VLC_FOURCC('a','5','2',' ')
- || p_filter->output.i_format != VLC_FOURCC('f','l','3','2') )
- {
- return -1;
- }
-
- if ( p_filter->input.i_rate != p_filter->output.i_rate )
- {
- return -1;
- }
+ p_sys->b_dynrng = var_InheritBool( p_this, "a52-dynrng" );
+ p_sys->b_dontwarn = 0;
- /* Allocate the memory needed to store the module's structure */
- p_sys = p_filter->p_sys = malloc( sizeof(struct aout_filter_sys_t) );
- if( p_sys == NULL )
+ /* No upmixing: it's not necessary and some other filters may want to do
+ * it themselves. */
+ if ( aout_FormatNbChannels( output ) > aout_FormatNbChannels( input ) )
{
- msg_Err( p_filter, "out of memory" );
- return -1;
+ if ( ! var_InheritBool( p_this, "a52-upmix" ) )
+ {
+ return VLC_EGENERIC;
+ }
}
- p_sys->b_dynrng = config_GetInt( p_filter, "a52-dynrng" );
- p_sys->b_dontwarn = 0;
-
/* We'll do our own downmixing, thanks. */
- p_sys->i_nb_channels = aout_FormatNbChannels( &p_filter->output );
- switch ( (p_filter->output.i_physical_channels & AOUT_CHAN_PHYSMASK)
- & ~AOUT_CHAN_LFE )
+ p_sys->i_nb_channels = aout_FormatNbChannels( output );
+ switch ( output->i_physical_channels & ~AOUT_CHAN_LFE )
{
case AOUT_CHAN_CENTER:
- if ( (p_filter->output.i_original_channels & AOUT_CHAN_CENTER)
- || (p_filter->output.i_original_channels
+ 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 ( p_filter->output.i_original_channels & AOUT_CHAN_LEFT )
+ else if ( output->i_original_channels & AOUT_CHAN_LEFT )
{
p_sys->i_flags = A52_CHANNEL1;
}
break;
case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT:
- if ( p_filter->output.i_original_channels & AOUT_CHAN_DOLBYSTEREO )
+ if ( output->i_original_channels & AOUT_CHAN_DOLBYSTEREO )
{
p_sys->i_flags = A52_DOLBY;
}
- else if ( p_filter->input.i_original_channels == AOUT_CHAN_CENTER )
+ else if ( input->i_original_channels == AOUT_CHAN_CENTER )
{
p_sys->i_flags = A52_MONO;
}
- else if ( p_filter->input.i_original_channels & AOUT_CHAN_DUALMONO )
+ else if ( input->i_original_channels & AOUT_CHAN_DUALMONO )
{
p_sys->i_flags = A52_CHANNEL;
}
- else if ( !(p_filter->output.i_original_channels & AOUT_CHAN_RIGHT) )
+ else if ( !(output->i_original_channels & AOUT_CHAN_RIGHT) )
{
p_sys->i_flags = A52_CHANNEL1;
}
- else if ( !(p_filter->output.i_original_channels & AOUT_CHAN_LEFT) )
+ else if ( !(output->i_original_channels & AOUT_CHAN_LEFT) )
{
p_sys->i_flags = A52_CHANNEL2;
}
break;
default:
- msg_Warn( p_filter, "unknown sample format !" );
+ msg_Warn( p_this, "unknown sample format!" );
free( p_sys );
- return -1;
+ return VLC_EGENERIC;
}
- if ( p_filter->output.i_physical_channels & AOUT_CHAN_LFE )
+ if ( output->i_physical_channels & AOUT_CHAN_LFE )
{
p_sys->i_flags |= A52_LFE;
}
p_sys->p_liba52 = a52_init( 0 );
if( p_sys->p_liba52 == NULL )
{
- msg_Err( p_filter, "unable to initialize liba52" );
- return -1;
+ msg_Err( p_this, "unable to initialize liba52" );
+ free( p_sys );
+ return VLC_EGENERIC;
}
- p_filter->pf_do_work = DoWork;
- p_filter->b_in_place = 0;
+ aout_CheckChannelReorder( pi_channels_in, NULL,
+ output->i_physical_channels,
+ p_sys->pi_chan_table );
- return 0;
+ return VLC_SUCCESS;
}
/*****************************************************************************
* Interleave: helper function to interleave channels
*****************************************************************************/
-static void Interleave( float * p_out, const float * p_in, int i_nb_channels )
+static void Interleave( sample_t * p_out, const sample_t * p_in,
+ int i_nb_channels, uint8_t *pi_chan_table )
{
- /* We do not only have to interleave, but also reorder the channels
- * Channel reordering according to number of output channels of libA52
- * The reordering needs to be different for different channel configurations
- * (3F2R, 1F2R etc), so this is only temporary.
- * The WG-4 order is appropriate for stereo, quadrophonia, and 5.1 surround.
- *
- * 6 channel mode
- * channel liba52 order WG-4 order
- * 0 LFE // L
- * 1 L // R
- * 2 C // LS
- * 3 R // RS
- * 4 LS // C
- * 5 RS // LFE
- *
- * The liba52 moves channels to the front if there are unused spaces, so
- * there is no gap between channels. The translation table says which
- * channel of the new stream is taken from which original channel [use
- * the new channel as the array index, use the number you get from the
- * array to address the original channel].
- */
-
- static const int translation[7][6] =
- {{ 0, 0, 0, 0, 0, 0 }, /* 0 channels (rarely used) */
- { 0, 0, 0, 0, 0, 0 }, /* 1 ch */
- { 0, 1, 0, 0, 0, 0 }, /* 2 */
- { 1, 2, 0, 0, 0, 0 }, /* 3 */
- { 1, 3, 2, 0, 0, 0 }, /* 4 */
- { 1, 3, 4, 2, 0, 0 }, /* 5 */
- { 1, 3, 4, 5, 2, 0 }}; /* 6 */
+ /* We do not only have to interleave, but also reorder the channels */
int i, j;
for ( j = 0; j < i_nb_channels; j++ )
{
for ( i = 0; i < 256; i++ )
{
- p_out[i * i_nb_channels + j] = p_in[translation[i_nb_channels][j]
- * 256 + i];
+ p_out[i * i_nb_channels + pi_chan_table[j]] = p_in[j * 256 + i];
}
}
}
/*****************************************************************************
* Duplicate: helper function to duplicate a unique channel
*****************************************************************************/
-static void Duplicate( float * p_out, const float * p_in )
+static void Duplicate( sample_t * p_out, const sample_t * p_in )
{
int i;
/*****************************************************************************
* Exchange: helper function to exchange left & right channels
*****************************************************************************/
-static void Exchange( float * p_out, const float * p_in )
+static void Exchange( sample_t * p_out, const sample_t * p_in )
{
int i;
- const float * p_first = p_in + 256;
- const float * p_second = p_in;
+ const sample_t * p_first = p_in + 256;
+ const sample_t * p_second = p_in;
for ( i = 0; i < 256; i++ )
{
}
/*****************************************************************************
- * DoWork: decode an ATSC A/52 frame.
+ * Convert: decode an ATSC A/52 frame.
*****************************************************************************/
-static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
- aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
+
+static block_t *Convert( filter_t *p_filter, block_t *p_in_buf )
{
- struct aout_filter_sys_t * p_sys = p_filter->p_sys;
- sample_t i_sample_level = 1;
- int i_flags = p_sys->i_flags;
- int i_bytes_per_block = 256 * p_sys->i_nb_channels
- * sizeof(float);
- int i;
+ 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 = filter_NewAudioBuffer( p_filter, 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,
if( !p_sys->b_dynrng )
{
- a52_dynrng( p_filter->p_sys->p_liba52, NULL, NULL );
+ a52_dynrng( p_sys->p_liba52, NULL, NULL );
}
- for ( i = 0; i < 6; i++ )
+ for( unsigned i = 0; i < 6; i++ )
{
sample_t * p_samples;
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->output.i_physical_channels
+ && (p_filter->fmt_out.audio.i_physical_channels
& (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)) )
{
- Duplicate( (float *)(p_out_buf->p_buffer + i * i_bytes_per_block),
+ Duplicate( (sample_t *)(p_out_buf->p_buffer + i * i_bytes_per_block),
p_samples );
}
- else if ( p_filter->output.i_original_channels
+ else if ( p_filter->fmt_out.audio.i_original_channels
& AOUT_CHAN_REVERSESTEREO )
{
- Exchange( (float *)(p_out_buf->p_buffer + i * i_bytes_per_block),
+ Exchange( (sample_t *)(p_out_buf->p_buffer + i * i_bytes_per_block),
p_samples );
}
else
{
- /* Interleave the *$£%ù samples. */
- Interleave( (float *)(p_out_buf->p_buffer + i * i_bytes_per_block),
- p_samples, p_sys->i_nb_channels );
+ /* 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_nb_bytes = i_bytes_per_block * 6;
+ 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_FI32 )
+#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;
}
/*****************************************************************************
- * Destroy : deallocate data structures
+ * CloseFilter : deallocate data structures
*****************************************************************************/
-static void Destroy( vlc_object_t * _p_filter )
+static void CloseFilter( vlc_object_t *p_this )
{
- aout_filter_t * p_filter = (aout_filter_t *)_p_filter;
- struct aout_filter_sys_t * p_sys = p_filter->p_sys;
+ 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 );
}
-