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/aac.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/aac.c')
-rw-r--r-- | apps/codecs/aac.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/codecs/aac.c b/apps/codecs/aac.c index 52e08c7b56..f1e81bad81 100644 --- a/apps/codecs/aac.c +++ b/apps/codecs/aac.c | |||
@@ -134,8 +134,6 @@ enum codec_status codec_run(void) | |||
134 | if (m4a_seek_raw(&demux_res, &input_stream, file_offset, | 134 | if (m4a_seek_raw(&demux_res, &input_stream, file_offset, |
135 | &sound_samples_done, (int*) &i)) { | 135 | &sound_samples_done, (int*) &i)) { |
136 | sound_samples_done *= sbr_fac; | 136 | sound_samples_done *= sbr_fac; |
137 | elapsed_time = (sound_samples_done * 10) / (ci->id3->frequency / 100); | ||
138 | ci->set_elapsed(elapsed_time); | ||
139 | } else { | 137 | } else { |
140 | sound_samples_done = 0; | 138 | sound_samples_done = 0; |
141 | } | 139 | } |
@@ -143,6 +141,9 @@ enum codec_status codec_run(void) | |||
143 | } else { | 141 | } else { |
144 | sound_samples_done = 0; | 142 | sound_samples_done = 0; |
145 | } | 143 | } |
144 | |||
145 | elapsed_time = (sound_samples_done * 10) / (ci->id3->frequency / 100); | ||
146 | ci->set_elapsed(elapsed_time); | ||
146 | 147 | ||
147 | if (i == 0) | 148 | if (i == 0) |
148 | { | 149 | { |