Commit cb4cb202 authored by Christophe Massiot's avatar Christophe Massiot

* configure.ac.in: Re-added a52sys module, which was lost somewhere...

* Fixed bugs regarding Dolby Surround downmixing.
parent f9975e29
...@@ -737,7 +737,7 @@ PLUGINS="${PLUGINS} aout_file" ...@@ -737,7 +737,7 @@ PLUGINS="${PLUGINS} aout_file"
#PLUGINS="${PLUGINS} scope" #PLUGINS="${PLUGINS} scope"
PLUGINS="${PLUGINS} i420_rgb i420_yuy2 i422_yuy2 i420_ymga" PLUGINS="${PLUGINS} i420_rgb i420_yuy2 i422_yuy2 i420_ymga"
PLUGINS="${PLUGINS} id3 m3u" PLUGINS="${PLUGINS} id3 m3u"
PLUGINS="${PLUGINS} wav araw demuxdump demuxsub adpcm" PLUGINS="${PLUGINS} wav araw demuxdump demuxsub adpcm a52sys"
PLUGINS="${PLUGINS} access_udp access_http ipv4 access_mms access_ftp" PLUGINS="${PLUGINS} access_udp access_http ipv4 access_mms access_ftp"
PLUGINS="${PLUGINS} sap" PLUGINS="${PLUGINS} sap"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* (http://liba52.sf.net/). * (http://liba52.sf.net/).
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001, 2002 VideoLAN
* $Id: a52tofloat32.c,v 1.10 2002/12/25 02:23:36 massiot Exp $ * $Id: a52tofloat32.c,v 1.11 2003/01/22 09:54:28 massiot Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* Christophe Massiot <massiot@via.ecp.fr> * Christophe Massiot <massiot@via.ecp.fr>
...@@ -66,6 +66,7 @@ struct aout_filter_sys_t ...@@ -66,6 +66,7 @@ struct aout_filter_sys_t
a52_state_t * p_liba52; /* liba52 internal structure */ a52_state_t * p_liba52; /* liba52 internal structure */
vlc_bool_t b_dynrng; /* see below */ vlc_bool_t b_dynrng; /* see below */
int i_flags; /* liba52 flags, see a52dec/doc/liba52.txt */ 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 i_nb_channels; /* number of float32 per sample */
}; };
...@@ -116,6 +117,7 @@ static int Create( vlc_object_t * _p_filter ) ...@@ -116,6 +117,7 @@ static int Create( vlc_object_t * _p_filter )
} }
p_sys->b_dynrng = config_GetInt( p_filter, "a52-dynrng" ); p_sys->b_dynrng = config_GetInt( p_filter, "a52-dynrng" );
p_sys->b_dontwarn = 0;
/* We'll do our own downmixing, thanks. */ /* We'll do our own downmixing, thanks. */
p_sys->i_nb_channels = aout_FormatNbChannels( &p_filter->output ); p_sys->i_nb_channels = aout_FormatNbChannels( &p_filter->output );
...@@ -190,7 +192,7 @@ static int Create( vlc_object_t * _p_filter ) ...@@ -190,7 +192,7 @@ static int Create( vlc_object_t * _p_filter )
break; break;
default: default:
msg_Err( p_filter, "unknow sample format !" ); msg_Err( p_filter, "unknown sample format !" );
free( p_sys ); free( p_sys );
return -1; return -1;
} }
...@@ -293,19 +295,15 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, ...@@ -293,19 +295,15 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
a52_frame( p_sys->p_liba52, p_in_buf->p_buffer, a52_frame( p_sys->p_liba52, p_in_buf->p_buffer,
&i_flags, &i_sample_level, 0 ); &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, msg_Warn( p_filter,
"liba52 couldn't do the requested downmix 0x%x->0x%x", "liba52 couldn't do the requested downmix 0x%x->0x%x",
p_sys->i_flags & A52_CHANNEL_MASK, p_sys->i_flags & A52_CHANNEL_MASK,
i_flags & A52_CHANNEL_MASK ); i_flags & A52_CHANNEL_MASK );
/* We do not know if the output has the same number of channels p_sys->b_dontwarn = 1;
* 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;
} }
if( !p_sys->b_dynrng ) if( !p_sys->b_dynrng )
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* output.c : internal management of output streams for the audio output * output.c : internal management of output streams for the audio output
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: output.c,v 1.29 2003/01/20 10:59:29 massiot Exp $ * $Id: output.c,v 1.30 2003/01/22 09:54:29 massiot Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -119,18 +119,19 @@ int aout_OutputNew( aout_instance_t * p_aout, ...@@ -119,18 +119,19 @@ int aout_OutputNew( aout_instance_t * p_aout,
{ {
/* Stereo - create the audio-channels variable. */ /* Stereo - create the audio-channels variable. */
var_Create( p_aout, "audio-channels", VLC_VAR_STRING | VLC_VAR_HASCHOICE ); var_Create( p_aout, "audio-channels", VLC_VAR_STRING | VLC_VAR_HASCHOICE );
val.psz_string = N_("Both"); if ( p_aout->output.output.i_original_channels & AOUT_CHAN_DOLBYSTEREO )
{
val.psz_string = N_("Dolby Surround");
}
else
{
val.psz_string = N_("Both");
}
var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val ); var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val );
val.psz_string = N_("Left"); val.psz_string = N_("Left");
var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val ); var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val );
val.psz_string = N_("Right"); val.psz_string = N_("Right");
var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val ); var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val );
if ( p_aout->output.output.i_original_channels & AOUT_CHAN_DOLBYSTEREO )
{
val.psz_string = N_("Dolby Surround");
var_Change( p_aout, "audio-channels", VLC_VAR_ADDCHOICE, &val );
}
p_aout->output.output.i_original_channels &= ~AOUT_CHAN_DOLBYSTEREO;
var_AddCallback( p_aout, "audio-channels", aout_ChannelsRestart, var_AddCallback( p_aout, "audio-channels", aout_ChannelsRestart,
NULL ); NULL );
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment