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/flac.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/flac.c')
-rw-r--r-- | apps/codecs/flac.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/codecs/flac.c b/apps/codecs/flac.c index a5521b584f..c91a173f4a 100644 --- a/apps/codecs/flac.c +++ b/apps/codecs/flac.c | |||
@@ -460,7 +460,9 @@ enum codec_status codec_run(void) | |||
460 | codec_set_replaygain(ci->id3); | 460 | codec_set_replaygain(ci->id3); |
461 | 461 | ||
462 | flac_seek_offset(&fc, samplesdone); | 462 | flac_seek_offset(&fc, samplesdone); |
463 | samplesdone=0; | 463 | samplesdone=fc.samplenumber+fc.blocksize; |
464 | elapsedtime=(samplesdone*10)/(ci->id3->frequency/100); | ||
465 | ci->set_elapsed(elapsedtime); | ||
464 | 466 | ||
465 | /* The main decoding loop */ | 467 | /* The main decoding loop */ |
466 | frame=0; | 468 | frame=0; |