diff options
| author | roman.artiukhin <bahusdrive@gmail.com> | 2023-09-05 00:31:56 +0300 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2023-09-15 09:08:02 -0400 |
| commit | d2f7777f7a80267af38b29f1301c70fcf04df580 (patch) | |
| tree | cba9ae2aaee0ff1e71b812b35d4d0fa3407b85c6 | |
| parent | df51d49b22d0652a355e48cd33934a14fb0acc07 (diff) | |
| download | rockbox-d2f7777f7a.tar.gz rockbox-d2f7777f7a.zip | |
Codecs: mp4: metadata: Fix time length in very large files
Fix 40 hours long book reported as 14 hours due to samples overflow
Change-Id: I5988d4492b1f51081fff921180de6fe384ab5f4f
| -rw-r--r-- | lib/rbcodec/metadata/metadata.h | 2 | ||||
| -rw-r--r-- | lib/rbcodec/metadata/mp4.c | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/lib/rbcodec/metadata/metadata.h b/lib/rbcodec/metadata/metadata.h index 1a205a08eb..cab387e36c 100644 --- a/lib/rbcodec/metadata/metadata.h +++ b/lib/rbcodec/metadata/metadata.h @@ -259,7 +259,7 @@ struct mp3entry { int tail_trim; /* Number of samples to remove from the end */ /* 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 */ unsigned long frame_count; /* number of frames in the file (if VBR) */ diff --git a/lib/rbcodec/metadata/mp4.c b/lib/rbcodec/metadata/mp4.c index 19e6b515c7..7686165a0d 100644 --- a/lib/rbcodec/metadata/mp4.c +++ b/lib/rbcodec/metadata/mp4.c @@ -707,13 +707,11 @@ static bool read_mp4_container(int fd, struct mp3entry* id3, * need any further special handling. */ if (id3->codectype==AFMT_MP4_AAC_HE && l<=1024) { - id3->samples += n * l * 2; + l *= 2; id3->needs_upsampling_correction = true; } - else - { - id3->samples += n * l; - } + + id3->samples += (uint64_t) n * l; } size = 0; |