diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2013-07-14 07:59:39 -0400 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2014-03-10 04:12:30 +0100 |
commit | 31b712286721dd606940c7b557d03e3f714b9604 (patch) | |
tree | 8c4a4cc32e9000ea721ebb23aa3c0129ca97bf53 /lib/rbcodec/codecs/aiff.c | |
parent | dda54b85daa83b7803b4fb189ab45859f96ff3f9 (diff) | |
download | rockbox-31b712286721dd606940c7b557d03e3f714b9604.tar.gz rockbox-31b712286721dd606940c7b557d03e3f714b9604.zip |
Implement time-based resume and playback start.
This complements offset-based resume and playback start funcionality.
The implementation is global on both HWCODEC and SWCODEC.
Basically, if either the specified elapsed or offset are non-zero,
it indicates a mid-track resume.
To resume by time only, set elapsed to nonzero and offset to zero.
To resume by offset only, set offset to nonzero and elapsed to zero.
Which one the codec uses and which has priority is up to the codec;
however, using an elapsed time covers more cases:
* Codecs not able to use an offset such as VGM or other atomic
formats
* Starting playback at a nonzero elapsed time from a source that
contains no offset, such as a cuesheet
The change re-versions pretty much everything from tagcache to nvram.
Change-Id: Ic7aebb24e99a03ae99585c5e236eba960d163f38
Reviewed-on: http://gerrit.rockbox.org/516
Reviewed-by: Michael Sevakis <jethead71@rockbox.org>
Tested: Michael Sevakis <jethead71@rockbox.org>
Diffstat (limited to 'lib/rbcodec/codecs/aiff.c')
-rw-r--r-- | lib/rbcodec/codecs/aiff.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/lib/rbcodec/codecs/aiff.c b/lib/rbcodec/codecs/aiff.c index 3bedfa5760..9fee781c03 100644 --- a/lib/rbcodec/codecs/aiff.c +++ b/lib/rbcodec/codecs/aiff.c | |||
@@ -99,6 +99,7 @@ enum codec_status codec_run(void) | |||
99 | codec_set_replaygain(ci->id3); | 99 | codec_set_replaygain(ci->id3); |
100 | 100 | ||
101 | /* Need to save offset for later use (cleared indirectly by advance_buffer) */ | 101 | /* Need to save offset for later use (cleared indirectly by advance_buffer) */ |
102 | param = ci->id3->elapsed; | ||
102 | bytesdone = ci->id3->offset; | 103 | bytesdone = ci->id3->offset; |
103 | 104 | ||
104 | /* assume the AIFF header is less than 1024 bytes */ | 105 | /* assume the AIFF header is less than 1024 bytes */ |
@@ -270,10 +271,20 @@ enum codec_status codec_run(void) | |||
270 | ci->advance_buffer(firstblockposn); | 271 | ci->advance_buffer(firstblockposn); |
271 | 272 | ||
272 | /* make sure we're at the correct offset */ | 273 | /* make sure we're at the correct offset */ |
273 | if (bytesdone > (uint32_t) firstblockposn) { | 274 | if (bytesdone > (uint32_t) firstblockposn || param) { |
275 | uint32_t seek_val; | ||
276 | int seek_mode; | ||
277 | |||
278 | if (bytesdone) { | ||
279 | seek_val = bytesdone - MIN((uint32_t) firstblockposn, bytesdone); | ||
280 | seek_mode = PCM_SEEK_POS; | ||
281 | } else { | ||
282 | seek_val = param; | ||
283 | seek_mode = PCM_SEEK_TIME; | ||
284 | } | ||
285 | |||
274 | /* Round down to previous block */ | 286 | /* Round down to previous block */ |
275 | struct pcm_pos *newpos = codec->get_seek_pos(bytesdone - firstblockposn, | 287 | struct pcm_pos *newpos = codec->get_seek_pos(seek_val, seek_mode, NULL); |
276 | PCM_SEEK_POS, NULL); | ||
277 | 288 | ||
278 | if (newpos->pos > format.numbytes) | 289 | if (newpos->pos > format.numbytes) |
279 | return CODEC_OK; | 290 | return CODEC_OK; |