Commit 91b7fb00d0462b4277ad4a527e4764f6cb617c39

Ryan C. Gordon 2014-06-10T19:37:59

Fix audio resampling in some cases. Fixes Bugzilla #2389.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
diff --git a/src/audio/sdlgenaudiocvt.pl b/src/audio/sdlgenaudiocvt.pl
index 73c021a..d4c2c50 100755
--- a/src/audio/sdlgenaudiocvt.pl
+++ b/src/audio/sdlgenaudiocvt.pl
@@ -383,6 +383,7 @@ sub buildArbitraryResampleFunc {
     my $eps_adjust = ($upsample) ? 'dstsize' : 'srcsize';
     my $incr = '';
     my $incr2 = '';
+    my $block_align = $channels * $fsize/8;
 
 
     # !!! FIXME: DEBUG_CONVERT should report frequencies.
@@ -395,7 +396,7 @@ ${sym}(SDL_AudioCVT * cvt, SDL_AudioFormat format)
 #endif
 
     const int srcsize = cvt->len_cvt - $fudge;
-    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    const int dstsize = (int) (((double)(cvt->len_cvt/${block_align})) * cvt->rate_incr) * ${block_align};
     register int eps = 0;
 EOF