summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMohamed Tarek <mt@rockbox.org>2010-08-03 22:59:03 +0000
committerMohamed Tarek <mt@rockbox.org>2010-08-03 22:59:03 +0000
commit5da2304f85206a0e8a6ae00dd0530b637cb2c898 (patch)
treede343a8977efa3a9c64439e898b4ed24e0bd735f
parent9dd0158ffb98ddbd5bef0e45a9b561294ce50264 (diff)
downloadrockbox-5da2304f85206a0e8a6ae00dd0530b637cb2c898.zip
rockbox-5da2304f85206a0e8a6ae00dd0530b637cb2c898.tar.gz
rockbox-5da2304f85206a0e8a6ae00dd0530b637cb2c898.tar.bz2
rockbox-5da2304f85206a0e8a6ae00dd0530b637cb2c898.tar.xz
Fix the sample count in wma pro.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27687 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/codecs/libwmapro/wmaprodec.c1
-rw-r--r--apps/codecs/wmapro.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/apps/codecs/libwmapro/wmaprodec.c b/apps/codecs/libwmapro/wmaprodec.c
index b5540f7..a7a0f4d 100644
--- a/apps/codecs/libwmapro/wmaprodec.c
+++ b/apps/codecs/libwmapro/wmaprodec.c
@@ -1409,7 +1409,6 @@ static int decode_frame(WMAProDecodeCtx *s)
return 0;
}
}
- s->samples += s->num_channels * s->samples_per_frame;
if (s->skip_frame) {
s->skip_frame = 0;
diff --git a/apps/codecs/wmapro.c b/apps/codecs/wmapro.c
index 2820672..30e60e5 100644
--- a/apps/codecs/wmapro.c
+++ b/apps/codecs/wmapro.c
@@ -136,7 +136,7 @@ next_track:
size -= res;
if(outlen) {
ci->yield ();
- outlen /= (2*wfx.channels);
+ outlen /= (wfx.channels);
ci->pcmbuf_insert(dec[0], dec[1], outlen );
elapsedtime += outlen*10/(wfx.rate/100);
ci->set_elapsed(elapsedtime);