Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix musepack sv8 metadata parser. Thanks to Magnus Holmgren for spotting.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25076 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andree Buschmann 2010-03-08 22:39:15 +00:00
parent 1abda91faa
commit 56023837ae
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
apps/metadata/mpc.c
View file

@ -132,14 +132,18 @@ bool get_musepack_metadata(int fd, struct mp3entry *id3)
if (!memcmp(sv8_header, "SH", 2)) { /* Stream Header ID */ if (!memcmp(sv8_header, "SH", 2)) { /* Stream Header ID */
int32_t k = 0; int32_t k = 0;
uint32_t streamversion; uint32_t streamversion;
uint64_t size = 0; uint64_t size = 0; /* tag size */
uint64_t dummy = 0; /* used to dummy read data from header */
/* 4 bytes 'MPCK' + 4 bytes crc + 2 'SH' */ /* 4 bytes 'MPCK' + 2 'SH' */
lseek(fd, 10, SEEK_SET); lseek(fd, 6, SEEK_SET);
if (read(fd, sv8_header, 32) != 32) return false; if (read(fd, sv8_header, 32) != 32) return false;
/* dummy read the correct amount of bits within the header data. */ /* Read the size of 'SH'-tag */
size = sv8_header[k++]; k = sv8_get_size(sv8_header, k, &size);
/* Skip crc32 */
k += 4;
/* Read stream version */ /* Read stream version */
streamversion = sv8_header[k++]; streamversion = sv8_header[k++];
@ -149,7 +153,7 @@ bool get_musepack_metadata(int fd, struct mp3entry *id3)
k = sv8_get_size(sv8_header, k, &samples); k = sv8_get_size(sv8_header, k, &samples);
/* Number of leading zero-samples */ /* Number of leading zero-samples */
k = sv8_get_size(sv8_header, k, &size); k = sv8_get_size(sv8_header, k, &dummy);
/* Sampling frequency */ /* Sampling frequency */
id3->frequency = sfreqs[(sv8_header[k++] >> 5) & 0x0003]; id3->frequency = sfreqs[(sv8_header[k++] >> 5) & 0x0003];
@ -157,6 +161,9 @@ bool get_musepack_metadata(int fd, struct mp3entry *id3)
/* Number of channels */ /* Number of channels */
id3->channels = (sv8_header[k++] >> 4) + 1; id3->channels = (sv8_header[k++] >> 4) + 1;
/* Skip to next tag: k = size -2 */
k = size - 2;
if (!memcmp(sv8_header+k, "RG", 2)) { /* Replay Gain ID */ if (!memcmp(sv8_header+k, "RG", 2)) { /* Replay Gain ID */
long peak, gain; long peak, gain;
int bufused = 0; int bufused = 0;