summaryrefslogtreecommitdiff
path: root/lib/rbcodec/codecs/wav64.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2013-07-14 07:59:39 -0400
committerMichael Sevakis <jethead71@rockbox.org>2014-03-10 04:12:30 +0100
commit31b712286721dd606940c7b557d03e3f714b9604 (patch)
tree8c4a4cc32e9000ea721ebb23aa3c0129ca97bf53 /lib/rbcodec/codecs/wav64.c
parentdda54b85daa83b7803b4fb189ab45859f96ff3f9 (diff)
downloadrockbox-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/wav64.c')
-rw-r--r--lib/rbcodec/codecs/wav64.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/lib/rbcodec/codecs/wav64.c b/lib/rbcodec/codecs/wav64.c
index 9b3b2d38e4..96e605faad 100644
--- a/lib/rbcodec/codecs/wav64.c
+++ b/lib/rbcodec/codecs/wav64.c
@@ -191,6 +191,7 @@ enum codec_status codec_run(void)
191 codec_set_replaygain(ci->id3); 191 codec_set_replaygain(ci->id3);
192 192
193 /* Need to save offset for later use (cleared indirectly by advance_buffer) */ 193 /* Need to save offset for later use (cleared indirectly by advance_buffer) */
194 param = ci->id3->elapsed;
194 bytesdone = ci->id3->offset; 195 bytesdone = ci->id3->offset;
195 196
196 /* get RIFF chunk header */ 197 /* get RIFF chunk header */
@@ -363,10 +364,22 @@ enum codec_status codec_run(void)
363 } 364 }
364 365
365 /* make sure we're at the correct offset */ 366 /* make sure we're at the correct offset */
366 if (bytesdone > (uint32_t) firstblockposn) { 367 if (bytesdone > (uint32_t) firstblockposn || param) {
368 uint32_t seek_val;
369 int seek_mode;
370
371 /* we prefer offset resume */
372 if (bytesdone > (uint32_t) firstblockposn) {
373 seek_val = bytesdone - firstblockposn;
374 seek_mode = PCM_SEEK_POS;
375 } else {
376 seek_val = param;
377 seek_mode = PCM_SEEK_TIME;
378 }
379
367 /* Round down to previous block */ 380 /* Round down to previous block */
368 struct pcm_pos *newpos = codec->get_seek_pos(bytesdone - firstblockposn, 381 struct pcm_pos *newpos = codec->get_seek_pos(seek_val, seek_mode,
369 PCM_SEEK_POS, &read_buffer); 382 &read_buffer);
370 383
371 if (newpos->pos > format.numbytes) { 384 if (newpos->pos > format.numbytes) {
372 return CODEC_OK; 385 return CODEC_OK;