summaryrefslogtreecommitdiff
path: root/lib/rbcodec/codecs/vox.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/vox.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/vox.c')
-rw-r--r--lib/rbcodec/codecs/vox.c20
1 files changed, 16 insertions, 4 deletions
diff --git a/lib/rbcodec/codecs/vox.c b/lib/rbcodec/codecs/vox.c
index 66979e2911..d84af24cfc 100644
--- a/lib/rbcodec/codecs/vox.c
+++ b/lib/rbcodec/codecs/vox.c
@@ -73,7 +73,8 @@ enum codec_status codec_run(void)
73 73
74 codec_set_replaygain(ci->id3); 74 codec_set_replaygain(ci->id3);
75 75
76 /* Need to save offset for later use (cleared indirectly by advance_buffer) */ 76 /* Need to save resume for later use (cleared indirectly by advance_buffer) */
77 param = ci->id3->elapsed;
77 bytesdone = ci->id3->offset; 78 bytesdone = ci->id3->offset;
78 ci->seek_buffer(0); 79 ci->seek_buffer(0);
79 80
@@ -123,10 +124,21 @@ enum codec_status codec_run(void)
123 ci->configure(DSP_SET_STEREO_MODE, STEREO_MONO); 124 ci->configure(DSP_SET_STEREO_MODE, STEREO_MONO);
124 125
125 /* make sure we're at the correct offset */ 126 /* make sure we're at the correct offset */
126 if (bytesdone > (uint32_t) firstblockposn) { 127 if (bytesdone > (uint32_t) firstblockposn || param) {
128 uint32_t seek_val;
129 int seek_mode;
130
131 if (bytesdone) {
132 seek_val = bytesdone - MIN((uint32_t )firstblockposn, bytesdone);
133 seek_mode = PCM_SEEK_POS;
134 } else {
135 seek_val = param;
136 seek_mode = PCM_SEEK_TIME;
137 }
138
127 /* Round down to previous block */ 139 /* Round down to previous block */
128 struct pcm_pos *newpos = codec->get_seek_pos(bytesdone - firstblockposn, 140 struct pcm_pos *newpos = codec->get_seek_pos(seek_val, seek_mode,
129 PCM_SEEK_POS, &read_buffer); 141 &read_buffer);
130 142
131 if (newpos->pos > format.numbytes) { 143 if (newpos->pos > format.numbytes) {
132 return CODEC_OK; 144 return CODEC_OK;