len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-12 22:52:28 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

AAC: Another gapless fix, this one for the end of the file. The real size of the last frame was lost in r29727, as indicated by Yusaku Inui in FS#12185, so bring it back. Now the decoded length of test1_nero.m4a (in FS#12185) only differs by one sample compared to Foobar2000 (Rockbox has one more leading sample, for some reason). Also moved a few lines to a better place.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30149 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Magnus Holmgren 2011-07-17 13:00:53 +00:00
parent 3a7291020b
commit 6f392693b8
1 changed files with 31 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

40
apps/codecs/aac.c
View file

@ -61,6 +61,7 @@ enum codec_status codec_run(void)
int file_offset; int file_offset;
int framelength; int framelength;
int lead_trim = 0; int lead_trim = 0;
unsigned int frame_samples;
unsigned int i; unsigned int i;
unsigned char* buffer; unsigned char* buffer;
NeAACDecFrameInfo frame_info; NeAACDecFrameInfo frame_info;
@ -214,13 +215,15 @@ enum codec_status codec_run(void)
/* Output the audio */ /* Output the audio */
ci->yield(); ci->yield();
frame_samples = frame_info.samples >> 1;
if (empty_first_frame) if (empty_first_frame)
{ {
/* Remove the first frame from lead_trim, under the assumption /* Remove the first frame from lead_trim, under the assumption
* that it had the same size as this frame * that it had the same size as this frame
*/ */
empty_first_frame = false; empty_first_frame = false;
lead_trim -= (frame_info.samples >> 1); lead_trim -= frame_samples;
if (lead_trim < 0) if (lead_trim < 0)
{ {
@ -229,11 +232,30 @@ enum codec_status codec_run(void)
} }
/* Gather number of samples for the decoded frame. */ /* Gather number of samples for the decoded frame. */
framelength = (frame_info.samples >> 1) - lead_trim; framelength = frame_samples - lead_trim;
if (i == demux_res.num_sample_byte_sizes - 1) if (i == demux_res.num_sample_byte_sizes - 1)
{ {
framelength -= ci->id3->tail_trim; // Size of the last frame
const uint32_t sample_duration = (demux_res.num_time_to_samples > 0) ?
demux_res.time_to_sample[demux_res.num_time_to_samples - 1].sample_duration :
frame_samples;
/* Currently limited to at most one frame of tail_trim.
* Seems to be enough.
*/
if (ci->id3->tail_trim == 0 && sample_duration < frame_samples)
{
/* Subtract lead_trim just in case we decode a file with only
* one audio frame with actual data (lead_trim is usually zero
* here).
*/
framelength = sample_duration - lead_trim;
}
else
{
framelength -= ci->id3->tail_trim;
}
} }
if (framelength > 0) if (framelength > 0)
@ -241,6 +263,10 @@ enum codec_status codec_run(void)
ci->pcmbuf_insert(&decoder->time_out[0][lead_trim], ci->pcmbuf_insert(&decoder->time_out[0][lead_trim],
&decoder->time_out[1][lead_trim], &decoder->time_out[1][lead_trim],
framelength); framelength);
sound_samples_done += framelength;
/* Update the elapsed-time indicator */
elapsed_time = (sound_samples_done * 10) / (ci->id3->frequency / 100);
ci->set_elapsed(elapsed_time);
} }
if (lead_trim > 0) if (lead_trim > 0)
@ -253,7 +279,7 @@ enum codec_status codec_run(void)
empty_first_frame = true; empty_first_frame = true;
} }
lead_trim -= (frame_info.samples >> 1); lead_trim -= frame_samples;
if (lead_trim < 0) if (lead_trim < 0)
{ {
@ -261,11 +287,7 @@ enum codec_status codec_run(void)
} }
} }
/* Update the elapsed-time indicator */ ++i;
sound_samples_done += framelength;
elapsed_time = (sound_samples_done * 10) / (ci->id3->frequency / 100);
ci->set_elapsed(elapsed_time);
i++;
} }
LOGF("AAC: Decoded %lu samples\n", (unsigned long)sound_samples_done); LOGF("AAC: Decoded %lu samples\n", (unsigned long)sound_samples_done);