filter/AutoConvert: modify child_audio_format, not in_audio_format

This prevented using the "volume_normalization" feature with some codecs (e.g. mp3), because the normalization code requires 16 bit samples. If the codec happens to deliver formats other than S16, the AutoConvert filter succeeds to initialize the conversion filter, but the returned input audio format was wrong.

filter/AutoConvert: modify child_audio_format, not in_audio_format
2ce39000 · Max Kellermann · bf2c1f3e · 2ce39000 · 2ce39000
Commit 2ce39000 authored Nov 04, 2013 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

NEWS NEWS +2 -0

AutoConvertFilterPlugin.cxx src/filter/AutoConvertFilterPlugin.cxx +2 -2

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.18.1 (2013/11/??)
+* filter:
+  - autoconvert: fix "volume_normalization" with mp3 files

 ver 0.18 (2013/10/31)
 * configuration:

--- a/src/filter/AutoConvertFilterPlugin.cxx
+++ b/src/filter/AutoConvertFilterPlugin.cxx
@@ -60,8 +60,8 @@ AutoConvertFilter::Open(AudioFormat &in_audio_format, Error &error)

 	/* open the "real" filter */

-	const AudioFormat child_audio_format = in_audio_format;
-	AudioFormat out_audio_format = filter->Open(in_audio_format, error);
+	AudioFormat child_audio_format = in_audio_format;
+	AudioFormat out_audio_format = filter->Open(child_audio_format, error);
 	if (!out_audio_format.IsDefined())
 		return out_audio_format;