Fix resampling clicking as much as possible at the moment. 1) Upsampling clicked because of size inaccuracies returned by DSP. Fix by simplifying audio system to use per-channel sample count from codec to pcm buffer. 2) Downsampling affected by 1) and was often starting passed the end of the data when not enough was available to generate an output sample. Fix by clamping input range to last sample in buffer and using the last sample value in the buffer. A perfect fix will require a double buffering scheme on the resampler to sufficient data during small data transients on both ends at all times of the down ratio on input and the up ratio on output.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12218 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 5 insertions, 5 deletions

diff --git a/apps/codecs/mpa.c b/apps/codecs/mpa.c
index 6e474c1abb..4c99778071 100644
--- a/apps/codecs/mpa.c
+++ b/apps/codecs/mpa.c
@@ -199,9 +199,9 @@ next_track:
            loop we will need to process the final frame that was decoded. */
         if (framelength > 0) {
             /* In case of a mono file, the second array will be ignored. */
-            ci->pcmbuf_insert_split(&synth.pcm.samples[0][samples_to_skip],
-                                    &synth.pcm.samples[1][samples_to_skip],
-                                    framelength * 4);
+            ci->pcmbuf_insert(&synth.pcm.samples[0][samples_to_skip],
+                              &synth.pcm.samples[1][samples_to_skip],
+                              framelength);
 
             /* Only skip samples for the first frame added. */
             samples_to_skip = 0;
@@ -244,8 +244,8 @@ next_track:
     /* Finish the remaining decoded frame.
        Cut the required samples from the end. */
     if (framelength > stop_skip)
-        ci->pcmbuf_insert_split(synth.pcm.samples[0], synth.pcm.samples[1],
-                                (framelength - stop_skip) * 4);
+        ci->pcmbuf_insert(synth.pcm.samples[0], synth.pcm.samples[1],
+                          framelength - stop_skip);
 
     stream.error = 0;