devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Tweak MP3 seeking a little, and don't do gapless trim if a seek has been done.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9848 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Magnus Holmgren 2006-05-01 11:54:04 +00:00
parent b4f0efc1dd
commit d5e1157cf7
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
apps/codecs/mpa.c
View file

@ -97,6 +97,11 @@ enum codec_status codec_start(struct codec_api *api)
int frame_skip; /* samples to skip current frame */ int frame_skip; /* samples to skip current frame */
int samples_to_skip; /* samples to skip in total for this file (at start) */ int samples_to_skip; /* samples to skip in total for this file (at start) */
char *inputbuffer; char *inputbuffer;
/* If we know the position isn't exact (i.e., we have seeked to a
* position that isn't the start of the file), we can't reliably do
* end-of-file trimming for gapless playback.
*/
bool exact_position = true;
ci = api; ci = api;
@ -147,6 +152,7 @@ enum codec_status codec_start(struct codec_api *api)
} }
samplesdone = ((int64_t)ci->id3->elapsed) * current_frequency / 1000; samplesdone = ((int64_t)ci->id3->elapsed) * current_frequency / 1000;
exact_position = samplesdone == 0;
samples_to_skip = start_skip; samples_to_skip = start_skip;
recalc_samplecount(); recalc_samplecount();
@ -163,12 +169,12 @@ enum codec_status codec_start(struct codec_api *api)
samplesdone = ((int64_t) (ci->seek_time - 1)) samplesdone = ((int64_t) (ci->seek_time - 1))
* current_frequency / 1000; * current_frequency / 1000;
exact_position = samplesdone == 0;
if (ci->seek_time-1 == 0) if (ci->seek_time-1 == 0)
newpos = 0; newpos = ci->id3->first_frame_offset;
else else
newpos = ci->mp3_get_filepos(ci->seek_time-1) + newpos = ci->mp3_get_filepos(ci->seek_time-1);
ci->id3->first_frame_offset;
if (!ci->seek_buffer(newpos)) if (!ci->seek_buffer(newpos))
break; break;
@ -230,7 +236,7 @@ enum codec_status codec_start(struct codec_api *api)
framelength = synth.pcm.length - frame_skip; framelength = synth.pcm.length - frame_skip;
if (stop_skip > 0) { if (exact_position && (stop_skip > 0)) {
int64_t max = samplecount - samplesdone; int64_t max = samplecount - samplesdone;
if (max < 0) max = 0; if (max < 0) max = 0;