* (http://liba52.sf.net/).
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: a52tofloat32.c,v 1.2 2002/09/16 20:46:37 massiot Exp $
+ * $Id: a52tofloat32.c,v 1.11 2003/01/22 09:54:28 massiot Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
* Christophe Massiot <massiot@via.ecp.fr>
a52_state_t * p_liba52; /* liba52 internal structure */
vlc_bool_t b_dynrng; /* see below */
int i_flags; /* liba52 flags, see a52dec/doc/liba52.txt */
+ vlc_bool_t b_dontwarn;
int i_nb_channels; /* number of float32 per sample */
};
aout_filter_t * p_filter = (aout_filter_t *)_p_filter;
struct aout_filter_sys_t * p_sys;
- if ( p_filter->input.i_format != AOUT_FMT_A52
- || p_filter->output.i_format != AOUT_FMT_FLOAT32 )
+ if ( p_filter->input.i_format != VLC_FOURCC('a','5','2',' ')
+ || p_filter->output.i_format != VLC_FOURCC('f','l','3','2') )
{
return -1;
}
}
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_channels & AOUT_CHAN_MASK )
+ switch ( (p_filter->output.i_physical_channels & AOUT_CHAN_PHYSMASK)
+ & ~AOUT_CHAN_LFE )
{
- case AOUT_CHAN_CHANNEL: p_sys->i_flags = A52_CHANNEL; break;
- case AOUT_CHAN_CHANNEL1: p_sys->i_flags = A52_CHANNEL1; break;
- case AOUT_CHAN_CHANNEL2: p_sys->i_flags = A52_CHANNEL2; break;
- case AOUT_CHAN_MONO: p_sys->i_flags = A52_MONO; break;
- case AOUT_CHAN_STEREO: p_sys->i_flags = A52_STEREO; break;
- case AOUT_CHAN_DOLBY: p_sys->i_flags = A52_DOLBY; break;
- case AOUT_CHAN_3F: p_sys->i_flags = A52_3F; break;
- case AOUT_CHAN_2F1R: p_sys->i_flags = A52_2F1R; break;
- case AOUT_CHAN_3F1R: p_sys->i_flags = A52_3F1R; break;
- case AOUT_CHAN_2F2R: p_sys->i_flags = A52_2F2R; break;
- case AOUT_CHAN_3F2R: p_sys->i_flags = A52_3F2R; break;
+ case AOUT_CHAN_CENTER:
+ if ( (p_filter->output.i_original_channels & AOUT_CHAN_CENTER)
+ || (p_filter->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 )
+ {
+ p_sys->i_flags = A52_CHANNEL1;
+ }
+ else
+ {
+ p_sys->i_flags = A52_CHANNEL2;
+ }
+ break;
+
+ case AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT:
+ if ( p_filter->output.i_original_channels & AOUT_CHAN_DOLBYSTEREO )
+ {
+ p_sys->i_flags = A52_DOLBY;
+ }
+ else if ( p_filter->input.i_original_channels == AOUT_CHAN_CENTER )
+ {
+ p_sys->i_flags = A52_MONO;
+ }
+ else if ( p_filter->input.i_original_channels & AOUT_CHAN_DUALMONO )
+ {
+ p_sys->i_flags = A52_CHANNEL;
+ }
+ else if ( !(p_filter->output.i_original_channels & AOUT_CHAN_RIGHT) )
+ {
+ p_sys->i_flags = A52_CHANNEL1;
+ }
+ else if ( !(p_filter->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_Err( p_filter, "unknow sample format !" );
+ msg_Err( p_filter, "unknown sample format !" );
free( p_sys );
return -1;
}
- if ( p_filter->output.i_channels & AOUT_CHAN_LFE )
+ if ( p_filter->output.i_physical_channels & AOUT_CHAN_LFE )
{
p_sys->i_flags |= A52_LFE;
}
/*****************************************************************************
* Interleave: helper function to interleave channels
*****************************************************************************/
-static void Interleave( float * p_out, const float * p_in, int i_channels )
+static void Interleave( float * p_out, const float * p_in, int i_nb_channels )
{
- int i, j;
+ /* 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 */
- for ( j = 0; j < i_channels; j++ )
+ int i, j;
+ for ( j = 0; j < i_nb_channels; j++ )
{
for ( i = 0; i < 256; i++ )
{
- p_out[i * i_channels + j] = p_in[j * 256 + i];
+ p_out[i * i_nb_channels + j] = p_in[translation[i_nb_channels][j]
+ * 256 + i];
}
}
}
+/*****************************************************************************
+ * Duplicate: helper function to duplicate a unique channel
+ *****************************************************************************/
+static void Duplicate( float * p_out, const float * p_in )
+{
+ int i;
+
+ for ( i = 256; i--; )
+ {
+ *p_out++ = *p_in;
+ *p_out++ = *p_in;
+ p_in++;
+ }
+}
+
/*****************************************************************************
* DoWork: decode an ATSC A/52 frame.
*****************************************************************************/
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) )
+ if ( (i_flags & A52_CHANNEL_MASK) != (p_sys->i_flags & A52_CHANNEL_MASK)
+ && !p_sys->b_dontwarn )
{
- msg_Err( p_filter,
- "liba52 couldn't do the requested downmix 0x%x->0x%x",
- p_sys->i_flags, i_flags );
- memset( p_out_buf->p_buffer, 0, i_bytes_per_block * 6 );
- return;
+ 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 )
p_samples = a52_samples( p_sys->p_liba52 );
- /* Interleave the *$£%ù samples. */
- Interleave( (float *)(p_out_buf->p_buffer + i * i_bytes_per_block),
- p_samples, p_sys->i_nb_channels );
+ 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
+ & (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)) )
+ {
+ Duplicate( (float *)(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 );
+ }
}
p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
projects / vlc / blobdiff