Skip to content

V
vlc-1.1
Commit 9d447992 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Fixed transcode audio filters insertion (close #3199). 

Calls to aout_PrepareFormat where missing.
parent a463d9bd
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
modules/stream_out/transcode/audio.c
View file @ 9d447992
...@@ -138,6 +138,7 @@ static int transcode_audio_filter_chain_build( sout_stream_t *p_stream, filter_c ...@@ -138,6 +138,7 @@ static int transcode_audio_filter_chain_build( sout_stream_t *p_stream, filter_c
/* First step, convert to fl32 */ /* First step, convert to fl32 */
current.i_codec = current.i_codec =
current.audio.i_format = VLC_CODEC_FL32; current.audio.i_format = VLC_CODEC_FL32;
aout_FormatPrepare( &current.audio );
if( !filter_chain_AppendFilter( p_chain, NULL, NULL, NULL, &current ) ) if( !filter_chain_AppendFilter( p_chain, NULL, NULL, NULL, &current ) )
{ {
...@@ -151,6 +152,7 @@ static int transcode_audio_filter_chain_build( sout_stream_t *p_stream, filter_c ...@@ -151,6 +152,7 @@ static int transcode_audio_filter_chain_build( sout_stream_t *p_stream, filter_c
if( current.audio.i_rate != p_dst->audio.i_rate ) if( current.audio.i_rate != p_dst->audio.i_rate )
{ {
current.audio.i_rate = p_dst->audio.i_rate; current.audio.i_rate = p_dst->audio.i_rate;
aout_FormatPrepare( &current.audio );
if( !filter_chain_AppendFilter( p_chain, NULL, NULL, NULL, &current ) ) if( !filter_chain_AppendFilter( p_chain, NULL, NULL, NULL, &current ) )
{ {
msg_Err( p_stream, "Failed to find conversion filter for resampling" ); msg_Err( p_stream, "Failed to find conversion filter for resampling" );
...@@ -171,6 +173,7 @@ static int transcode_audio_filter_chain_build( sout_stream_t *p_stream, filter_c ...@@ -171,6 +173,7 @@ static int transcode_audio_filter_chain_build( sout_stream_t *p_stream, filter_c
current.audio.i_physical_channels = current.audio.i_physical_channels =
current.audio.i_original_channels = pi_channels_maps[current.audio.i_channels]; current.audio.i_original_channels = pi_channels_maps[current.audio.i_channels];
aout_FormatPrepare( &current.audio );
if( !filter_chain_AppendFilter( p_chain, NULL, NULL, NULL, &current ) ) if( !filter_chain_AppendFilter( p_chain, NULL, NULL, NULL, &current ) )
{ {
msg_Err( p_stream, "Failed to find conversion filter for channel mixing" ); msg_Err( p_stream, "Failed to find conversion filter for channel mixing" );
...@@ -182,6 +185,7 @@ static int transcode_audio_filter_chain_build( sout_stream_t *p_stream, filter_c ...@@ -182,6 +185,7 @@ static int transcode_audio_filter_chain_build( sout_stream_t *p_stream, filter_c
if( current.i_codec != p_dst->i_codec ) if( current.i_codec != p_dst->i_codec )
{ {
current.i_codec = p_dst->i_codec; current.i_codec = p_dst->i_codec;
aout_FormatPrepare( &current.audio );
if( !filter_chain_AppendFilter( p_chain, NULL, NULL, NULL, &current ) ) if( !filter_chain_AppendFilter( p_chain, NULL, NULL, NULL, &current ) )
{ {
msg_Err( p_stream, "Failed to find conversion filter to %4.4s", msg_Err( p_stream, "Failed to find conversion filter to %4.4s",
......
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