Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix for ff/rw in long MP3 files.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7334 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Magnus Holmgren 2005-08-16 18:26:41 +00:00
parent 1d28240330
commit 753a89718c
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
apps/codecs/mpa.c
View file

@ -25,6 +25,7 @@
#include "dsp.h" #include "dsp.h"
#include "lib/codeclib.h" #include "lib/codeclib.h"
#include "system.h" #include "system.h"
#include <inttypes.h>
struct mad_stream Stream IDATA_ATTR; struct mad_stream Stream IDATA_ATTR;
struct mad_frame Frame IDATA_ATTR; struct mad_frame Frame IDATA_ATTR;
@ -52,11 +53,10 @@ extern char iramend[];
#endif #endif
struct codec_api *ci; struct codec_api *ci;
unsigned int samplecount; int64_t samplecount;
unsigned int samplesdone; int64_t samplesdone;
int stop_skip, start_skip; int stop_skip, start_skip;
int current_stereo_mode = -1; int current_stereo_mode = -1;
int frequency_divider;
unsigned int current_frequency = 0; unsigned int current_frequency = 0;
void recalc_samplecount(void) void recalc_samplecount(void)
@ -67,10 +67,12 @@ void recalc_samplecount(void)
if (ci->id3->frame_count) { if (ci->id3->frame_count) {
/* TODO: 1152 is the frame size in samples for MPEG1 layer 2 and layer 3, /* TODO: 1152 is the frame size in samples for MPEG1 layer 2 and layer 3,
it's probably not correct at all for MPEG2 and layer 1 */ it's probably not correct at all for MPEG2 and layer 1 */
samplecount = ci->id3->frame_count*1152 - (start_skip + stop_skip); samplecount = ((int64_t) ci->id3->frame_count) * 1152;
} else { } else {
samplecount = ci->id3->length * frequency_divider / 10; samplecount = ((int64_t) ci->id3->length) * current_frequency / 10;
} }
samplecount -= start_skip + stop_skip;
} }
/* this is the codec entry point */ /* this is the codec entry point */
@ -134,10 +136,6 @@ enum codec_status codec_start(struct codec_api* api)
while (!*ci->taginfo_ready && !ci->stop_codec) while (!*ci->taginfo_ready && !ci->stop_codec)
ci->sleep(1); ci->sleep(1);
frequency_divider = ci->id3->frequency / 100;
if (frequency_divider <= 0)
frequency_divider = 441;
ci->configure(DSP_SET_FREQUENCY, (int *)ci->id3->frequency); ci->configure(DSP_SET_FREQUENCY, (int *)ci->id3->frequency);
current_frequency = ci->id3->frequency; current_frequency = ci->id3->frequency;
codec_set_replaygain(ci->id3); codec_set_replaygain(ci->id3);
@ -155,7 +153,7 @@ enum codec_status codec_start(struct codec_api* api)
start_skip = mpeg_latency[ci->id3->layer]; start_skip = mpeg_latency[ci->id3->layer];
} }
samplesdone = ci->id3->elapsed * frequency_divider / 10; samplesdone = ((int64_t) ci->id3->elapsed) * current_frequency / 1000;
frame_skip = start_skip; frame_skip = start_skip;
recalc_samplecount(); recalc_samplecount();
@ -171,7 +169,8 @@ enum codec_status codec_start(struct codec_api* api)
if (ci->seek_time) { if (ci->seek_time) {
int newpos; int newpos;
samplesdone = (ci->seek_time-1) * frequency_divider / 10; samplesdone = ((int64_t) (ci->seek_time - 1))
* current_frequency / 1000;
newpos = ci->mp3_get_filepos(ci->seek_time-1); newpos = ci->mp3_get_filepos(ci->seek_time-1);
if (!ci->seek_buffer(newpos)) { if (!ci->seek_buffer(newpos)) {
@ -235,7 +234,6 @@ enum codec_status codec_start(struct codec_api* api)
if(Frame.header.samplerate != current_frequency) { if(Frame.header.samplerate != current_frequency) {
current_frequency = Frame.header.samplerate; current_frequency = Frame.header.samplerate;
frequency_divider = current_frequency / 100;
ci->configure(DSP_SWITCH_FREQUENCY, ci->configure(DSP_SWITCH_FREQUENCY,
(int *)current_frequency); (int *)current_frequency);
recalc_samplecount(); recalc_samplecount();
@ -243,10 +241,10 @@ enum codec_status codec_start(struct codec_api* api)
if (stop_skip > 0) if (stop_skip > 0)
{ {
long max = samplecount - samplesdone; int64_t max = samplecount - samplesdone;
if (max < 0) max = 0; if (max < 0) max = 0;
if (max < framelength) framelength = max; if (max < framelength) framelength = (int) max;
if (framelength == 0) break; if (framelength == 0) break;
} }
@ -275,7 +273,7 @@ enum codec_status codec_start(struct codec_api* api)
ci->advance_buffer(size); ci->advance_buffer(size);
samplesdone += framelength; samplesdone += framelength;
ci->set_elapsed(samplesdone / (frequency_divider / 10)); ci->set_elapsed(samplesdone / (current_frequency / 1000));
} }
Stream.error = 0; Stream.error = 0;