Skip to content

V
vlc-1.1
Commit cdc77733 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Patch by xxcv: Don't change fmt_last.audio.i_rate when FOURCC is mp4a

parent b6a2a98f
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 2 deletions
modules/stream_out/transcode.c
View file @ cdc77733
...@@ -1305,8 +1305,11 @@ static int transcode_audio_new( sout_stream_t *p_stream, ...@@ -1305,8 +1305,11 @@ static int transcode_audio_new( sout_stream_t *p_stream,
id->p_decoder->fmt_out.audio.i_bitspersample = id->p_decoder->fmt_out.audio.i_bitspersample =
audio_BitsPerSample( id->p_decoder->fmt_out.i_codec ); audio_BitsPerSample( id->p_decoder->fmt_out.i_codec );
fmt_last = id->p_decoder->fmt_out; fmt_last = id->p_decoder->fmt_out;
/* FIX decoders so we don't have to do this */ /* Fix AAC SBR changing number of channels and sampling rate */
fmt_last.audio.i_rate = id->p_decoder->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_rate = id->p_decoder->fmt_in.audio.i_rate;
/* /*
* Open encoder * Open encoder
...@@ -1345,6 +1348,15 @@ static int transcode_audio_new( sout_stream_t *p_stream, ...@@ -1345,6 +1348,15 @@ static int transcode_audio_new( sout_stream_t *p_stream,
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 );
/* 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;
}
/* Load conversion filters */ /* Load conversion filters */
if( fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels || if( fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels ||
fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate ) fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate )
......
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