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 F256440AEE for ; Tue, 5 Jul 2022 11:42:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 859F868B93B; Tue, 5 Jul 2022 14:42:25 +0300 (EEST) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5268168B7E8 for ; Tue, 5 Jul 2022 14:42:19 +0300 (EEST) Received: by mail-wm1-f47.google.com with SMTP id n185so6854063wmn.4 for ; Tue, 05 Jul 2022 04:42:19 -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; bh=LRXuAQAnKmLMSTCB9ErPkd92rF+EsPpyIdhyQFwHP5E=; b=NBVuTRj9Ml5vrMbV5LxSuOy7hAFC+u89mTuQBMos7fEp9tCFZ7sdyLLM8l9L9kpMHA VpN0hMO/4GkZUp57pcfXG9NDPxmKxLHrQ1M0OxqXa4aledKAusH3LPCIz+Ujzvy/u45h SLOizS3NkKeHRlRa3BcRLHIiCImk18TEB3cZGxCLAxcsyQXDaPG1fnX5hERfqivlbsAF x/YeNnXE7UzHCoUdJn2yZiRC9Aw8UmiAXkbilZHASlqysT3JtlcJj5NWTOsCvrK9Mio5 DNk5FCf9659ao+lZrdNYICC3dXkZMd9kk5hwn/VetcHaFgxNrL9Qfrey4WyFYtQgTqIA tPJw== 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; bh=LRXuAQAnKmLMSTCB9ErPkd92rF+EsPpyIdhyQFwHP5E=; b=dr9t0YW9cGXsfZFxCl/pEXAcG7p8+IcJrVKBl0t4S7/OfVAc3IF6q6JukDOpdxsGBm e07bVaBfCP4yESxWNbdKrbH+j3WSXxT70fWnpd3QnMSK6q8xI4H50YpgdSPV5adRbxCU fjPAEXVOK1zt+wKRNNKri1Pc2G+y1rO83YKWsIR0Gm6m/CyFUQAOCa3Ukjr+1OOIlf+S 6qca+XWZof1QAiGus9oXGssFN+QE4kBaimamsutu4lHKf1x84i31csBZwQvBsihQSOHY 19lM3h5RVz8aUzLiTHL4ZdtSpftwnpxDj23MGUkCXJfVsYgUriJvfknzbd27rCX3ZX1J EpWQ== X-Gm-Message-State: AJIora9vE9P8lYr8Mw12BufR+5g8RKH7ZNfistKOedeldqqwIdycu9eY f3paNvI+1sA0XhZ1jjLT++7YCuJiduFIol+bqILKoMprYsA= X-Google-Smtp-Source: AGRyM1uZaAWyWAVp8fR93ENrYNmbrN/qWIQ21XUE2jXsNfPq+HB6P83GnuGqeNiirr/FbHSnCRVmYtsRBjXrEHtksiQ= X-Received: by 2002:a05:600c:210a:b0:3a0:3be1:718f with SMTP id u10-20020a05600c210a00b003a03be1718fmr38325888wml.181.1657021338383; Tue, 05 Jul 2022 04:42:18 -0700 (PDT) MIME-Version: 1.0 References: <165459275900.13099.10229209400339279555@lain> <20220611073112.1930778-1-mvanb1@gmail.com> In-Reply-To: <20220611073112.1930778-1-mvanb1@gmail.com> From: Martijn van Beurden Date: Tue, 5 Jul 2022 13:42:07 +0200 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [FFmpeg-devel] [PATCH v3 1/2] 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 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: Op za 11 jun. 2022 om 09:31 schreef Martijn van Beurden : > 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 | 44 ++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 45 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..ced61643f8 100644 > --- a/libavformat/cafdec.c > +++ b/libavformat/cafdec.c > @@ -32,6 +32,7 @@ > #include "internal.h" > #include "isom.h" > #include "mov_chan.h" > +#include "libavcodec/flac.h" > #include "libavutil/intreadwrite.h" > #include "libavutil/intfloat.h" > #include "libavutil/dict.h" > @@ -170,6 +171,49 @@ 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 (pb->error < 0 ? pb->error : 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 */ > + if (avio_read(pb, buf, sizeof(buf)) != sizeof(buf)) { > + av_log(s, AV_LOG_ERROR, "failed to read FLAC metadata block > header\n"); > + return (pb->error < 0 ? pb->error : AVERROR_INVALIDDATA); > + } > + 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 > > I would like to bring this patch to the attention of the mailing list again. It still applies against current git. _______________________________________________ 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".