* (http://liba52.sf.net/).
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: a52tofloat32.c,v 1.7 2002/11/18 23:00:41 massiot Exp $
+ * $Id: a52tofloat32.c,v 1.12 2003/01/22 18:31:47 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 */
};
}
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 );
{
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;
break;
default:
- msg_Err( p_filter, "unknow sample format !" );
+ msg_Err( p_filter, "unknown sample format !" );
free( p_sys );
return -1;
}
*****************************************************************************/
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 */
+ 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[j * 256 + i];
+ p_out[i * i_nb_channels + j] = p_in[translation[i_nb_channels][j]
+ * 256 + i];
}
}
}
}
}
+/*****************************************************************************
+ * Exchange: helper function to exchange left & right channels
+ *****************************************************************************/
+static void Exchange( float * p_out, const float * p_in )
+{
+ int i;
+ const float * p_first = p_in + 256;
+ const float * p_second = p_in;
+
+ for ( i = 0; i < 256; i++ )
+ {
+ *p_out++ = *p_first++;
+ *p_out++ = *p_second++;
+ }
+}
+
/*****************************************************************************
* 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 & A52_CHANNEL_MASK,
- i_flags & A52_CHANNEL_MASK );
-
- /* We do not know if the output has the same number of channels
- * than the input, so die quietly... */
- memset( p_out_buf->p_buffer, 0, i_bytes_per_block * 6 );
- p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
- p_out_buf->i_nb_bytes = 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 )
Duplicate( (float *)(p_out_buf->p_buffer + i * i_bytes_per_block),
p_samples );
}
+ else if ( p_filter->output.i_original_channels
+ & AOUT_CHAN_REVERSESTEREO )
+ {
+ Exchange( (float *)(p_out_buf->p_buffer + i * i_bytes_per_block),
+ p_samples );
+ }
else
{
/* Interleave the *$£%ù samples. */
projects / vlc / blobdiff