1 files changed, 115 insertions, 11 deletions

diff --git a/apps/metadata/mpc.c b/apps/metadata/mpc.c
index 3f8907a934..9894bb8b54 100644
--- a/apps/metadata/mpc.c
+++ b/apps/metadata/mpc.c
@@ -28,15 +28,48 @@
 #include "logf.h"
 #include "replaygain.h"
 
-static int set_replaygain(struct mp3entry* id3, bool album, long value, 
-    long used)
+#include "fixedpoint.h"
+#include <stdlib.h>
+#include <stdbool.h>
+#include <inttypes.h>
+
+/* Needed for replay gain in sv8, please search MPC_OLD_GAIN_REF in libmusepack */
+#define SV8_TO_SV7_CONVERT_GAIN (64.82*100)
+
+static int set_replaygain_sv7(struct mp3entry* id3, 
+                              bool album, 
+                              long value, 
+                              long used)
 {
     long gain = (int16_t) ((value >> 16) & 0xffff);
     long peak = (uint16_t) (value & 0xffff);
     
+    /* Remark: mpc sv7 outputs peak as amplitude, not as dB. The following 
+     * useage of peak is not correct and needs to be fixed. */
+    
     /* We use a peak value of 0 to indicate a given gain type isn't used. */
-    if (peak != 0)
-    {
+    if (peak != 0) {
+        /* Use the Xing TOC field to store ReplayGain strings for use in the
+         * ID3 screen, since Musepack files shouldn't need to use it in any
+         * other way.
+         */
+        used += parse_replaygain_int(album, gain * 512 / 100, peak << 9,
+            id3, id3->toc + used, sizeof(id3->toc) - used);
+    }
+    
+    return used;
+}
+
+static int set_replaygain_sv8(struct mp3entry* id3, 
+                              bool album, 
+                              long gain, 
+                              long peak,
+                              long used)
+{
+    gain = (long)(SV8_TO_SV7_CONVERT_GAIN - (gain*100./256.));
+
+    /* We use a peak value of 0 to indicate a given gain type isn't used. */
+    if (peak != 0) {
         /* Use the Xing TOC field to store ReplayGain strings for use in the
          * ID3 screen, since Musepack files shouldn't need to use it in any
          * other way.
@@ -48,9 +81,23 @@ static int set_replaygain(struct mp3entry* id3, bool album, long value,
     return used;
 }
 
+static int sv8_get_size(uint8_t *buffer, int index, uint64_t *p_size)
+{
+    unsigned char tmp;
+    uint64_t size = 0;
+
+    do {
+        tmp = buffer[index++];
+        size = (size << 7) | (tmp & 0x7F);
+    } while((tmp & 0x80));
+
+    *p_size = size;
+    return index;
+}
+
 bool get_musepack_metadata(int fd, struct mp3entry *id3)
 {
-    static const int32_t sfreqs_sv7[4] = { 44100, 48000, 37800, 32000 };
+    static const int32_t sfreqs[4] = { 44100, 48000, 37800, 32000 };
     uint32_t header[8];
     uint64_t samples = 0;
     int i;
@@ -63,7 +110,6 @@ bool get_musepack_metadata(int fd, struct mp3entry *id3)
        header[i] = letoh32(header[i]); 
     if (!memcmp(header, "MP+", 3)) { /* Compare to sig "MP+" */
         unsigned int streamversion;
-        
         header[0] = letoh32(header[0]);
         streamversion = (header[0] >> 24) & 15;
         if (streamversion == 7) {
@@ -71,20 +117,78 @@ bool get_musepack_metadata(int fd, struct mp3entry *id3)
             unsigned int last_frame_samples = (header[5] >> 20) & 0x07ff;
             unsigned int bufused = 0;
             
-            id3->frequency = sfreqs_sv7[(header[2] >> 16) & 0x0003];
+            id3->frequency = sfreqs[(header[2] >> 16) & 0x0003];
             samples = (uint64_t)header[1]*1152; /* 1152 is mpc frame size */
             if (gapless)
                 samples -= 1152 - last_frame_samples;
             else
                 samples -= 481; /* Musepack subband synth filter delay */
            
-            bufused = set_replaygain(id3, false, header[3], bufused);
-            bufused = set_replaygain(id3, true, header[4], bufused);
+            bufused = set_replaygain_sv7(id3, false, header[3], bufused);
+            bufused = set_replaygain_sv7(id3, true , header[4], bufused);
         } else {
             return false; /* only SV7 is allowed within a "MP+" signature */
         }
-    } else if (!memcmp(header, "MPCK", 4)) { /* Compare to sig "MPCK" */ 
-        return false; /* SV8 is not supported yet */
+    } else if (!memcmp(header, "MPCK", 4)) { /* Compare to sig "MPCK" */
+        uint8_t sv8_header[32];
+        /* 4 bytes 'MPCK' */
+        lseek(fd, 4, SEEK_SET);
+        if (read(fd, sv8_header, 2) != 2) return false; /* read frame ID */
+        if (!memcmp(sv8_header, "SH", 2)) { /* Stream Header ID */
+            int32_t k = 0;
+            uint32_t streamversion;
+            uint64_t size = 0;
+
+            /* 4 bytes 'MPCK' + 4 bytes crc + 2 'SH' */
+            lseek(fd, 10, SEEK_SET);
+            if (read(fd, sv8_header, 32) != 32) return false;
+
+            /* dummy read the correct amount of bits within the header data. */
+            size = sv8_header[k++];
+        
+            /* Read stream version */
+            streamversion = sv8_header[k++];
+            if (streamversion != 8) return false; /* Only SV8 is allowed. */
+            
+            /* Number of samples */
+            k = sv8_get_size(sv8_header, k, &samples);
+            
+            /* Number of leading zero-samples */
+            k = sv8_get_size(sv8_header, k, &size);
+            
+            /* Sampling frequency */
+            id3->frequency = sfreqs[(sv8_header[k++] >> 5) & 0x0003];
+            
+            /* Number of channels */
+            id3->channels = (sv8_header[k++] >> 4) + 1;
+
+            if (!memcmp(sv8_header+k, "RG", 2)) { /* Replay Gain ID */
+                long peak, gain; 
+                int bufused = 0;
+                
+                k += 2; /* 2 bytes 'RG' */
+                
+                /* sv8_get_size must be called to skip the right amount of
+                 * bits within the header data. */
+                k = sv8_get_size(sv8_header, k, &size);
+                
+                /* Read and set replay gain */
+                if (sv8_header[k++] == 1) {
+                    /* Title's peak and gain */
+                    gain = (int16_t) ((sv8_header[k]<<8) + sv8_header[k+1]); k += 2;
+                    peak = (uint16_t)((sv8_header[k]<<8) + sv8_header[k+1]); k += 2;
+                    bufused += set_replaygain_sv8(id3, false, gain, peak, bufused);
+
+                    /* Album's peak and gain */
+                    gain = (int16_t) ((sv8_header[k]<<8) + sv8_header[k+1]); k += 2;
+                    peak = (uint16_t)((sv8_header[k]<<8) + sv8_header[k+1]); k += 2;
+                    bufused += set_replaygain_sv8(id3, true , gain, peak, bufused);
+                }
+            }
+        } else {
+            /* No sv8 stream header found */
+            return false;
+        }
     } else {
         return false; /* SV4-6 is not supported anymore */
     }