From: Antoine Cellerier <dionoea@videolan.org>
Date: Sun, 22 Jun 2008 17:20:15 +0000 (+0200)
Subject: Finish fixing audio rate changes.
X-Git-Tag: 0.9.0-test1~156
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f5623dec1ca290e9adcbbc34ba4fe3f03a4c2e69;p=vlc

Finish fixing audio rate changes.
---

diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c
index 67b41dafd4..af0c0c92a7 100644
--- a/modules/stream_out/transcode.c
+++ b/modules/stream_out/transcode.c
@@ -1152,7 +1152,7 @@ static int transcode_audio_new( sout_stream_t *p_stream,
                     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_rate = id->p_encoder->fmt_out.audio.i_rate;
+    id->p_encoder->fmt_in.audio.i_rate = fmt_last.audio.i_rate;//id->p_encoder->fmt_out.audio.i_rate;
     id->p_encoder->fmt_in.audio.i_physical_channels =
         id->p_encoder->fmt_out.audio.i_physical_channels;
     id->p_encoder->fmt_in.audio.i_original_channels =
@@ -1188,10 +1188,10 @@ static int transcode_audio_new( sout_stream_t *p_stream,
         fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate )
     {
         /* We'll have to go through fl32 first */
-        es_format_t fmt_out = id->p_encoder->fmt_in;
-        fmt_out.i_codec = fmt_out.audio.i_format = VLC_FOURCC('f','l','3','2');
-        filter_chain_AppendFilter( id->p_f_chain, NULL, NULL, &fmt_last, &fmt_out );
-        fmt_last = fmt_out;
+        fmt_last.i_codec = fmt_last.audio.i_format = VLC_FOURCC('f','l','3','2');
+        fmt_last.audio.i_bitspersample = aout_BitsPerSample( fmt_last.i_codec );
+        filter_chain_AppendFilter( id->p_f_chain, NULL, NULL, NULL, &fmt_last );
+        fmt_last = *filter_chain_GetFmtOut( id->p_f_chain );
     }
 
     for( i = 0; i < 4; i++ )