diff options
author | Mohamed Tarek <mt@rockbox.org> | 2010-08-03 22:59:03 +0000 |
---|---|---|
committer | Mohamed Tarek <mt@rockbox.org> | 2010-08-03 22:59:03 +0000 |
commit | 5da2304f85206a0e8a6ae00dd0530b637cb2c898 (patch) | |
tree | de343a8977efa3a9c64439e898b4ed24e0bd735f | |
parent | 9dd0158ffb98ddbd5bef0e45a9b561294ce50264 (diff) | |
download | rockbox-5da2304f85206a0e8a6ae00dd0530b637cb2c898.tar.gz rockbox-5da2304f85206a0e8a6ae00dd0530b637cb2c898.zip |
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.c | 1 | ||||
-rw-r--r-- | apps/codecs/wmapro.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/apps/codecs/libwmapro/wmaprodec.c b/apps/codecs/libwmapro/wmaprodec.c index b5540f7872..a7a0f4d34d 100644 --- a/apps/codecs/libwmapro/wmaprodec.c +++ b/apps/codecs/libwmapro/wmaprodec.c | |||
@@ -1409,7 +1409,6 @@ static int decode_frame(WMAProDecodeCtx *s) | |||
1409 | return 0; | 1409 | return 0; |
1410 | } | 1410 | } |
1411 | } | 1411 | } |
1412 | s->samples += s->num_channels * s->samples_per_frame; | ||
1413 | 1412 | ||
1414 | if (s->skip_frame) { | 1413 | if (s->skip_frame) { |
1415 | s->skip_frame = 0; | 1414 | s->skip_frame = 0; |
diff --git a/apps/codecs/wmapro.c b/apps/codecs/wmapro.c index 2820672a50..30e60e5716 100644 --- a/apps/codecs/wmapro.c +++ b/apps/codecs/wmapro.c | |||
@@ -136,7 +136,7 @@ next_track: | |||
136 | size -= res; | 136 | size -= res; |
137 | if(outlen) { | 137 | if(outlen) { |
138 | ci->yield (); | 138 | ci->yield (); |
139 | outlen /= (2*wfx.channels); | 139 | outlen /= (wfx.channels); |
140 | ci->pcmbuf_insert(dec[0], dec[1], outlen ); | 140 | ci->pcmbuf_insert(dec[0], dec[1], outlen ); |
141 | elapsedtime += outlen*10/(wfx.rate/100); | 141 | elapsedtime += outlen*10/(wfx.rate/100); |
142 | ci->set_elapsed(elapsedtime); | 142 | ci->set_elapsed(elapsedtime); |