Add support for parsing binary data ID3 tags. Add support for parsing RVA2 ID3 tags for replaygain values instead of TXXX tags when playing files tagged with ID3v2.4. Patch by psyche78 (task #2937)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10259 a1c6a512-1295-4272-9138-f99709370657

4 files changed, 225 insertions, 113 deletions

diff --git a/docs/CREDITS b/docs/CREDITS
index 75260a1fa9..fa6ec5d9ff 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -215,3 +215,4 @@ Andreas Mattsson
 Daniel Ankers
 Paul Louden
 Rainer Sinsch
+Plácido Revilla
diff --git a/firmware/export/replaygain.h b/firmware/export/replaygain.h
index c29d4b6921..ca9b654ce9 100644
--- a/firmware/export/replaygain.h
+++ b/firmware/export/replaygain.h
@@ -25,7 +25,9 @@
 long get_replaygain_int(long int_gain);
 long get_replaygain(const char* str);
 long get_replaypeak(const char* str);
-long parse_replaygain(const char* key, const char* value, 
+long parse_replaygain(const char* key, const char* value,
+    struct mp3entry* entry, char* buffer, int length);
+long parse_replaygain_rva(const char* key, const char* value,
     struct mp3entry* entry, char* buffer, int length);
 
 #endif
diff --git a/firmware/id3.c b/firmware/id3.c
index 5b5b7c98a3..b3c09f2e6b 100644
--- a/firmware/id3.c
+++ b/firmware/id3.c
@@ -22,7 +22,7 @@
  * all sorts of friendly Rockbox people.
  *
  */
- 
+
  /* tagResolver and associated code copyright 2003 Thomas Paul Diffenbach
  */
 
@@ -136,8 +136,8 @@ char* id3_get_codec(const struct mp3entry* id3)
         numerical values, for cases where a number won't do, e.g.,
         YEAR: "circa 1765", "1790/1977" (composed/performed), "28 Feb 1969"
         TRACK: "1/12", "1 of 12", GENRE: "Freeform genre name"
-        Text is more flexible, and as the main use of id3 data is to 
-        display it, converting it to an int just means reconverting to 
+        Text is more flexible, and as the main use of id3 data is to
+        display it, converting it to an int just means reconverting to
         display it, at a runtime cost.)
 
     2. If any special processing beyond copying the tag value from the Id3
@@ -161,22 +161,23 @@ char* id3_get_codec(const struct mp3entry* id3)
             char* ID3 Tag symbolic name -- see the ID3 specification for these,
             sizeof() that name minus 1,
             offsetof( struct mp3entry, variable_name_in_struct_mp3entry ),
-            pointer to your special processing function or NULL 
+            pointer to your special processing function or NULL
                 if you need no special processing
-        Many ID3 symbolic names come in more than one form. You can add both 
-        forms, each referencing the same variable in struct mp3entry. 
+            flag indicating if this tag is binary or textual
+        Many ID3 symbolic names come in more than one form. You can add both
+        forms, each referencing the same variable in struct mp3entry.
         If both forms are present, the last found will be used.
         Note that the offset can be zero, in which case no entry will be set
         in the mp3entry struct; the frame is still read into the buffer and
         the special processing function is called (several times, if there
         are several frames with the same name).
-            
+
     4. Alternately, use the TAG_LIST_ENTRY macro with
-         ID3 tag symbolic name, 
-         variable in struct mp3entry, 
+         ID3 tag symbolic name,
+         variable in struct mp3entry,
          special processing function address
-         
-    5.  Add code to wps-display.c function get_tag to assign a printf-like 
+
+    5.  Add code to wps-display.c function get_tag to assign a printf-like
         format specifier for the tag */
 
 /* Structure for ID3 Tag extraction information */
@@ -185,6 +186,7 @@ struct tag_resolver {
     int tag_length;
     size_t offset;
     int (*ppFunc)(struct mp3entry*, char* tag, int bufferpos);
+    bool binary;
 };
 
 static bool global_ff_found;
@@ -196,7 +198,7 @@ static int unsynchronize(char* tag, int len, bool *ff_found)
     unsigned char *rp, *wp;
 
     wp = rp = (unsigned char *)tag;
-    
+
     rp = (unsigned char *)tag;
     for(i = 0;i < len;i++) {
         /* Read the next byte and write it back, but don't increment the
@@ -233,7 +235,7 @@ static int read_unsynched(int fd, void *buf, int len)
     char *rp;
 
     wp = buf;
-    
+
     while(remaining) {
         rp = wp;
         rc = read(fd, rp, remaining);
@@ -319,16 +321,42 @@ static int parseuser( struct mp3entry* entry, char* tag, int bufferpos )
     char* value = NULL;
     int desc_len = strlen(tag);
     int value_len = 0;
-    
-    if ((tag - entry->id3v2buf + desc_len + 2) < bufferpos) {
-        /* At least part of the value was read, so we can safely try to 
-         * parse it 
+
+    /* Only parse TXXX replaygain tags if tag version < 2.4 */
+    if (entry->id3version < ID3_VER_2_4 &&
+        (tag - entry->id3v2buf + desc_len + 2) < bufferpos) {
+        /* At least part of the value was read, so we can safely try to
+         * parse it
          */
         value = tag + desc_len + 1;
-        value_len = parse_replaygain(tag, value, entry, tag, 
+        value_len = parse_replaygain(tag, value, entry, tag,
             bufferpos - (tag - entry->id3v2buf));
     }
-    
+
+    if (value_len) {
+        bufferpos = tag - entry->id3v2buf + value_len;
+    } else {
+        bufferpos = tag - entry->id3v2buf;
+    }
+
+    return bufferpos;
+}
+
+/* parse RVA2 binary data and convert to replaygain information. */
+static int parserva2( struct mp3entry* entry, char* tag, int bufferpos )
+{
+    char* value = NULL;
+    int desc_len = strlen(tag);
+    int value_len = 0;
+
+    /* Only parse RVA2 replaygain tags if tag version == 2.4 */
+    if (entry->id3version == ID3_VER_2_4 &&
+        (tag - entry->id3v2buf + desc_len + 2) < bufferpos) {
+        value = tag + desc_len + 1;
+        value_len = parse_replaygain_rva(tag, value, entry, tag,
+            bufferpos - (tag - entry->id3v2buf));
+    }
+
     if (value_len) {
         bufferpos = tag - entry->id3v2buf + value_len;
     } else {
@@ -340,22 +368,23 @@ static int parseuser( struct mp3entry* entry, char* tag, int bufferpos )
 #endif
 
 static const struct tag_resolver taglist[] = {
-    { "TPE1", 4, offsetof(struct mp3entry, artist), NULL },
-    { "TP1",  3, offsetof(struct mp3entry, artist), NULL },
-    { "TIT2", 4, offsetof(struct mp3entry, title), NULL },
-    { "TT2",  3, offsetof(struct mp3entry, title), NULL },
-    { "TALB", 4, offsetof(struct mp3entry, album), NULL },
-    { "TAL",  3, offsetof(struct mp3entry, album), NULL },
-    { "TRK",  3, offsetof(struct mp3entry, track_string), &parsetracknum },
-    { "TRCK", 4, offsetof(struct mp3entry, track_string), &parsetracknum },
-    { "TDRC", 4, offsetof(struct mp3entry, year_string), &parseyearnum },
-    { "TYER", 4, offsetof(struct mp3entry, year_string), &parseyearnum },
-    { "TYE",  3, offsetof(struct mp3entry, year_string), &parseyearnum },
-    { "TCOM", 4, offsetof(struct mp3entry, composer), NULL },
-    { "TCON", 4, offsetof(struct mp3entry, genre_string), &parsegenre },
-    { "TCO",  3, offsetof(struct mp3entry, genre_string), &parsegenre },
+    { "TPE1", 4, offsetof(struct mp3entry, artist), NULL, false },
+    { "TP1",  3, offsetof(struct mp3entry, artist), NULL, false },
+    { "TIT2", 4, offsetof(struct mp3entry, title), NULL, false },
+    { "TT2",  3, offsetof(struct mp3entry, title), NULL, false },
+    { "TALB", 4, offsetof(struct mp3entry, album), NULL, false },
+    { "TAL",  3, offsetof(struct mp3entry, album), NULL, false },
+    { "TRK",  3, offsetof(struct mp3entry, track_string), &parsetracknum, false },
+    { "TRCK", 4, offsetof(struct mp3entry, track_string), &parsetracknum, false },
+    { "TDRC", 4, offsetof(struct mp3entry, year_string), &parseyearnum, false },
+    { "TYER", 4, offsetof(struct mp3entry, year_string), &parseyearnum, false },
+    { "TYE",  3, offsetof(struct mp3entry, year_string), &parseyearnum, false },
+    { "TCOM", 4, offsetof(struct mp3entry, composer), NULL, false },
+    { "TCON", 4, offsetof(struct mp3entry, genre_string), &parsegenre, false },
+    { "TCO",  3, offsetof(struct mp3entry, genre_string), &parsegenre, false },
 #if CONFIG_CODEC == SWCODEC
-    { "TXXX", 4, 0, &parseuser },
+    { "TXXX", 4, 0, &parseuser, false },
+    { "RVA2", 4, 0, &parserva2, true },
 #endif
 };
 
@@ -449,7 +478,7 @@ static int unicode_munge(char* string, char* utf8buf, int *len) {
  *
  * Returns: true if a title was found and created, else false
  */
-static bool setid3v1title(int fd, struct mp3entry *entry) 
+static bool setid3v1title(int fd, struct mp3entry *entry)
 {
     unsigned char buffer[128];
     static const char offsets[] = {3, 33, 63, 93, 125, 127};
@@ -525,7 +554,7 @@ static bool setid3v1title(int fd, struct mp3entry *entry)
  *
  * Returns: true if a title was found and created, else false
  */
-static void setid3v2title(int fd, struct mp3entry *entry) 
+static void setid3v2title(int fd, struct mp3entry *entry)
 {
     int minframesize;
     int size;
@@ -546,7 +575,7 @@ static void setid3v2title(int fd, struct mp3entry *entry)
     int rc;
 
     global_ff_found = false;
-    
+
     /* Bail out if the tag is shorter than 10 bytes */
     if(entry->id3v2len < 10)
         return;
@@ -586,7 +615,7 @@ static void setid3v2title(int fd, struct mp3entry *entry)
     entry->title = entry->artist = entry->album = NULL;
 
     global_flags = header[5];
-    
+
     /* Skip the extended header if it is present */
     if(global_flags & 0x40) {
         if(version == ID3_VER_2_3) {
@@ -603,14 +632,14 @@ static void setid3v2title(int fd, struct mp3entry *entry)
 
             lseek(fd, framelen - 10, SEEK_CUR);
         }
-        
+
         if(version >= ID3_VER_2_4) {
             if(4 != read(fd, header, 4))
                 return;
 
             /* The 2.4 extended header size does include the entire header,
                so here we can just skip it. This header is unsynched. */
-            framelen = UNSYNC(header[0], header[1], 
+            framelen = UNSYNC(header[0], header[1],
                               header[2], header[3]);
 
             lseek(fd, framelen - 4, SEEK_CUR);
@@ -621,14 +650,14 @@ static void setid3v2title(int fd, struct mp3entry *entry)
     if(global_flags & 0x80) {
         global_unsynch = true;
     }
-    
-    /* 
-     * We must have at least minframesize bytes left for the 
-     * remaining frames to be interesting 
+
+    /*
+     * We must have at least minframesize bytes left for the
+     * remaining frames to be interesting
      */
     while (size >= minframesize && bufferpos < buffersize - 1) {
         flags = 0;
-        
+
         /* Read frame header and check length */
         if(version >= ID3_VER_2_3) {
             if(global_unsynch && version <= ID3_VER_2_3)
@@ -641,14 +670,14 @@ static void setid3v2title(int fd, struct mp3entry *entry)
             size -= 10;
 
             flags = BYTES2INT(0, 0, header[8], header[9]);
-            
+
             if (version >= ID3_VER_2_4) {
-                framelen = UNSYNC(header[4], header[5], 
+                framelen = UNSYNC(header[4], header[5],
                                   header[6], header[7]);
             } else {
                 /* version .3 files don't use synchsafe ints for
                  * size */
-                framelen = BYTES2INT(header[4], header[5], 
+                framelen = BYTES2INT(header[4], header[5],
                                      header[6], header[7]);
             }
         } else {
@@ -656,17 +685,17 @@ static void setid3v2title(int fd, struct mp3entry *entry)
                 return;
             /* Adjust for the 6 bytes we read */
             size -= 6;
-            
+
             framelen = BYTES2INT(0, header[3], header[4], header[5]);
         }
 
         /* Keep track of the total size */
         totframelen = framelen;
-        
+
         DEBUGF("framelen = %d\n", framelen);
         if(framelen == 0){
             if (header[0] == 0 && header[1] == 0 && header[2] == 0)
-                return; 
+                return;
             else
                 continue;
         }
@@ -677,7 +706,7 @@ static void setid3v2title(int fd, struct mp3entry *entry)
         if(flags)
         {
             skip = 0;
-            
+
             if (version >= ID3_VER_2_4) {
                 if(flags & 0x0040) { /* Grouping identity */
                     lseek(fd, 1, SEEK_CUR); /* Skip 1 byte */
@@ -689,7 +718,7 @@ static void setid3v2title(int fd, struct mp3entry *entry)
                     framelen--;
                 }
             }
-            
+
             if(flags & 0x000c) /* Compression or encryption */
             {
                 /* Skip it using the total size in case
@@ -712,7 +741,7 @@ static void setid3v2title(int fd, struct mp3entry *entry)
                 }
             }
         }
-        
+
         /* If the frame is larger than the remaining buffer space we try
            to read as much as would fit in the buffer */
         if(framelen >= buffersize - bufferpos)
@@ -726,7 +755,7 @@ static void setid3v2title(int fd, struct mp3entry *entry)
            the amount of bytes we read.  If we fail to read as many bytes as
            we expect, we assume that we can't read from this file, and bail
            out.
-        
+
            For each frame. we will iterate over the list of supported tags,
            and read the tag into entry's buffer. All tags will be kept as
            strings, for cases where a number won't do, e.g., YEAR: "circa
@@ -735,7 +764,7 @@ static void setid3v2title(int fd, struct mp3entry *entry)
            flexible, and as the main use of id3 data is to display it,
            converting it to an int just means reconverting to display it, at a
            runtime cost.
-        
+
            For tags that the current code does convert to ints, a post
            processing function will be called via a pointer to function. */
 
@@ -744,7 +773,7 @@ static void setid3v2title(int fd, struct mp3entry *entry)
             char** ptag = tr->offset ? (char**) (((char*)entry) + tr->offset)
                 : NULL;
             char* tag;
-            
+
             /* Only ID3_VER_2_2 uses frames with three-character names. */
             if (((version == ID3_VER_2_2) && (tr->tag_length != 3))
                 || ((version > ID3_VER_2_2) && (tr->tag_length != 4))) {
@@ -757,8 +786,8 @@ static void setid3v2title(int fd, struct mp3entry *entry)
              * particular) be updated to handle the case of being called
              * multiple times, or should the "*ptag" check be removed?
              */
-            if( (!ptag || !*ptag) && !memcmp( header, tr->tag, tr->tag_length ) ) { 
-                
+            if( (!ptag || !*ptag) && !memcmp( header, tr->tag, tr->tag_length ) ) {
+
                 /* found a tag matching one in tagList, and not yet filled */
                 tag = buffer + bufferpos;
 
@@ -766,37 +795,41 @@ static void setid3v2title(int fd, struct mp3entry *entry)
                     bytesread = read_unsynched(fd, tag, framelen);
                 else
                     bytesread = read(fd, tag, framelen);
-                
+
                 if( bytesread != framelen )
                     return;
-                
+
                 size -= bytesread;
-                
+
                 if(unsynch || (global_unsynch && version >= ID3_VER_2_4))
                     bytesread = unsynchronize_frame(tag, bytesread);
-                
 
-                /* UTF-8 could potentially be 3 times larger */
-                /* so we need to create a new buffer         */
-                char utf8buf[(3 * bytesread) + 1];
+                /* Attempt to parse Unicode string only if the tag contents
+                   aren't binary */
+                if(!tr->binary) {
+                    /* UTF-8 could potentially be 3 times larger */
+                    /* so we need to create a new buffer         */
+                    char utf8buf[(3 * bytesread) + 1];
 
-                unicode_munge( tag, utf8buf, &bytesread );
+                    unicode_munge( tag, utf8buf, &bytesread );
 
-                if(bytesread >= buffersize - bufferpos)
-                    bytesread = buffersize - bufferpos - 1;
+                    if(bytesread >= buffersize - bufferpos)
+                        bytesread = buffersize - bufferpos - 1;
 
-                for (j = 0; j < bytesread; j++)
-                    tag[j] = utf8buf[j];
+                    for (j = 0; j < bytesread; j++)
+                        tag[j] = utf8buf[j];
 
-                if (ptag)
-                    *ptag = tag;
+                    /* remove trailing spaces */
+                    while ( bytesread > 0 && isspace(tag[bytesread-1]))
+                        bytesread--;
+                }
 
-                /* remove trailing spaces */
-                while ( bytesread > 0 && isspace(tag[bytesread-1]))
-                    bytesread--;
                 tag[bytesread] = 0;
                 bufferpos += bytesread + 1;
 
+                if (ptag)
+                    *ptag = tag;
+
                 if( tr->ppFunc )
                     bufferpos = tr->ppFunc(entry, tag, bufferpos);
 
@@ -816,7 +849,7 @@ static void setid3v2title(int fd, struct mp3entry *entry)
             } else {
                 if(data_length_ind)
                     totframelen = data_length_ind;
-                
+
                 size -= totframelen;
                 if( lseek(fd, totframelen, SEEK_CUR) == -1 )
                     return;
@@ -832,7 +865,7 @@ static void setid3v2title(int fd, struct mp3entry *entry)
  *
  * Returns: the size of the tag or 0 if none was found
  */
-int getid3v2len(int fd) 
+int getid3v2len(int fd)
 {
     char buf[6];
     int offset;
@@ -862,7 +895,7 @@ int getid3v2len(int fd)
  * Arguments: file - the file to calculate the length upon
  *            entry - the entry to update with the length
  *
- * Returns: the song length in milliseconds, 
+ * Returns: the song length in milliseconds,
  *          0 means that it couldn't be calculated
  */
 static int getsonglength(int fd, struct mp3entry *entry)
@@ -871,7 +904,7 @@ static int getsonglength(int fd, struct mp3entry *entry)
     struct mp3info info;
     long bytecount;
 
-    /* Start searching after ID3v2 header */ 
+    /* Start searching after ID3v2 header */
     if(-1 == lseek(fd, entry->id3v2len, SEEK_SET))
         return 0;
 
@@ -882,7 +915,7 @@ static int getsonglength(int fd, struct mp3entry *entry)
 
     if(bytecount < 0)
         return -1;
-    
+
     bytecount += entry->id3v2len;
 
     /* Validate byte count, in case the file has been edited without
@@ -890,11 +923,11 @@ static int getsonglength(int fd, struct mp3entry *entry)
      */
     if (info.byte_count)
     {
-        const unsigned long expected = entry->filesize - entry->id3v1len 
+        const unsigned long expected = entry->filesize - entry->id3v1len
             - entry->id3v2len;
         const unsigned long diff = MAX(10240, info.byte_count / 20);
-    
-        if ((info.byte_count > expected + diff) 
+
+        if ((info.byte_count > expected + diff)
             || (info.byte_count < expected - diff))
         {
             DEBUGF("Note: info.byte_count differs from expected value by "
@@ -933,7 +966,7 @@ static int getsonglength(int fd, struct mp3entry *entry)
        rate MP3, so just use the default formula */
 
     filetime = info.file_time;
-    
+
     if(filetime == 0)
     {
         filetime = (entry->filesize - bytecount) / (info.bitrate / 8);
@@ -949,11 +982,11 @@ static int getsonglength(int fd, struct mp3entry *entry)
 
     entry->lead_trim = info.enc_delay;
     entry->tail_trim = info.enc_padding;
-    
+
     memcpy(entry->toc, info.toc, sizeof(info.toc));
 
     entry->vbr_header_pos = info.vbr_header_pos;
-    
+
     /* Update the seek point for the first playable frame */
     entry->first_frame_offset = bytecount;
     DEBUGF("First frame is at %x\n", entry->first_frame_offset);
@@ -970,7 +1003,7 @@ bool mp3info(struct mp3entry *entry, const char *filename, bool v1first)
 {
     int fd;
     int v1found = false;
-    
+
     fd = open(filename, O_RDONLY);
     if(-1 == fd)
         return true;
@@ -980,7 +1013,7 @@ bool mp3info(struct mp3entry *entry, const char *filename, bool v1first)
 #endif
 
     strncpy(entry->path, filename, sizeof(entry->path));
- 
+
     entry->title = NULL;
     entry->filesize = filesize(fd);
     entry->id3v2len = getid3v2len(fd);
@@ -989,7 +1022,7 @@ bool mp3info(struct mp3entry *entry, const char *filename, bool v1first)
 
     if(v1first)
         v1found = setid3v1title(fd, entry);
-    
+
     if (!v1found && entry->id3v2len)
         setid3v2title(fd, entry);
     entry->length = getsonglength(fd, entry);
@@ -997,7 +1030,7 @@ bool mp3info(struct mp3entry *entry, const char *filename, bool v1first)
     /* Subtract the meta information from the file size to get
        the true size of the MP3 stream */
     entry->filesize -= entry->first_frame_offset;
-    
+
     /* only seek to end of file if no id3v2 tags were found,
        and we already haven't looked for a v1 tag */
     if (!v1first && !entry->id3v2len) {
@@ -1076,10 +1109,10 @@ int main(int argc, char **argv)
                "      Title: %s\n"
                "     Artist: %s\n"
                "      Album: %s\n"
-               "      Genre: %s (%d) \n" 
-               "   Composer: %s\n"        
+               "      Genre: %s (%d) \n"
+               "   Composer: %s\n"
                "       Year: %s (%d)\n"
-               "      Track: %s (%d)\n"        
+               "      Track: %s (%d)\n"
                "     Length: %s / %d s\n"
                "    Bitrate: %d\n"
                "  Frequency: %d\n",
@@ -1099,7 +1132,7 @@ int main(int argc, char **argv)
                mp3.bitrate,
                mp3.frequency);
     }
-    
+
     return 0;
 }
 
diff --git a/firmware/replaygain.c b/firmware/replaygain.c
index a8331ae483..ffabb4b2ac 100644
--- a/firmware/replaygain.c
+++ b/firmware/replaygain.c
@@ -28,6 +28,10 @@
 #include "id3.h"
 #include "debug.h"
 
+/* Type of channel for RVA2 frame. There are more than this defined in the spec
+   but we don't use them. */
+#define MASTER_CHANNEL 1
+
 /* The fixed point math routines (with the exception of fp_atof) are based
  * on oMathFP by Dan Carter (http://orbisstudios.com).
  */
@@ -278,7 +282,7 @@ static long fp_atof(const char* s, int precision)
       frac_max_int *= 10;
     }
 
-    return sign * ((int_part * int_one) 
+    return sign * ((int_part * int_one)
         + (((int64_t) frac_part * int_one) / frac_max_int));
 }
 
@@ -286,14 +290,14 @@ static long convert_gain(long gain)
 {
     if (gain != 0)
     {
-        /* Don't allow unreasonably low or high gain changes. 
+        /* Don't allow unreasonably low or high gain changes.
          * Our math code can't handle it properly anyway. :)
          */
         if (gain < (-48 * FP_ONE))
         {
             gain = -48 * FP_ONE;
         }
-    
+
         if (gain > (17 * FP_ONE))
         {
             gain = 17 * FP_ONE;
@@ -301,55 +305,55 @@ static long convert_gain(long gain)
 
         gain = fp_exp10(gain / 20) << (24 - FP_BITS);
     }
-    
+
     return gain;
 }
 
 long get_replaygain_int(long int_gain)
 {
     long gain = 0;
-    
+
     if (int_gain)
     {
         gain = convert_gain(int_gain * FP_ONE / 100);
     }
-    
+
     return gain;
 }
 
 long get_replaygain(const char* str)
 {
     long gain = 0;
-    
+
     if (str)
     {
         gain = fp_atof(str, FP_BITS);
         gain = convert_gain(gain);
     }
-    
+
     return gain;
 }
 
 long get_replaypeak(const char* str)
 {
     long peak = 0;
-    
+
     if (str)
     {
         peak = fp_atof(str, 24);
     }
-    
+
     return peak;
 }
 
-/* Check for a ReplayGain tag conforming to the "VorbisGain standard". If 
+/* Check for a ReplayGain tag conforming to the "VorbisGain standard". If
  * found, set the mp3entry accordingly. buffer is where to store the text
- * contents of the gain tags; up to length bytes (including end nil) can be 
- * written. Returns number of bytes written to the tag text buffer, or zero 
+ * contents of the gain tags; up to length bytes (including end nil) can be
+ * written. Returns number of bytes written to the tag text buffer, or zero
  * if no ReplayGain tag was found (or nothing was copied to the buffer for
  * other reasons).
  */
-long parse_replaygain(const char* key, const char* value, 
+long parse_replaygain(const char* key, const char* value,
     struct mp3entry* entry, char* buffer, int length)
 {
     char **p = NULL;
@@ -359,7 +363,7 @@ long parse_replaygain(const char* key, const char* value,
     {
         entry->track_gain = get_replaygain(value);
         p = &(entry->track_gain_string);
-    } 
+    }
     else if ((strcasecmp(key, "replaygain_album_gain") == 0)
         || ((strcasecmp(key, "rg_audiophile") == 0) && !entry->album_gain))
     {
@@ -370,7 +374,7 @@ long parse_replaygain(const char* key, const char* value,
         || ((strcasecmp(key, "rg_peak") == 0) && !entry->track_peak))
     {
         entry->track_peak = get_replaypeak(value);
-    } 
+    }
     else if (strcasecmp(key, "replaygain_album_peak") == 0)
     {
         entry->album_peak = get_replaypeak(value);
@@ -379,7 +383,7 @@ long parse_replaygain(const char* key, const char* value,
     if (p)
     {
         int len = strlen(value);
-        
+
         len = MIN(len, length - 1);
 
         /* A few characters just isn't interesting... */
@@ -394,3 +398,75 @@ long parse_replaygain(const char* key, const char* value,
 
     return 0;
 }
+
+static long get_rva_values(const char *frame, long *gain, long *peak,
+    char **string, char *buffer, int length)
+{
+    long value, len;
+    int negative = 0;
+    char tmpbuf[10];
+    int peakbits, peakbytes, shift;
+    unsigned long peakvalue = 0;
+
+    value = 256 * ((unsigned char)*frame) + ((unsigned char)*(frame + 1));
+    if (value & 0x8000)
+    {
+        value = -(value | ~0xFFFF);
+        negative = 1;
+    }
+
+    len = snprintf(tmpbuf, sizeof(tmpbuf), "%s%d.%02d dB", negative ? "-" : "",
+        value / 512, (value & 0x1FF) * 195 / 1000);
+
+    *gain = get_replaygain(tmpbuf);
+
+    len = MIN(len, length - 1);
+    if (len > 1)
+    {
+        strncpy(buffer, tmpbuf, len);
+        buffer[len] = 0;
+        *string = buffer;
+    }
+
+    frame += 2;
+    peakbits = *(unsigned char *)frame++;
+    peakbytes = MIN(4, (peakbits + 7) >> 3);
+    shift = ((8 - (peakbits & 7)) & 7) + (4 - peakbytes) * 8;
+
+    for (; peakbytes; peakbytes--)
+    {
+            peakvalue <<= 8;
+            peakvalue += (unsigned long)*frame++;
+    }
+
+    peakvalue <<= shift;
+
+    if (peakbits > 32)
+        peakvalue += (unsigned long)*frame >> (8 - shift);
+
+    snprintf(tmpbuf, sizeof(tmpbuf), "%d.%06d", peakvalue >> 31,
+        (peakvalue & ~(1 << 31)) / 2147);
+
+    *peak = get_replaypeak(tmpbuf);
+
+    return len + 1;
+}
+
+long parse_replaygain_rva(const char* key, const char* value,
+    struct mp3entry* entry, char* buffer, int length)
+{
+    if ((strcasecmp(key, "track") == 0) && *value == MASTER_CHANNEL
+        && !entry->track_gain && !entry->track_peak)
+    {
+        return get_rva_values(value + 1, &(entry->track_gain), &(entry->track_peak),
+            &(entry->track_gain_string), buffer, length);
+    }
+    else if ((strcasecmp(key, "album") == 0) && *value == MASTER_CHANNEL
+        && !entry->album_gain && !entry->album_peak)
+    {
+        return get_rva_values(value + 1, &(entry->album_gain), &(entry->album_peak),
+            &(entry->album_gain_string), buffer, length);
+    }
+
+    return 0;
+}