Skip to content

V
vlc
Commit a93168ee authored by Jean-Paul Saman's avatar Jean-Paul Saman Committed by Jean-Paul Saman
Browse files
Options

Revert 0a9a04a8ca489e66b674a4c870cf81f0026ff5d4 and implement it the right way.

parent 315defaa
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 10 deletions
modules/stream_out/transcode.c
View file @ a93168ee
...@@ -1330,17 +1330,29 @@ static int transcode_audio_new( sout_stream_t *p_stream, ...@@ -1330,17 +1330,29 @@ static int transcode_audio_new( sout_stream_t *p_stream,
id->p_decoder->fmt_out.i_codec ); id->p_decoder->fmt_out.i_codec );
id->p_encoder->fmt_in.audio.i_format = id->p_decoder->fmt_out.i_codec; id->p_encoder->fmt_in.audio.i_format = id->p_decoder->fmt_out.i_codec;
/* Initialization of encoder format structures */ if( ( id->p_encoder->fmt_out.i_codec == VLC_FOURCC('s','a','m','r') ) ||
es_format_Init( &id->p_encoder->fmt_in, AUDIO_ES, VLC_FOURCC('f','l','3','2') ); ( id->p_encoder->fmt_out.i_codec == VLC_FOURCC('s','a','w','b') ) )
id->p_encoder->fmt_in.audio.i_format = VLC_FOURCC('f','l','3','2'); id->p_encoder->fmt_in.audio.i_rate = id->p_encoder->fmt_out.audio.i_rate;
else
id->p_encoder->fmt_in.audio.i_rate = fmt_last.audio.i_rate;
#if 0
/* Fix AAC SBR changing number of channels and sampling rate */
if( ( id->p_decoder->fmt_in.i_codec == VLC_FOURCC('m','p','4','a') ) &&
( fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate ) &&
( fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels ) )
{
id->p_encoder->fmt_in.audio.i_rate = fmt_last.audio.i_rate;
id->p_encoder->fmt_out.audio.i_rate = fmt_last.audio.i_rate;
}
#endif
id->p_encoder->fmt_in.audio.i_rate = id->p_decoder->fmt_out.audio.i_rate;
id->p_encoder->fmt_in.audio.i_physical_channels = id->p_encoder->fmt_in.audio.i_physical_channels =
id->p_decoder->fmt_out.audio.i_physical_channels; id->p_encoder->fmt_out.audio.i_physical_channels;
id->p_encoder->fmt_in.audio.i_original_channels = id->p_encoder->fmt_in.audio.i_original_channels =
id->p_decoder->fmt_out.audio.i_original_channels; id->p_encoder->fmt_out.audio.i_original_channels;
id->p_encoder->fmt_in.audio.i_channels = id->p_encoder->fmt_in.audio.i_channels =
id->p_decoder->fmt_out.audio.i_channels; id->p_encoder->fmt_out.audio.i_channels;
id->p_encoder->fmt_in.audio.i_bitspersample = id->p_encoder->fmt_in.audio.i_bitspersample =
audio_BitsPerSample( id->p_encoder->fmt_in.i_codec ); audio_BitsPerSample( id->p_encoder->fmt_in.i_codec );
...@@ -1360,9 +1372,7 @@ static int transcode_audio_new( sout_stream_t *p_stream, ...@@ -1360,9 +1372,7 @@ static int transcode_audio_new( sout_stream_t *p_stream,
audio_BitsPerSample( id->p_encoder->fmt_in.i_codec ); audio_BitsPerSample( id->p_encoder->fmt_in.i_codec );
/* Load conversion filters */ /* Load conversion filters */
/* Fix AAC SBR changing number of channels and sampling rate */ if( ( fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate ) &&
if( ( id->p_decoder->fmt_in.i_codec == VLC_FOURCC('m','p','4','a') ) &&
( fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate ) &&
( fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels ) ) ( fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels ) )
{ {
/* We'll have to go through fl32 first */ /* We'll have to go through fl32 first */
......
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