devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Codecs: mp4: metadata: Fix time length in very large files

Browse source 
Fix 40 hours long book reported as 14 hours due to samples overflow

Change-Id: I5988d4492b1f51081fff921180de6fe384ab5f4f
This commit is contained in:
roman.artiukhin 2023-09-05 00:31:56 +03:00 • committed by Solomon Peachy
parent df51d49b22
commit d2f7777f7a
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/rbcodec/metadata/metadata.h
View file

@ -259,7 +259,7 @@ struct mp3entry {
int tail_trim; /* Number of samples to remove from the end */ int tail_trim; /* Number of samples to remove from the end */
/* Added for Vorbis, used by mp4 parser as well. */ /* Added for Vorbis, used by mp4 parser as well. */
unsigned long samples; /* number of samples in track */ uint64_t samples; /* number of samples in track */
/* MP3 stream specific info */ /* MP3 stream specific info */
unsigned long frame_count; /* number of frames in the file (if VBR) */ unsigned long frame_count; /* number of frames in the file (if VBR) */

8
lib/rbcodec/metadata/mp4.c
View file

@ -707,13 +707,11 @@ static bool read_mp4_container(int fd, struct mp3entry* id3,
* need any further special handling. */ * need any further special handling. */
if (id3->codectype==AFMT_MP4_AAC_HE && l<=1024) if (id3->codectype==AFMT_MP4_AAC_HE && l<=1024)
{ {
id3->samples += n * l * 2; l *= 2;
id3->needs_upsampling_correction = true; id3->needs_upsampling_correction = true;
} }
else
{ id3->samples += (uint64_t) n * l;
id3->samples += n * l;
}
} }
size = 0; size = 0;