10 files changed, 600 insertions, 19 deletions

diff --git a/apps/codecs/SOURCES b/apps/codecs/SOURCES
index 41247658c7..8970567b65 100644
--- a/apps/codecs/SOURCES
+++ b/apps/codecs/SOURCES
@@ -30,6 +30,7 @@ adx.c
 smaf.c
 au.c
 vox.c
+wav64.c
 #if defined(HAVE_RECORDING) && !defined(SIMULATOR)
 /* encoders */
 aiff_enc.c
diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make
index 7bd141e9cd..1f377abf3d 100644
--- a/apps/codecs/codecs.make
+++ b/apps/codecs/codecs.make
@@ -93,6 +93,7 @@ $(CODECDIR)/wav.codec : $(CODECDIR)/libpcm.a
 $(CODECDIR)/smaf.codec : $(CODECDIR)/libpcm.a
 $(CODECDIR)/au.codec : $(CODECDIR)/libpcm.a
 $(CODECDIR)/vox.codec : $(CODECDIR)/libpcm.a
+$(CODECDIR)/wav64.codec : $(CODECDIR)/libpcm.a
 
 $(CODECS): $(CODECLIB) # this must be last in codec dependency list
 
diff --git a/apps/codecs/wav64.c b/apps/codecs/wav64.c
new file mode 100644
index 0000000000..e607a86a96
--- /dev/null
+++ b/apps/codecs/wav64.c
@@ -0,0 +1,447 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2010 Yoshihisa Uchida
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#include "codeclib.h"
+#include "codecs/libpcm/support_formats.h"
+
+CODEC_HEADER
+
+/* Wave64 codec
+ *
+ * References
+ * [1] VCS Aktiengesellschaft, Sony Wave64, Informations_about_Sony_Wave64.pdf
+ */
+
+#define PCM_SAMPLE_SIZE (4096*2)
+
+static int32_t samples[PCM_SAMPLE_SIZE] IBSS_ATTR;
+
+/* Wave64 GUIDs */
+#define WAVE64_GUID_RIFF "riff\x2e\x91\xcf\x11\xa5\xd6\x28\xdb\x04\xc1\x00\x00"
+#define WAVE64_GUID_WAVE "wave\xf3\xac\xd3\x11\x8c\xd1\x00\xc0\x4f\x8e\xdb\x8a"
+#define WAVE64_GUID_FMT  "fmt \xf3\xac\xd3\x11\x8c\xd1\x00\xc0\x4f\x8e\xdb\x8a"
+#define WAVE64_GUID_FACT "fact\xf3\xac\xd3\x11\x8c\xd1\x00\xc0\x4f\x8e\xdb\x8a"
+#define WAVE64_GUID_DATA "data\xf3\xac\xd3\x11\x8c\xd1\x00\xc0\x4f\x8e\xdb\x8a"
+
+/* This codec support WAVE files with the following formats: */
+enum
+{
+    WAVE_FORMAT_UNKNOWN = 0x0000, /* Microsoft Unknown Wave Format */
+    WAVE_FORMAT_PCM = 0x0001,   /* Microsoft PCM Format */
+    WAVE_FORMAT_ADPCM = 0x0002, /* Microsoft ADPCM Format */
+    WAVE_FORMAT_IEEE_FLOAT = 0x0003, /* IEEE Float */
+    WAVE_FORMAT_ALAW = 0x0006,  /* Microsoft ALAW */
+    WAVE_FORMAT_MULAW = 0x0007, /* Microsoft MULAW */
+    WAVE_FORMAT_DVI_ADPCM = 0x0011, /* Intel's DVI ADPCM */
+    WAVE_FORMAT_DIALOGIC_OKI_ADPCM = 0x0017, /* Dialogic OKI ADPCM */
+    WAVE_FORMAT_YAMAHA_ADPCM = 0x0020, /* Yamaha ADPCM */
+    WAVE_FORMAT_XBOX_ADPCM = 0x0069, /* XBOX ADPCM */
+    IBM_FORMAT_MULAW = 0x0101,  /* same as WAVE_FORMAT_MULAW */
+    IBM_FORMAT_ALAW = 0x0102,   /* same as WAVE_FORMAT_ALAW */
+    WAVE_FORMAT_SWF_ADPCM = 0x5346, /* Adobe SWF ADPCM */
+    WAVE_FORMAT_EXTENSIBLE = 0xFFFE
+};
+
+const struct pcm_entry wave_codecs[] = {
+    { WAVE_FORMAT_UNKNOWN,            0                            },
+    { WAVE_FORMAT_PCM,                get_linear_pcm_codec         },
+    { WAVE_FORMAT_ADPCM,              get_ms_adpcm_codec           },
+    { WAVE_FORMAT_IEEE_FLOAT,         get_ieee_float_codec         },
+    { WAVE_FORMAT_ALAW,               get_itut_g711_alaw_codec     },
+    { WAVE_FORMAT_MULAW,              get_itut_g711_mulaw_codec    },
+    { WAVE_FORMAT_DVI_ADPCM,          get_dvi_adpcm_codec          },
+    { WAVE_FORMAT_DIALOGIC_OKI_ADPCM, get_dialogic_oki_adpcm_codec },
+    { WAVE_FORMAT_YAMAHA_ADPCM,       get_yamaha_adpcm_codec       },
+    { WAVE_FORMAT_XBOX_ADPCM,         get_dvi_adpcm_codec          },
+    { IBM_FORMAT_MULAW,               get_itut_g711_mulaw_codec    },
+    { IBM_FORMAT_ALAW,                get_itut_g711_alaw_codec     },
+    { WAVE_FORMAT_SWF_ADPCM,          get_swf_adpcm_codec          },
+};
+
+#define NUM_FORMATS 13
+
+static const struct pcm_codec *get_wave_codec(uint32_t formattag)
+{
+    int i;
+
+    for (i = 0; i < NUM_FORMATS; i++)
+    {
+        if (wave_codecs[i].format_tag == formattag)
+        {
+            if (wave_codecs[i].get_codec)
+                return wave_codecs[i].get_codec();
+            return 0;
+        }
+    }
+    return 0;
+}
+
+static struct pcm_format format;
+static uint32_t bytesdone;
+
+/* Read an unaligned 64-bit little endian unsigned integer from buffer. */
+static uint64_t get_uint64_le(void* buf)
+{
+    unsigned char* p = (unsigned char*) buf;
+
+    return p[0] | (p[1] << 8)  | (p[2] << 16) | (p[3] << 24) | ((uint64_t)p[4] << 32) |
+                  ((uint64_t)p[5] << 40) | ((uint64_t)p[6] << 48) | ((uint64_t)p[7] << 56);
+}
+
+static bool set_msadpcm_coeffs(unsigned char *buf)
+{
+    int i;
+    int num;
+    uint64_t size;
+
+    buf += 16; /* skip 'fmt ' GUID */
+    size = get_uint64_le(buf);
+    if (size < 50)
+    {
+        DEBUGF("CODEC_ERROR: microsoft adpcm 'fmt ' chunk size=%d < 50\n", (int)size);
+        return false;
+    }
+
+    /* get nNumCoef */
+    buf += 28;
+    num = buf[0] | (buf[1] << 8);
+
+    /*
+     * In many case, nNumCoef is 7.
+     * Depending upon the encoder, as for this value there is a possibility of
+     * increasing more.
+     * If you found the file where this value exceeds 7, please report.
+     */
+    if (num != MSADPCM_NUM_COEFF)
+    {
+        DEBUGF("CODEC_ERROR: microsoft adpcm nNumCoef=%d != 7\n", num);
+        return false;
+    }
+
+    /* get aCoeffs */
+    buf += 2;
+    for (i = 0; i < MSADPCM_NUM_COEFF; i++)
+    {
+        format.coeffs[i][0] = buf[0] | (SE(buf[1]) << 8);
+        format.coeffs[i][1] = buf[2] | (SE(buf[3]) << 8);
+        buf += 4;
+    }
+
+    return true;
+}
+
+static uint8_t *read_buffer(size_t *realsize)
+{
+    uint8_t *buffer = (uint8_t *)ci->request_buffer(realsize, format.chunksize);
+    if (bytesdone + (*realsize) > format.numbytes)
+        *realsize = format.numbytes - bytesdone;
+    bytesdone += *realsize;
+    ci->advance_buffer(*realsize);
+    return buffer;
+}
+
+/* this is the codec entry point */
+enum codec_status codec_main(void)
+{
+    int status = CODEC_OK;
+    uint32_t decodedsamples;
+    uint32_t i;
+    size_t n;
+    int bufcount;
+    int endofstream;
+    unsigned char *buf;
+    uint8_t *wavbuf;
+    off_t firstblockposn;     /* position of the first block in file */
+    const struct pcm_codec *codec;
+    uint64_t size;
+
+    /* Generic codec initialisation */
+    ci->configure(DSP_SET_SAMPLE_DEPTH, 28);
+  
+next_track:
+    if (codec_init()) {
+        DEBUGF("codec_init() error\n");
+        status = CODEC_ERROR;
+        goto exit;
+    }
+
+    while (!*ci->taginfo_ready && !ci->stop_codec)
+        ci->sleep(1);
+
+    codec_set_replaygain(ci->id3);
+    
+    /* Need to save offset for later use (cleared indirectly by advance_buffer) */
+    bytesdone = ci->id3->offset;
+
+    /* get RIFF chunk header */
+    buf = ci->request_buffer(&n, 40);
+    if (n < 40) {
+        DEBUGF("request_buffer error\n");
+        status = CODEC_ERROR;
+        goto done;
+    }
+    if ((memcmp(buf   , WAVE64_GUID_RIFF, 16) != 0) ||
+        (memcmp(buf+24, WAVE64_GUID_WAVE, 16) != 0))
+    {
+        status = CODEC_ERROR;
+        goto done;
+    }
+
+    /* advance to first WAVE chunk */
+    ci->advance_buffer(40);
+
+    firstblockposn = 40;
+    ci->memset(&format, 0, sizeof(struct pcm_format));
+    format.is_signed = true;
+    format.is_little_endian = true;
+
+    decodedsamples = 0;
+    codec = 0;
+
+    /* iterate over WAVE chunks until the 'data' chunk, which should be after the 'fmt ' chunk */
+    while (true) {
+        /* get WAVE chunk header */
+        buf = ci->request_buffer(&n, 1024);
+        if (n < 8) {
+            DEBUGF("data chunk request_buffer error\n");
+            /* no more chunks, 'data' chunk must not have been found */
+            status = CODEC_ERROR;
+            goto done;
+        }
+
+        /* chunkSize */
+        size = get_uint64_le(buf+16) - 24;
+        if (memcmp(buf, WAVE64_GUID_FMT, 16) == 0) {
+            if (size < 16) {
+                DEBUGF("CODEC_ERROR: 'fmt ' chunk size=%d < 16\n", (int)size);
+                status = CODEC_ERROR;
+                goto done;
+            }
+            /* wFormatTag */
+            format.formattag=buf[24]|(buf[25]<<8);
+            /* wChannels */
+            format.channels=buf[26]|(buf[27]<<8);
+            /* skipping dwSamplesPerSec */
+            /* skipping dwAvgBytesPerSec */
+            /* wBlockAlign */
+            format.blockalign=buf[36]|(buf[37]<<8);
+            /* wBitsPerSample */
+            format.bitspersample=buf[38]|(buf[39]<<8);
+            if (format.formattag != WAVE_FORMAT_PCM) {
+                if (size < 18) {
+                    /* this is not a fatal error with some formats,
+                     * we'll see later if we can't decode it */
+                    DEBUGF("CODEC_WARNING: non-PCM WAVE (formattag=0x%x) "
+                           "doesn't have ext. fmt descr (chunksize=%d<18).\n",
+                           (unsigned int)format.formattag, (int)size);
+                }
+                else
+                {
+                    format.size = buf[40]|(buf[41]<<8);
+                    if (format.formattag != WAVE_FORMAT_EXTENSIBLE)
+                        format.samplesperblock = buf[42]|(buf[43]<<8);
+                    else {
+                        if (format.size < 22) {
+                            DEBUGF("CODEC_ERROR: WAVE_FORMAT_EXTENSIBLE is "
+                                   "missing extension\n");
+                            status = CODEC_ERROR;
+                            goto done;
+                        }
+                        /* wValidBitsPerSample */
+                        format.bitspersample = buf[42]|(buf[43]<<8);
+                        /* skipping dwChannelMask (4bytes) */
+                        /* SubFormat (only get the first two bytes) */
+                        format.formattag = buf[48]|(buf[49]<<8);
+                    }
+                }
+            }
+
+            /* msadpcm specific */
+            if (format.formattag == WAVE_FORMAT_ADPCM)
+            {
+                if (!set_msadpcm_coeffs(buf))
+                {
+                    status = CODEC_ERROR;
+                    goto done;
+                }
+            }
+
+            /* get codec */
+            codec = get_wave_codec(format.formattag);
+            if (!codec)
+            {
+                DEBUGF("CODEC_ERROR: unsupported wave format 0x%x\n", 
+                    (unsigned int) format.formattag);
+                status = CODEC_ERROR;
+                goto done;
+            }
+
+            /* riff 8bit linear pcm is unsigned */
+            if (format.formattag == WAVE_FORMAT_PCM && format.bitspersample == 8)
+                format.is_signed = false;
+
+            /* check format, and calculate chunk size */
+            if (!codec->set_format(&format))
+            {
+                status = CODEC_ERROR;
+                goto done;
+            }
+        } else if (memcmp(buf, WAVE64_GUID_DATA, 16) == 0) {
+            format.numbytes = size;
+            /* advance to start of data */
+            ci->advance_buffer(24);
+            firstblockposn += 24;
+            break;
+        } else if (memcmp(buf, WAVE64_GUID_FACT, 16) == 0) {
+            /* skip 'fact' chunk */
+        } else {
+            DEBUGF("unknown Wave64 chunk: "
+                   "'%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x'\n",
+                   buf[0], buf[1], buf[ 2], buf[ 3], buf[ 4], buf[ 5], buf[ 6], buf[ 7],
+                   buf[8], buf[9], buf[10], buf[11], buf[12], buf[13], buf[14], buf[15]);
+        }
+
+        /* go to next chunk (8byte bound) */
+        if (size & 0x07)
+            size += 8 - (size & 0x7);
+        ci->advance_buffer(size + 24);
+        firstblockposn += size + 24;
+    }
+
+    if (!codec)
+    {
+        DEBUGF("CODEC_ERROR: 'fmt ' chunk not found\n");
+        status = CODEC_ERROR;
+        goto done;
+    }
+
+    /* common format check */
+    if (format.channels == 0) {
+        DEBUGF("CODEC_ERROR: 'fmt ' chunk not found or 0-channels file\n");
+        status = CODEC_ERROR;
+        goto done;
+    }
+    if (format.samplesperblock == 0) {
+        DEBUGF("CODEC_ERROR: 'fmt ' chunk not found or 0-wSamplesPerBlock file\n");
+        status = CODEC_ERROR;
+        goto done;
+    }
+    if (format.blockalign == 0)
+    {
+        DEBUGF("CODEC_ERROR: 'fmt ' chunk not found or 0-blockalign file\n");
+        i = CODEC_ERROR;
+        goto done;
+    }
+    if (format.numbytes == 0) {
+        DEBUGF("CODEC_ERROR: 'data' chunk not found or has zero-length\n");
+        status = CODEC_ERROR;
+        goto done;
+    }
+
+    /* check chunksize */
+    if ((format.chunksize / format.blockalign) * format.samplesperblock * format.channels
+           > PCM_SAMPLE_SIZE)
+        format.chunksize = (PCM_SAMPLE_SIZE / format.blockalign) * format.blockalign;
+    if (format.chunksize == 0)
+    {
+        DEBUGF("CODEC_ERROR: chunksize is 0\n");
+        i = CODEC_ERROR;
+        goto done;
+    }
+
+    ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency);
+    if (format.channels == 2) {
+        ci->configure(DSP_SET_STEREO_MODE, STEREO_INTERLEAVED);
+    } else if (format.channels == 1) {
+        ci->configure(DSP_SET_STEREO_MODE, STEREO_MONO);
+    } else {
+        DEBUGF("CODEC_ERROR: more than 2 channels\n");
+        status = CODEC_ERROR;
+        goto done;
+    }
+
+    /* make sure we're at the correct offset */
+    if (bytesdone > (uint32_t) firstblockposn) {
+        /* Round down to previous block */
+        uint32_t offset = bytesdone - bytesdone % format.blockalign;
+
+        ci->advance_buffer(offset-firstblockposn);
+        bytesdone = offset - firstblockposn;
+    } else {
+        /* already where we need to be */
+        bytesdone = 0;
+    }
+
+    /* The main decoder loop */
+    endofstream = 0;
+
+    while (!endofstream) {
+        ci->yield();
+        if (ci->stop_codec || ci->new_track) {
+            break;
+        }
+
+        if (ci->seek_time) {
+            struct pcm_pos *newpos = codec->get_seek_pos(ci->seek_time, &read_buffer);
+
+            decodedsamples = newpos->samples;
+            if (newpos->pos > format.numbytes)
+                break;
+            if (ci->seek_buffer(firstblockposn + newpos->pos))
+            {
+                bytesdone = newpos->pos;
+            }
+            ci->seek_complete();
+        }
+
+        wavbuf = (uint8_t *)ci->request_buffer(&n, format.chunksize);
+        if (n == 0)
+            break; /* End of stream */
+        if (bytesdone + n > format.numbytes) {
+            n = format.numbytes - bytesdone;
+            endofstream = 1;
+        }
+
+        status = codec->decode(wavbuf, n, samples, &bufcount);
+        if (status == CODEC_ERROR)
+        {
+            DEBUGF("codec error\n");
+            goto done;
+        }
+
+        ci->pcmbuf_insert(samples, NULL, bufcount);
+        ci->advance_buffer(n);
+        bytesdone += n;
+        decodedsamples += bufcount;
+
+        if (bytesdone >= format.numbytes)
+            endofstream = 1;
+        ci->set_elapsed(decodedsamples*1000LL/ci->id3->frequency);
+    }
+    status = CODEC_OK;
+
+done:
+    if (ci->request_next_track())
+        goto next_track;
+
+exit:
+    return status;
+}
diff --git a/apps/filetypes.c b/apps/filetypes.c
index 7837fbc73b..4aefef1f0d 100644
--- a/apps/filetypes.c
+++ b/apps/filetypes.c
@@ -105,6 +105,7 @@ static const struct filetype inbuilt_filetypes[] = {
     { "au",  FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
     { "snd", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
     { "vox", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
+    { "w64", FILE_ATTR_AUDIO, Icon_Audio, VOICE_EXT_MPA },
 #endif
     { "m3u", FILE_ATTR_M3U, Icon_Playlist, LANG_PLAYLIST },
     { "m3u8",FILE_ATTR_M3U, Icon_Playlist, LANG_PLAYLIST },
diff --git a/apps/metadata.c b/apps/metadata.c
index 4e6e47e2bb..1dfc3763c6 100644
--- a/apps/metadata.c
+++ b/apps/metadata.c
@@ -174,6 +174,9 @@ const struct afmt_entry audio_formats[AFMT_NUM_CODECS] =
     /* VOX (Dialogic telephony file formats) */
     [AFMT_VOX] =
         AFMT_ENTRY("VOX",  "vox",   NULL,          "vox\0"      ),
+    /* Wave64 */
+    [AFMT_WAVE64] =
+        AFMT_ENTRY("WAVE64",  "wav64",   NULL,          "w64\0"      ),
 #endif
 };
 
@@ -481,6 +484,14 @@ bool get_metadata(struct mp3entry* id3, int fd, const char* trackname)
         }
         break;
         
+    case AFMT_WAVE64:
+        if (!get_wave64_metadata(fd, id3))
+        {
+            DEBUGF("get_wave64_metadata error\n");
+            return false;
+        }
+        break;
+        
 #endif /* CONFIG_CODEC == SWCODEC */
         
     default:
diff --git a/apps/metadata.h b/apps/metadata.h
index 8ca3f2f746..7bf086f27d 100644
--- a/apps/metadata.h
+++ b/apps/metadata.h
@@ -81,6 +81,7 @@ enum
     AFMT_SMAF,         /* SMAF */
     AFMT_AU,           /* Sun Audio file */
     AFMT_VOX,          /* VOX */
+    AFMT_WAVE64,       /* Wave64 */
 #endif
 
     /* add new formats at any index above this line to have a sensible order -
diff --git a/apps/metadata/metadata_common.c b/apps/metadata/metadata_common.c
index 318399693c..fd1cd553e8 100644
--- a/apps/metadata/metadata_common.c
+++ b/apps/metadata/metadata_common.c
@@ -174,6 +174,15 @@ int read_uint64le(int fd, uint64_t* buf)
 }
 #endif
 
+/* Read an unaligned 64-bit little endian unsigned integer from buffer. */
+uint64_t get_uint64_le(void* buf)
+{
+    unsigned char* p = (unsigned char*) buf;
+
+    return p[0] | (p[1] << 8)  | (p[2] << 16) | (p[3] << 24) | ((uint64_t)p[4] << 32) |
+                  ((uint64_t)p[5] << 40) | ((uint64_t)p[6] << 48) | ((uint64_t)p[7] << 56);
+}
+
 /* Read an unaligned 32-bit little endian long from buffer. */
 unsigned long get_long_le(void* buf)
 {
diff --git a/apps/metadata/metadata_common.h b/apps/metadata/metadata_common.h
index c7d7d67dfb..3962e2cd17 100644
--- a/apps/metadata/metadata_common.h
+++ b/apps/metadata/metadata_common.h
@@ -57,6 +57,7 @@ int read_uint64be(int fd, uint64_t* buf);
 #define read_uint64le(fd,buf) read((fd), (buf), 8)
 #endif
 
+uint64_t get_uint64_le(void* buf);
 unsigned long get_long_le(void* buf);
 unsigned short get_short_le(void* buf);
 unsigned long get_long_be(void* buf);
diff --git a/apps/metadata/metadata_parsers.h b/apps/metadata/metadata_parsers.h
index 3e7abb5c53..0e813ccb48 100644
--- a/apps/metadata/metadata_parsers.h
+++ b/apps/metadata/metadata_parsers.h
@@ -45,3 +45,4 @@ bool get_oma_metadata(int fd, struct mp3entry* id3);
 bool get_smaf_metadata(int fd, struct mp3entry* id3);
 bool get_au_metadata(int fd, struct mp3entry* id3);
 bool get_vox_metadata(int fd, struct mp3entry* id3);
+bool get_wave64_metadata(int fd, struct mp3entry* id3);
diff --git a/apps/metadata/wave.c b/apps/metadata/wave.c
index 79bb8178bd..8fe755735d 100644
--- a/apps/metadata/wave.c
+++ b/apps/metadata/wave.c
@@ -8,6 +8,7 @@
  * $Id$
  *
  * Copyright (C) 2005 Dave Chapman
+ * Copyright (C) 2010 Yoshihisa Uchida
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -41,6 +42,15 @@
         ((uint8_t*)(p))[1] = (d)>>8;            \
     } while(0)
 
+/* Wave(RIFF)/Wave64 format */
+
+/* Wave64 GUIDs */
+#define WAVE64_GUID_RIFF "riff\x2e\x91\xcf\x11\xa5\xd6\x28\xdb\x04\xc1\x00\x00"
+#define WAVE64_GUID_WAVE "wave\xf3\xac\xd3\x11\x8c\xd1\x00\xc0\x4f\x8e\xdb\x8a"
+#define WAVE64_GUID_FMT  "fmt \xf3\xac\xd3\x11\x8c\xd1\x00\xc0\x4f\x8e\xdb\x8a"
+#define WAVE64_GUID_FACT "fact\xf3\xac\xd3\x11\x8c\xd1\x00\xc0\x4f\x8e\xdb\x8a"
+#define WAVE64_GUID_DATA "data\xf3\xac\xd3\x11\x8c\xd1\x00\xc0\x4f\x8e\xdb\x8a"
+
 enum
 {
     WAVE_FORMAT_PCM = 0x0001,   /* Microsoft PCM Format */
@@ -64,7 +74,7 @@ struct wave_fmt {
     unsigned int blockalign;
     unsigned long bitspersample;
     unsigned int samplesperblock;
-    unsigned long numbytes;
+    uint64_t numbytes;
 };
 
 static unsigned long get_totalsamples(struct wave_fmt *fmt, struct mp3entry* id3)
@@ -114,6 +124,28 @@ static unsigned long get_totalsamples(struct wave_fmt *fmt, struct mp3entry* id3
     return totalsamples;
 }
 
+static void parse_riff_format(unsigned char* buf, int fmtsize, struct wave_fmt *fmt,
+                              struct mp3entry* id3)
+{
+    /* wFormatTag */
+    fmt->formattag = buf[0] | (buf[1] << 8);
+    /* wChannels */
+    fmt->channels = buf[2] | (buf[3] << 8);
+    /* dwSamplesPerSec */
+    id3->frequency = get_long_le(&buf[4]);
+    /* dwAvgBytesPerSec */
+    id3->bitrate = (get_long_le(&buf[8]) * 8) / 1000;
+    /* wBlockAlign */
+    fmt->blockalign = buf[12] | (buf[13] << 8);
+    /* wBitsPerSample */
+    fmt->bitspersample = buf[14] | (buf[15] << 8);
+    if (fmtsize > 19)
+    {
+        /* wSamplesPerBlock */
+        fmt->samplesperblock = buf[18] | (buf[19] << 8);
+    }
+}
+
 bool get_wave_metadata(int fd, struct mp3entry* id3)
 {
     /* Use the trackname part of the id3 structure as a temporary buffer */
@@ -166,24 +198,7 @@ bool get_wave_metadata(int fd, struct mp3entry* id3)
             offset += read_bytes;
             i -= read_bytes;
 
-            /* wFormatTag */
-            fmt.formattag = buf[0] | (buf[1] << 8);
-            /* wChannels */
-            fmt.channels = buf[2] | (buf[3] << 8);
-            /* dwSamplesPerSec */
-            id3->frequency = get_long_le(&buf[4]);
-            /* dwAvgBytesPerSec */
-            id3->bitrate = (get_long_le(&buf[8]) * 8) / 1000;
-            /* wBlockAlign */
-            fmt.blockalign = buf[12] | (buf[13] << 8);
-            id3->bytesperframe = fmt.blockalign;
-            /* wBitsPerSample */
-            fmt.bitspersample = buf[14] | (buf[15] << 8);
-            if (read_bytes > 19)
-            {
-                /* wSamplesPerBlock */
-                fmt.samplesperblock = buf[18] | (buf[19] << 8);
-            }
+            parse_riff_format(buf, i, &fmt, id3);
 
             /* Check for ATRAC3 stream */
             if (fmt.formattag == WAVE_FORMAT_ATRAC3)
@@ -256,3 +271,96 @@ bool get_wave_metadata(int fd, struct mp3entry* id3)
 
     return true;
 }
+
+bool get_wave64_metadata(int fd, struct mp3entry* id3)
+{
+    /* Use the trackname part of the id3 structure as a temporary buffer */
+    unsigned char* buf = (unsigned char *)id3->path;
+    struct wave_fmt fmt;
+    unsigned long totalsamples = 0;
+    int read_bytes;
+    uint64_t i;
+
+    memset(&fmt, 0, sizeof(struct wave_fmt));
+
+    /* get RIFF chunk header */
+    if ((lseek(fd, 0, SEEK_SET) < 0) || (read(fd, buf, 40) < 40))
+        return false;
+
+    if ((memcmp(buf   , WAVE64_GUID_RIFF, 16) != 0)||
+        (memcmp(buf+24, WAVE64_GUID_WAVE, 16) != 0))
+    {
+        DEBUGF("metada error: does not wave64 file\n");
+        return false;
+    }
+
+    /* iterate over WAVE chunks until 'data' chunk */
+    while (true)
+    {
+        /* get chunk header */
+        if (read(fd, buf, 24) < 24)
+            return false;
+
+        /* chunkSize (excludes GUID and size length) */
+        i = get_uint64_le(&buf[16]) - 24;
+
+        if (memcmp(buf, WAVE64_GUID_FMT, 16) == 0)
+        {
+            DEBUGF("find 'fmt ' chunk\n");
+            if (i < 16)
+                return false;
+
+            read_bytes = 16;
+            if (i > 16)
+            {
+                read_bytes = 24;
+                if (i < 24)
+                    i = 24;
+            }
+
+            /* get rest of chunk */
+            if (read(fd, buf, read_bytes) < read_bytes)
+                return false;
+
+            i -= read_bytes;
+            parse_riff_format(buf, read_bytes, &fmt, id3);
+        }
+        else if (memcmp(buf, WAVE64_GUID_DATA, 16) == 0)
+        {
+            DEBUGF("find 'data' chunk\n");
+            fmt.numbytes = i;
+            break;
+        }
+        else if (memcmp(buf, WAVE64_GUID_FACT, 16) == 0)
+        {
+            /* Skip 'fact' chunk */
+            DEBUGF("find 'fact' chunk\n");
+        }
+
+        /* seek to next chunk (8byte bound) */
+        if (i & 0x07)
+            i += 8 - (i & 0x7);
+
+        if(lseek(fd, i, SEEK_CUR) < 0)
+            return false;
+    }
+
+    if ((fmt.numbytes == 0) || (fmt.channels == 0) || (fmt.blockalign == 0))
+    {
+        DEBUGF("metadata error: numbytes, channels, or blockalign is 0\n");
+        return false;
+    }
+
+    if (totalsamples == 0)
+    {
+        totalsamples = get_totalsamples(&fmt, id3);
+    }
+
+    id3->vbr = false;   /* All Wave64 files are CBR */
+    id3->filesize = filesize(fd);
+
+    /* Calculate track length (in ms) and estimate the bitrate (in kbit/s) */
+    id3->length = ((int64_t) totalsamples * 1000) / id3->frequency;
+
+    return true;
+}