diff mbox

[FFmpeg-devel,2/2] Add experimental demuxing support for FLAC in ISO BMFF (MP4).

Message ID 20161101232320.GE8366@brak.lan
State Accepted
Headers show

Commit Message

Matthew Gregan Nov. 1, 2016, 11:23 p.m. UTC 
At 2016-11-01T18:07:07-0300, James Almer wrote:
> Just include libavcodec/flac.h which already defines it.
> 
> With the above header you'll also be able to use the inline function
> flac_parse_block_header() for this. See flac and matroska demuxers.
> 
> INVALIDDATA errors would ideally also throw an error message.
> 
> Use ff_get_extradata(), which combines these two into a single function.

Thanks for the feedback.  Updated patch attached with these addressed.

Comments

James Almer Nov. 21, 2016, 6:56 p.m. UTC | #1 
On 11/1/2016 8:23 PM, Matthew Gregan wrote:
> At 2016-11-01T18:07:07-0300, James Almer wrote:
>> > Just include libavcodec/flac.h which already defines it.
>> > 
>> > With the above header you'll also be able to use the inline function
>> > flac_parse_block_header() for this. See flac and matroska demuxers.
>> > 
>> > INVALIDDATA errors would ideally also throw an error message.
>> > 
>> > Use ff_get_extradata(), which combines these two into a single function.
> Thanks for the feedback.  Updated patch attached with these addressed.
> 
> 
> 0002-Add-experimental-demuxing-support-for-FLAC-in-ISO-BM.patch
> 
> 
> From 7f08d03c7c73105098e3c398f10e5127b17eb368 Mon Sep 17 00:00:00 2001
> From: Matthew Gregan <kinetik@flim.org>
> Date: Fri, 21 Oct 2016 16:10:43 +1300
> Subject: [PATCH 2/2] Add experimental demuxing support for FLAC in ISO BMFF
>  (MP4).
> 
> Based on the draft spec at https://git.xiph.org/?p=flac.git;a=blob;f=doc/isoflac.txt
> 
> Signed-off-by: Matthew Gregan <kinetik@flim.org>
> ---
>  libavformat/mov.c | 39 +++++++++++++++++++++++++++++++++++++++
>  1 file changed, 39 insertions(+)

Pushed, thanks!
diff mbox

Patch

From 7f08d03c7c73105098e3c398f10e5127b17eb368 Mon Sep 17 00:00:00 2001
From: Matthew Gregan <kinetik@flim.org>
Date: Fri, 21 Oct 2016 16:10:43 +1300
Subject: [PATCH 2/2] Add experimental demuxing support for FLAC in ISO BMFF
 (MP4).

Based on the draft spec at https://git.xiph.org/?p=flac.git;a=blob;f=doc/isoflac.txt

Signed-off-by: Matthew Gregan <kinetik@flim.org>
---
 libavformat/mov.c | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 4222088..6f00f12 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -44,6 +44,7 @@ 
 #include "libavutil/sha.h"
 #include "libavutil/timecode.h"
 #include "libavcodec/ac3tab.h"
+#include "libavcodec/flac.h"
 #include "libavcodec/mpegaudiodecheader.h"
 #include "avformat.h"
 #include "internal.h"
@@ -4684,6 +4685,43 @@  static int mov_read_saiz(MOVContext *c, AVIOContext *pb, MOVAtom atom)
     return 0;
 }
 
+static int mov_read_dfla(MOVContext *c, AVIOContext *pb, MOVAtom atom)
+{
+    AVStream *st;
+    int last, type, size, ret;
+    uint8_t buf[4];
+
+    if (c->fc->nb_streams < 1)
+        return 0;
+    st = c->fc->streams[c->fc->nb_streams-1];
+
+    if ((uint64_t)atom.size > (1<<30) || atom.size < 42)
+        return AVERROR_INVALIDDATA;
+
+    /* Check FlacSpecificBox version. */
+    if (avio_r8(pb) != 0)
+        return AVERROR_INVALIDDATA;
+
+    avio_rb24(pb); /* Flags */
+
+    avio_read(pb, buf, sizeof(buf));
+    flac_parse_block_header(buf, &last, &type, &size);
+
+    if (type != FLAC_METADATA_TYPE_STREAMINFO || size != FLAC_STREAMINFO_SIZE) {
+        av_log(c->fc, AV_LOG_ERROR, "STREAMINFO must be first FLACMetadataBlock\n");
+        return AVERROR_INVALIDDATA;
+    }
+
+    ret = ff_get_extradata(c->fc, st->codecpar, pb, size);
+    if (ret < 0)
+        return ret;
+
+    if (!last)
+        av_log(c->fc, AV_LOG_WARNING, "non-STREAMINFO FLACMetadataBlock(s) ignored\n");
+
+    return 0;
+}
+
 static int cenc_filter(MOVContext *c, MOVStreamContext *sc, uint8_t *input, int size)
 {
     uint32_t encrypted_bytes;
@@ -4858,6 +4896,7 @@  static const MOVParseTableEntry mov_default_parse_table[] = {
 { MKTAG('f','r','m','a'), mov_read_frma },
 { MKTAG('s','e','n','c'), mov_read_senc },
 { MKTAG('s','a','i','z'), mov_read_saiz },
+{ MKTAG('d','f','L','a'), mov_read_dfla },
 { 0, NULL }
 };
 
-- 
2.10.1