summaryrefslogtreecommitdiff
path: root/lib/rbcodec/codecs/wavpack.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/wavpack.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/wavpack.c')
-rw-r--r--lib/rbcodec/codecs/wavpack.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/rbcodec/codecs/wavpack.c b/lib/rbcodec/codecs/wavpack.c
index c0cdafabac..d9c294397c 100644
--- a/lib/rbcodec/codecs/wavpack.c
+++ b/lib/rbcodec/codecs/wavpack.c
@@ -55,12 +55,16 @@ enum codec_status codec_run(void)
55 int bps; 55 int bps;
56 */ 56 */
57 int nchans, sr_100; 57 int nchans, sr_100;
58 unsigned long offset;
58 intptr_t param; 59 intptr_t param;
59 60
60 if (codec_init()) 61 if (codec_init())
61 return CODEC_ERROR; 62 return CODEC_ERROR;
62 63
63 ci->seek_buffer (ci->id3->offset); 64 param = ci->id3->elapsed;
65 offset = ci->id3->offset;
66
67 ci->seek_buffer (offset);
64 68
65 /* Create a decoder instance */ 69 /* Create a decoder instance */
66 wpc = WavpackOpenFileInput (read_callback, error); 70 wpc = WavpackOpenFileInput (read_callback, error);
@@ -75,7 +79,12 @@ enum codec_status codec_run(void)
75 ci->configure(DSP_SET_STEREO_MODE, nchans == 2 ? STEREO_INTERLEAVED : STEREO_MONO); 79 ci->configure(DSP_SET_STEREO_MODE, nchans == 2 ? STEREO_INTERLEAVED : STEREO_MONO);
76 sr_100 = ci->id3->frequency / 100; 80 sr_100 = ci->id3->frequency / 100;
77 81
78 ci->set_elapsed (WavpackGetSampleIndex (wpc) / sr_100 * 10); 82 if (!offset && param) {
83 goto resume_start; /* resume by elapsed */
84 }
85 else {
86 ci->set_elapsed (WavpackGetSampleIndex (wpc) / sr_100 * 10);
87 }
79 88
80 /* The main decoder loop */ 89 /* The main decoder loop */
81 90
@@ -87,6 +96,7 @@ enum codec_status codec_run(void)
87 break; 96 break;
88 97
89 if (action == CODEC_ACTION_SEEK_TIME) { 98 if (action == CODEC_ACTION_SEEK_TIME) {
99 resume_start:;
90 int curpos_ms = WavpackGetSampleIndex (wpc) / sr_100 * 10; 100 int curpos_ms = WavpackGetSampleIndex (wpc) / sr_100 * 10;
91 int n, d, skip; 101 int n, d, skip;
92 102