diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2011-08-28 07:45:35 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2011-08-28 07:45:35 +0000 |
commit | 7ad2cad173ffa094bb285112582afee1c9aea4e5 (patch) | |
tree | ce23e816cfdffb1767ebe44f4f960c304d8a5fb9 /apps/codecs/wma.c | |
parent | 463b3ed8b2630d1b9d656dd2a52bbcbd429b4c08 (diff) | |
download | rockbox-7ad2cad173ffa094bb285112582afee1c9aea4e5.tar.gz rockbox-7ad2cad173ffa094bb285112582afee1c9aea4e5.zip |
Commit work started in FS#12153 to put timing/position information in PCM
buffer chunks.
* Samples and position indication is closely associated with audio data
instead of compensating by a latency constant. Alleviates problems with
using the elapsed as a track indicator where it could be off by several
steps.
* Timing is accurate throughout track even if resampling for pitch shift,
whereas before it updated during transition latency at the normal 1:1 rate.
* Simpler PCM buffer with a constant chunk size, no linked lists.
In converting crossfade, a minor change was made to not change the WPS until
the fade-in of the incoming track, whereas before it would change upon the
start of the fade-out of the outgoing track possibly having the WPS change
with far too much lead time.
Codec changes are to set elapsed times *before* writing next PCM frame because
time and position data last set are saved in the next committed PCM chunk.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30366 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/wma.c')
-rw-r--r-- | apps/codecs/wma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/codecs/wma.c b/apps/codecs/wma.c index c327fafb5a..8986531744 100644 --- a/apps/codecs/wma.c +++ b/apps/codecs/wma.c | |||
@@ -84,7 +84,6 @@ restart_track: | |||
84 | % wfx.packet_size; | 84 | % wfx.packet_size; |
85 | ci->seek_buffer(resume_offset - packet_offset); | 85 | ci->seek_buffer(resume_offset - packet_offset); |
86 | elapsedtime = asf_get_timestamp(&i); | 86 | elapsedtime = asf_get_timestamp(&i); |
87 | ci->set_elapsed(elapsedtime); | ||
88 | } | 87 | } |
89 | else | 88 | else |
90 | { | 89 | { |
@@ -93,6 +92,8 @@ restart_track: | |||
93 | elapsedtime = 0; | 92 | elapsedtime = 0; |
94 | } | 93 | } |
95 | 94 | ||
95 | ci->set_elapsed(elapsedtime); | ||
96 | |||
96 | resume_offset = 0; | 97 | resume_offset = 0; |
97 | ci->configure(DSP_SWITCH_FREQUENCY, wfx.rate); | 98 | ci->configure(DSP_SWITCH_FREQUENCY, wfx.rate); |
98 | ci->configure(DSP_SET_STEREO_MODE, wfx.channels == 1 ? | 99 | ci->configure(DSP_SET_STEREO_MODE, wfx.channels == 1 ? |