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

Applied patch 2917: Fix retrieval of total sample count in get_vorbis_metadata.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9850 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Magnus Holmgren 2006-05-01 13:42:35 +00:00
parent 6488177d05
commit e9cc570b83
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
apps/metadata.c
View file

@ -556,7 +556,7 @@ static bool get_vorbis_metadata(int fd, struct mp3entry* id3)
long comment_size; long comment_size;
long remaining = 0; long remaining = 0;
long last_serial = 0; long last_serial = 0;
long serial; long serial, r;
int segments; int segments;
int i; int i;
bool eof = false; bool eof = false;
@ -652,7 +652,7 @@ static bool get_vorbis_metadata(int fd, struct mp3entry* id3)
while (!eof) while (!eof)
{ {
long r = read(fd, &buf[remaining], MAX_PATH - remaining); r = read(fd, &buf[remaining], MAX_PATH - remaining);
if (r <= 0) if (r <= 0)
{ {
@ -666,7 +666,7 @@ static bool get_vorbis_metadata(int fd, struct mp3entry* id3)
/* Inefficient (but simple) search */ /* Inefficient (but simple) search */
i = 0; i = 0;
while (i < (remaining - 5)) while (i < (remaining - 3))
{ {
if ((buf[i] == 'O') && (memcmp(&buf[i], "OggS", 4) == 0)) if ((buf[i] == 'O') && (memcmp(&buf[i], "OggS", 4) == 0))
{ {
@ -677,8 +677,11 @@ static bool get_vorbis_metadata(int fd, struct mp3entry* id3)
*/ */
id3->samples = get_long(&buf[i + 6]); id3->samples = get_long(&buf[i + 6]);
last_serial = get_long(&buf[i + 14]); last_serial = get_long(&buf[i + 14]);
/* We can discard the rest of the buffer */
remaining = 0; /* If this page is very small the beginning of the next
* header could be in buffer. Jump near end of this header
* and continue */
i += 27;
} }
else else
{ {
@ -691,16 +694,20 @@ static bool get_vorbis_metadata(int fd, struct mp3entry* id3)
} }
} }
if (i < (remaining - 5)) if (i < remaining)
{ {
/* Move OggS to start of buffer. */ /* Move the remaining bytes to start of buffer.
while (i >0) * Reuse var 'segments' as it is no longer needed */
segments = 0;
while (i < remaining)
{ {
buf[i--] = buf[remaining--]; buf[segments++] = buf[i++];
} }
remaining = segments;
} }
else else
{ {
/* Discard the rest of the buffer */
remaining = 0; remaining = 0;
} }
} }