From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id ED47F409C4 for ; Fri, 3 Jun 2022 13:15:51 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 19B4E68B878; Fri, 3 Jun 2022 16:15:49 +0300 (EEST) Received: from mail-yb1-f178.google.com (mail-yb1-f178.google.com [209.85.219.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6D60768B7A2 for ; Fri, 3 Jun 2022 16:15:42 +0300 (EEST) Received: by mail-yb1-f178.google.com with SMTP id l204so13629962ybf.10 for ; Fri, 03 Jun 2022 06:15:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=yOPwr/QBQTf0K2Zgh+JYnJgfYiZVpIjzDM9sD4rqra0=; b=Gr3/6dumd763nG4XhF/JRqSot9jVazesuBT8Pz2QajAb/eehIsecE1ZdGR6NQnuTC1 Q3PEcQmi0Bu6AIIVKa9ofTH8JGaf1rXeXkNC/hXvsciM3PSOgUzs0brl+KqvzCPocYks kznjjUSF7q5Rr16DJ5JTYYmN4YMH8CbzxuKIL9gxB7sX+Yj+7hbQefjxLikuEnGjYFZ1 t46YklcUsy4MTF+CIU9YKe0aUl4OEs0dWxs9em8chwMfaK5lg25V/3mo2tMEUzj+bsb6 G/o4WUV4VsRqgewFIqH83AOFC9+89FOoBWmPFJxULDwj6ltogFhsC5h3nqdD1ckvugio 7iMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=yOPwr/QBQTf0K2Zgh+JYnJgfYiZVpIjzDM9sD4rqra0=; b=U29rpDWeJpQ+6RCPrN1l2N4i64Xz34YOJ0RyBcDA+MVKbL2WJSlWHkms5J0HCWrkJ8 GhrFnNsP2qysZhpbKpG+hK3v3AOs6Isr/zzUJqDqTIgn1ljAbapWNXQrHIByYWMW+9h8 Ok16p/dlEzlOs21Z/AZgDlYeNrDKn5o+C7PEJiYGpeX3oT7cH+3KxfbR26NxiCtwG5/r qMrI+3jLFKbew1G0rQJQcBoRe/WYPyzhAL5aLzYN0pUofRD4/e2+QLke7ZzyTJsISnTz 91ujydfxJmmgTBz7pl8dR4pj7s4askfYpZ71usUW0+QwJoTZK5l45U3eRduCogT8nTcV 6MGA== X-Gm-Message-State: AOAM531LKoHr8dq8NwThCkn87IC0eeh6IYgN7VNYIBQKLfCV5k1ZANlQ hEgqtIvJndgLYQ9msYMX4SatBDMhocsVU1zTAFRcqO3rEgM= X-Google-Smtp-Source: ABdhPJzYV8a/FFMyk2OsptRjyVL7FXQy14bZU9FwXBeXVYYwVYjiphSglypsCJFkZZzTXAzq7RVv3WGGvFyAr6guFRY= X-Received: by 2002:a25:3084:0:b0:64b:a7da:30fc with SMTP id w126-20020a253084000000b0064ba7da30fcmr10655480ybw.49.1654262140888; Fri, 03 Jun 2022 06:15:40 -0700 (PDT) MIME-Version: 1.0 References: <20220603131156.1772629-1-mvanb1@gmail.com> In-Reply-To: <20220603131156.1772629-1-mvanb1@gmail.com> From: Paul B Mahol Date: Fri, 3 Jun 2022 15:18:36 +0200 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [FFmpeg-devel] [PATCH] avformat/cafdec: Implement FLAC-in-CAF parsing X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Martijn van Beurden Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Fri, Jun 3, 2022 at 3:12 PM Martijn van Beurden wrote: > The afconvert utility shipped with MacOS supports muxing of FLAC > in CAF, see afconvert help output on a recent Mac here: > https://hydrogenaud.io/index.php?topic=122509.0 A file created > with afconvert free of copyright (licensed CC0) can be found here: > http://www.audiograaf.nl/misc_stuff/afconvert-FLAC-in-CAF.caf > > This patch implements parsing of such a file > --- > libavformat/caf.c | 1 + > libavformat/cafdec.c | 41 +++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 42 insertions(+) > > diff --git a/libavformat/caf.c b/libavformat/caf.c > index a700e4055b..a61c39fae5 100644 > --- a/libavformat/caf.c > +++ b/libavformat/caf.c > @@ -46,6 +46,7 @@ const AVCodecTag ff_codec_caf_tags[] = { > { AV_CODEC_ID_GSM, MKTAG('a','g','s','m') }, > { AV_CODEC_ID_GSM_MS, MKTAG('m','s', 0, '1') }, > { AV_CODEC_ID_ILBC, MKTAG('i','l','b','c') }, > + { AV_CODEC_ID_FLAC, MKTAG('f','l','a','c') }, > { AV_CODEC_ID_MACE3, MKTAG('M','A','C','3') }, > { AV_CODEC_ID_MACE6, MKTAG('M','A','C','6') }, > { AV_CODEC_ID_MP1, MKTAG('.','m','p','1') }, > diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c > index 168f69f20b..72a74ab297 100644 > --- a/libavformat/cafdec.c > +++ b/libavformat/cafdec.c > @@ -31,6 +31,7 @@ > #include "demux.h" > #include "internal.h" > #include "isom.h" > +#include "libavcodec/flac.h" > #include "mov_chan.h" > #include "libavutil/intreadwrite.h" > #include "libavutil/intfloat.h" > @@ -170,6 +171,46 @@ static int read_kuki_chunk(AVFormatContext *s, > int64_t size) > } > avio_skip(pb, size - ALAC_NEW_KUKI); > } > + } else if (st->codecpar->codec_id == AV_CODEC_ID_FLAC) { > + int last, type, flac_metadata_size; > + uint8_t buf[4]; > + /* The magic cookie format for FLAC consists mostly of an mp4 > dfLa atom. */ > + if (size < (16 + FLAC_STREAMINFO_SIZE)) { > + av_log(s, AV_LOG_ERROR, "invalid FLAC magic cookie\n"); > + return AVERROR_INVALIDDATA; > + } > + /* Check cookie version. */ > + if (avio_r8(pb) != 0) { > + av_log(s, AV_LOG_ERROR, "unknown FLAC magic cookie\n"); > + return AVERROR_INVALIDDATA; > + } > + avio_rb24(pb); /* Flags */ > + /* read dfLa fourcc */ > + if (avio_read(pb, buf, 4) != 4) { > + av_log(s, AV_LOG_ERROR, "failed to read FLAC magic cookie\n"); > + return AVERROR_INVALIDDATA; > + } > + if (memcmp(buf,"dfLa",4)) { > + av_log(s, AV_LOG_ERROR, "invalid FLAC magic cookie\n"); > + return AVERROR_INVALIDDATA; > + } > + /* Check dfLa version. */ > + if (avio_r8(pb) != 0) { > + av_log(s, AV_LOG_ERROR, "unknown dfLa version\n"); > + return AVERROR_INVALIDDATA; > + } > + avio_rb24(pb); /* Flags */ > + avio_read(pb, buf, sizeof(buf)); > + flac_parse_block_header(buf, &last, &type, &flac_metadata_size); > + if (type != FLAC_METADATA_TYPE_STREAMINFO || flac_metadata_size > != FLAC_STREAMINFO_SIZE) { > + av_log(s, AV_LOG_ERROR, "STREAMINFO must be first > FLACMetadataBlock\n"); > + return AVERROR_INVALIDDATA; > + } > + ret = ff_get_extradata(s, st->codecpar, pb, FLAC_STREAMINFO_SIZE); > + if (ret < 0) > + return ret; > + if (!last) > + av_log(s, AV_LOG_WARNING, "non-STREAMINFO > FLACMetadataBlock(s) ignored\n"); > } else if (st->codecpar->codec_id == AV_CODEC_ID_OPUS) { > // The data layout for Opus is currently unknown, so we do not > export > // extradata at all. Multichannel streams are not supported. > -- > 2.30.2 > > LGTM > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".