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

Codecs: mp4: Fix possible glitch at the end of song

Browse source 
sample_to_chunk last value was ignored in some cases leading to invalid sample value in lookup_table.

Fixes FS#13600

Change-Id: I8f066966e15c384d3185f689b68a2cc2a3abad1d
This commit is contained in:
Roman Artiukhin 2025-04-20 13:07:22 +03:00
parent f563fe54c2
commit 17d73c968a
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/rbcodec/codecs/libm4a/demux.c
View file

@ -437,8 +437,8 @@ static bool read_chunk_stco(qtmovie_t *qtmovie, size_t chunk_len)
uint32_t i, k, old_i; uint32_t i, k, old_i;
uint32_t numentries; uint32_t numentries;
uint32_t frame; uint32_t frame;
uint32_t old_first, new_first; uint32_t old_first = 0, new_first;
uint32_t old_frame, new_frame; uint32_t old_frame = 0, new_frame;
size_t size_remaining = chunk_len - 8; size_t size_remaining = chunk_len - 8;
/* version + flags */ /* version + flags */
@ -508,22 +508,22 @@ static bool read_chunk_stco(qtmovie_t *qtmovie, size_t chunk_len)
idx = 0; idx = 0;
i = 1; i = 1;
old_i = 1; old_i = 0;
frame = 0; frame = 0;
int32_t current_offset = stream_tell(qtmovie->stream); int32_t current_offset = stream_tell(qtmovie->stream);
stream_seek(qtmovie->stream, qtmovie->res->sample_to_chunk_offset); stream_seek(qtmovie->stream, qtmovie->res->sample_to_chunk_offset);
stream_read_sample_to_chunk(qtmovie->stream, &old_first, &old_frame);
stream_read_sample_to_chunk(qtmovie->stream, &new_first, &new_frame); stream_read_sample_to_chunk(qtmovie->stream, &new_first, &new_frame);
for (k = 1; k < numentries + 1; ++k) for (k = 1; k <= numentries; ++k)
{ {
for (; i < qtmovie->res->num_sample_to_chunks; ++i) for (; i <= qtmovie->res->num_sample_to_chunks; ++i)
{ {
if (i > old_i) if (i > old_i)
{ {
/* Only access sample_to_chunk[] if new data is required. */ /* Only access sample_to_chunk[] if new data is required. */
old_first = new_first; old_first = new_first;
old_frame = new_frame; old_frame = new_frame;
if (i < qtmovie->res->num_sample_to_chunks)
stream_read_sample_to_chunk(qtmovie->stream, &new_first, &new_frame); stream_read_sample_to_chunk(qtmovie->stream, &new_first, &new_frame);
old_i = i; old_i = i;
} }