summaryrefslogtreecommitdiff
path: root/apps/dsp.c
diff options
context:
space:
mode:
authorThom Johansen <thomj@rockbox.org>2005-11-30 01:21:24 +0000
committerThom Johansen <thomj@rockbox.org>2005-11-30 01:21:24 +0000
commite8b874b039cde2e402ceb7e6a04583000a0109de (patch)
treef08f63f7da9023ebd14cbfefe6341c48ea197eee /apps/dsp.c
parent2f363fe0d6139d06f7d242b46a070027bb8f17eb (diff)
downloadrockbox-e8b874b039cde2e402ceb7e6a04583000a0109de.zip
rockbox-e8b874b039cde2e402ceb7e6a04583000a0109de.tar.gz
rockbox-e8b874b039cde2e402ceb7e6a04583000a0109de.tar.bz2
rockbox-e8b874b039cde2e402ceb7e6a04583000a0109de.tar.xz
Playback speed commit broke mono resampling, this fixes it again.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8111 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/dsp.c')
-rw-r--r--apps/dsp.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/apps/dsp.c b/apps/dsp.c
index 3d02f5a..309c8a2 100644
--- a/apps/dsp.c
+++ b/apps/dsp.c
@@ -305,7 +305,7 @@ static long downsample(long **dst, long **src, int count,
long *d[2] = { dst[0], dst[1] };
int pos = phase >> 16;
int i = 1, j;
- int num_channels = src[0] == src[1] ? 1 : 2;
+ int num_channels = dsp->stereo_mode == STEREO_MONO ? 1 : 2;
for (j = 0; j < num_channels; j++) {
last_sample = r->last_sample[j];
@@ -343,7 +343,7 @@ static long upsample(long **dst, long **src, int count, struct resample_data *r)
long *d[2] = { dst[0], dst[1] };
int i = 0, j;
int pos;
- int num_channels = src[0] == src[1] ? 1 : 2;
+ int num_channels = dsp->stereo_mode == STEREO_MONO ? 1 : 2;
while ((pos = phase >> 16) == 0)
{
@@ -395,7 +395,10 @@ static inline int resample(long* src[], int count)
}
src[0] = dst[0];
- src[1] = dst[1];
+ if (dsp->stereo_mode != STEREO_MONO)
+ src[1] = dst[1];
+ else
+ src[1] = dst[0];
}
else
{