summaryrefslogtreecommitdiff
path: root/apps/codecs/adx.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2011-08-28 07:45:35 +0000
committerMichael Sevakis <jethead71@rockbox.org>2011-08-28 07:45:35 +0000
commit7ad2cad173ffa094bb285112582afee1c9aea4e5 (patch)
treece23e816cfdffb1767ebe44f4f960c304d8a5fb9 /apps/codecs/adx.c
parent463b3ed8b2630d1b9d656dd2a52bbcbd429b4c08 (diff)
downloadrockbox-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/adx.c')
-rw-r--r--apps/codecs/adx.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/codecs/adx.c b/apps/codecs/adx.c
index e75e7dca1e..8144d5f468 100644
--- a/apps/codecs/adx.c
+++ b/apps/codecs/adx.c
@@ -209,7 +209,7 @@ enum codec_status codec_run(void)
209 209
210 /* get in position */ 210 /* get in position */
211 ci->seek_buffer(bufoff); 211 ci->seek_buffer(bufoff);
212 212 ci->set_elapsed(0);
213 213
214 /* setup pcm buffer format */ 214 /* setup pcm buffer format */
215 ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); 215 ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency);
@@ -276,6 +276,11 @@ enum codec_status codec_run(void)
276 loop_count++; 276 loop_count++;
277 } 277 }
278 ci->seek_buffer(bufoff); 278 ci->seek_buffer(bufoff);
279
280 ci->set_elapsed(
281 ((end_adr-start_adr)*loop_count + bufoff-chanstart)*
282 1000LL/avgbytespersec);
283
279 ci->seek_complete(); 284 ci->seek_complete();
280 } 285 }
281 286