[FFmpeg-devel] [PATCH] RF64 demuxer

[Daniel Verkamp]

On Fri, Oct 2, 2009 at 2:03 PM, Michael Niedermayer <michaelni at gmx.at> wrote:
> On Fri, Oct 02, 2009 at 01:37:27PM -0500, Daniel Verkamp wrote:
>> On Fri, Oct 2, 2009 at 5:09 AM, Michael Niedermayer <michaelni at gmx.at> wrote:
>> > On Thu, Oct 01, 2009 at 06:07:45PM -0500, Daniel Verkamp wrote:
>> [...]
>> >> +/** Get RF64-style 64-bit integer */
>> >> +static int64_t get_rf64(ByteIOContext *pb)
>> >> +{
>> >> + ? ?int64_t val;
>> >> + ? ?val ?= get_le32(pb);
>> >> + ? ?val |= (int64_t)get_le32(pb) << 32;
>> >> + ? ?return val;
>> >> +}
>> >
>> > get_le64() ?
>>
>> Yes, somehow I had decided that the order was backwards from normal
>> LE64, but it's the same; removed.
>>
>> >
>> >> +
>> >> +static int rf64_read_header(AVFormatContext *s, AVFormatParameters *ap)
>> >
>> > this looks similar enough to the normal one to be merged with it
>>
>> True; new patch attached.
>>
>> Thanks,
>> -- Daniel Verkamp
>
>> From 9eec0ed61a4e720b2aa4f4edc2f4625ed144aeec Mon Sep 17 00:00:00 2001
>> From: Daniel Verkamp <daniel at drv.nu>
>> Date: Fri, 2 Oct 2009 14:35:04 -0400
>> Subject: [PATCH] RF64 support in WAV demuxer
>
> patch looks ok (assuming its tested and all that of course)
>

Slight braino; new patch attached.
-------------- next part --------------
>From 85162dd31c07be736429c97cb2ab17c0434f931b Mon Sep 17 00:00:00 2001
From: Daniel Verkamp <daniel at drv.nu>
Date: Fri, 2 Oct 2009 14:35:04 -0400
Subject: [PATCH] RF64 support in WAV demuxer

---
 Changelog         |    1 +
 libavformat/wav.c |   31 ++++++++++++++++++++++++-------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/Changelog b/Changelog
index b2a65c6..0d465aa 100644
--- a/Changelog
+++ b/Changelog
@@ -40,6 +40,7 @@ version <next>:
 - Core Audio Format demuxer
 - Atrac1 decoder
 - MD STUDIO audio demuxer
+- RF64 support in WAV demuxer
 
 
 
diff --git a/libavformat/wav.c b/libavformat/wav.c
index f9163b4..ae83b4f 100644
--- a/libavformat/wav.c
+++ b/libavformat/wav.c
@@ -3,6 +3,7 @@
  * Copyright (c) 2001, 2002 Fabrice Bellard
  *
  * Sony Wave64 demuxer
+ * RF64 demuxer
  * Copyright (c) 2009 Daniel Verkamp
  *
  * This file is part of FFmpeg.
@@ -160,17 +161,18 @@ static int wav_probe(AVProbeData *p)
     /* check file header */
     if (p->buf_size <= 32)
         return 0;
-    if (p->buf[ 0] == 'R' && p->buf[ 1] == 'I' &&
-        p->buf[ 2] == 'F' && p->buf[ 3] == 'F' &&
-        p->buf[ 8] == 'W' && p->buf[ 9] == 'A' &&
-        p->buf[10] == 'V' && p->buf[11] == 'E')
+    if (!memcmp(p->buf + 8, "WAVE", 4)) {
+        if (!memcmp(p->buf, "RIFF", 4))
         /*
           Since ACT demuxer has standard WAV header at top of it's own,
           returning score is decreased to avoid probe conflict
           between ACT and WAV.
         */
         return AVPROBE_SCORE_MAX - 1;
-    else
+        else if (!memcmp(p->buf,      "RF64", 4) &&
+                 !memcmp(p->buf + 12, "ds64", 4))
+            return AVPROBE_SCORE_MAX;
+    }
         return 0;
 }
 
@@ -178,7 +180,8 @@ static int wav_probe(AVProbeData *p)
 static int wav_read_header(AVFormatContext *s,
                            AVFormatParameters *ap)
 {
-    int64_t size;
+    int64_t size, av_uninit(data_size);
+    int rf64;
     unsigned int tag;
     ByteIOContext *pb = s->pb;
     AVStream *st;
@@ -187,13 +190,25 @@ static int wav_read_header(AVFormatContext *s,
     /* check RIFF header */
     tag = get_le32(pb);
 
-    if (tag != MKTAG('R', 'I', 'F', 'F'))
+    rf64 = tag == MKTAG('R', 'F', '6', '4');
+    if (!rf64 && tag != MKTAG('R', 'I', 'F', 'F'))
         return -1;
     get_le32(pb); /* file size */
     tag = get_le32(pb);
     if (tag != MKTAG('W', 'A', 'V', 'E'))
         return -1;
 
+    if (rf64) {
+        if (get_le32(pb) != MKTAG('d', 's', '6', '4'))
+            return -1;
+        size = get_le32(pb);
+        if (size < 16)
+            return -1;
+        get_le64(pb); /* RIFF size */
+        data_size = get_le64(pb);
+        url_fskip(pb, size - 16); /* skip rest of ds64 chunk */
+    }
+
     /* parse fmt header */
     size = find_tag(pb, MKTAG('f', 'm', 't', ' '));
     if (size < 0)
@@ -208,6 +223,8 @@ static int wav_read_header(AVFormatContext *s,
     av_set_pts_info(st, 64, 1, st->codec->sample_rate);
 
     size = find_tag(pb, MKTAG('d', 'a', 't', 'a'));
+    if (rf64)
+        size = data_size;
     if (size < 0)
         return -1;
     wav->data_end= url_ftell(pb) + size;
-- 
1.6.4.2