summaryrefslogtreecommitdiff
path: root/lib/rbcodec/codecs/au.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/au.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/au.c')
-rw-r--r--lib/rbcodec/codecs/au.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/lib/rbcodec/codecs/au.c b/lib/rbcodec/codecs/au.c
index 7ae7fe3e94..18d4296125 100644
--- a/lib/rbcodec/codecs/au.c
+++ b/lib/rbcodec/codecs/au.c
@@ -139,6 +139,7 @@ enum codec_status codec_run(void)
139 codec_set_replaygain(ci->id3); 139 codec_set_replaygain(ci->id3);
140 140
141 /* Need to save offset for later use (cleared indirectly by advance_buffer) */ 141 /* Need to save offset for later use (cleared indirectly by advance_buffer) */
142 param = ci->id3->elapsed;
142 bytesdone = ci->id3->offset; 143 bytesdone = ci->id3->offset;
143 144
144 ci->memset(&format, 0, sizeof(struct pcm_format)); 145 ci->memset(&format, 0, sizeof(struct pcm_format));
@@ -236,10 +237,20 @@ enum codec_status codec_run(void)
236 } 237 }
237 238
238 /* make sure we're at the correct offset */ 239 /* make sure we're at the correct offset */
239 if (bytesdone > (uint32_t) firstblockposn) { 240 if (bytesdone > (uint32_t) firstblockposn || param) {
241 uint32_t seek_val;
242 int seek_mode;
243
244 if (bytesdone) {
245 seek_val = bytesdone - MIN((uint32_t) firstblockposn, bytesdone);
246 seek_mode = PCM_SEEK_POS;
247 } else {
248 seek_val = param;
249 seek_mode = PCM_SEEK_TIME;
250 }
251
240 /* Round down to previous block */ 252 /* Round down to previous block */
241 struct pcm_pos *newpos = codec->get_seek_pos(bytesdone - firstblockposn, 253 struct pcm_pos *newpos = codec->get_seek_pos(seek_val, seek_mode, NULL);
242 PCM_SEEK_POS, NULL);
243 254
244 if (newpos->pos > format.numbytes) 255 if (newpos->pos > format.numbytes)
245 goto done; 256 goto done;