* This plugin makes use of liba52 to decode A/52 audio
* (http://liba52.sf.net/).
*****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
+ * Copyright (C) 2001, 2002 the VideoLAN team
* $Id$
*
* 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
* (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
*
* 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
*****************************************************************************/
#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 "a52dec/a52.h"
#endif
-#include <vlc/decoder.h>
-#include "aout_internal.h"
-#include "vlc_filter.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 *,
+static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
aout_buffer_t * );
static int Open ( vlc_object_t *, filter_sys_t *,
audio_format_t, audio_format_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_REARRIGHT, 0 };
+/* our internal channel order (WG-4 order) */
+static const uint32_t pi_channels_out[] =
+{ AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT,
+ AOUT_CHAN_CENTER, AOUT_CHAN_LFE, 0 };
+
/*****************************************************************************
* Local structures
*****************************************************************************/
int i_flags; /* liba52 flags, see a52dec/doc/liba52.txt */
vlc_bool_t b_dontwarn;
int i_nb_channels; /* number of float32 per sample */
+
+ int 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.")
+#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( _("ATSC A/52 (AC-3) audio decoder") );
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_ACODEC );
add_bool( "a52-dynrng", 1, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, VLC_FALSE );
+ add_bool( "a52-upmix", 0, NULL, UPMIX_TEXT, UPMIX_LONGTEXT, VLC_TRUE );
set_capability( "audio filter", 100 );
set_callbacks( Create, Destroy );
vlc_module_end();
/*****************************************************************************
- * Create:
+ * Create:
*****************************************************************************/
static int Create( vlc_object_t *p_this )
{
int i_ret;
if ( p_filter->input.i_format != VLC_FOURCC('a','5','2',' ')
+#ifdef LIBA52_FIXED
+ || p_filter->output.i_format != VLC_FOURCC('f','i','3','2') )
+#else
|| p_filter->output.i_format != VLC_FOURCC('f','l','3','2') )
+#endif
{
return -1;
}
}
/*****************************************************************************
- * Open:
+ * Open:
*****************************************************************************/
static int Open( vlc_object_t *p_this, filter_sys_t *p_sys,
- audio_format_t input, audio_format_t output )
+ audio_format_t input, audio_format_t output )
{
p_sys->b_dynrng = config_GetInt( 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 ( ! config_GetInt( 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_PHYSMASK)
return VLC_EGENERIC;
}
+ aout_CheckChannelReorder( pi_channels_in, pi_channels_out,
+ output.i_physical_channels & AOUT_CHAN_PHYSMASK,
+ p_sys->i_nb_channels,
+ p_sys->pi_chan_table );
+
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( float * p_out, const float * p_in, int i_nb_channels,
+ int *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];
}
}
}
aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
{
filter_sys_t *p_sys = (filter_sys_t *)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;
int i_bytes_per_block = 256 * p_sys->i_nb_channels
* sizeof(float);
if ( (i_flags & A52_CHANNEL_MASK) != (p_sys->i_flags & A52_CHANNEL_MASK)
&& !p_sys->b_dontwarn )
{
- msg_Warn( p_filter,
+ msg_Warn( p_aout,
"liba52 couldn't do the requested downmix 0x%x->0x%x",
p_sys->i_flags & A52_CHANNEL_MASK,
i_flags & A52_CHANNEL_MASK );
if( a52_block( p_sys->p_liba52 ) )
{
- msg_Warn( p_filter, "a52_block failed for block %d", i );
+ msg_Warn( p_aout, "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->output.i_physical_channels
+ && (p_filter->output.i_physical_channels
& (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)) )
{
Duplicate( (float *)(p_out_buf->p_buffer + i * i_bytes_per_block),
}
else
{
- /* Interleave the *$£%ù samples. */
+ /* Interleave the *$£%ù samples. */
Interleave( (float *)(p_out_buf->p_buffer + i * i_bytes_per_block),
- p_samples, p_sys->i_nb_channels );
+ p_samples, p_sys->i_nb_channels, p_sys->pi_chan_table);
}
}
}
/*****************************************************************************
- * OpenFilter:
+ * OpenFilter:
*****************************************************************************/
static int OpenFilter( vlc_object_t *p_this )
{
}
p_filter->fmt_out.audio.i_format =
+#ifdef LIBA52_FIXED
+ p_filter->fmt_out.i_codec = VLC_FOURCC('f','i','3','2');
+#else
p_filter->fmt_out.i_codec = VLC_FOURCC('f','l','3','2');
-
- /* Allocate the memory needed to store the module's structure */
- p_sys = p_filter->p_sys = malloc( sizeof(filter_sys_t) );
- if( p_sys == NULL )
- {
- msg_Err( p_filter, "out of memory" );
- return VLC_EGENERIC;
- }
+#endif
/* Allocate the memory needed to store the module's structure */
p_filter->p_sys = p_sys = malloc( sizeof(filter_sys_t) );
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;
}
aout_filter_t aout_filter;
aout_buffer_t in_buf, out_buf;
block_t *p_out;
+ int i_out_size;
- int i_out_size = p_block->i_samples *
+ if( !p_block || !p_block->i_samples )
+ {
+ if( p_block ) p_block->pf_release( p_block );
+ return NULL;
+ }
+
+ i_out_size = p_block->i_samples *
p_filter->fmt_out.audio.i_bitspersample *
- p_filter->fmt_out.audio.i_channels;
+ p_filter->fmt_out.audio.i_channels / 8;
p_out = p_filter->pf_audio_buffer_new( p_filter, i_out_size );
if( !p_out )
{
msg_Warn( p_filter, "can't get output buffer" );
+ p_block->pf_release( p_block );
return NULL;
}
DoWork( (aout_instance_t *)p_filter, &aout_filter, &in_buf, &out_buf );
+ p_out->i_buffer = out_buf.i_nb_bytes;
+ p_out->i_samples = out_buf.i_nb_samples;
+
+ p_block->pf_release( p_block );
+
return p_out;
}
projects / vlc / blobdiff