From patchwork Fri Jun 3 13:11:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martijn van Beurden X-Patchwork-Id: 36067 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp4617785pzj; Fri, 3 Jun 2022 06:12:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyRM7eFblVoqE11X/7w0suR8yt/5sghjEbiggT5SsYiV2DYlMSR0MRTwVyl1arXd7UGdNDn X-Received: by 2002:aa7:cc01:0:b0:42a:402b:b983 with SMTP id q1-20020aa7cc01000000b0042a402bb983mr10842041edt.257.1654261939827; Fri, 03 Jun 2022 06:12:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654261939; cv=none; d=google.com; s=arc-20160816; b=q8XLjioCvAg/3tidtkA1h341fKCjRqh6nKNe9CAOdOTH/qUMvvFVYH6bCHP4dgFOme ESiNEXcQiBJHP7tfglRicnbmZsRFcGHYvW0qHOmKG9bO/OvlT3gWi81SaB1Ciiu59Bi0 Mid5QcNwc7oCsI1AMQLZSkRXitkt83/0mws0Fez0JzXsjwbOt2FEMxxG8h0xDGaVbr8a WLxqF6MFqFfS5G5MKLa42gfQwx5sVIA4uonR+OL+LKRxwpgyyDwhWcvWgX8IkPtCf/47 1miIaVC88ki38NfbcnJ6Dq+lntjRgQT+cQJ7ItZOksecg0F2XUX/P3dslAqZAxXZwuhY RDtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=ilEodTGuMA2GKoJknOXtrJfOxsUmg3vZC2ilAtbR3Ko=; b=0xuTZPbZp/pFnME+rtXS0lmnMwItGPchFrE+gv1sz5CyIfIj5TjaQVe7ov5XnB7dZE 2JBshbx8cLTfI4o2MgVM39vUgrZU3qQ+u+F6I9h7bUoA0WW5nP3JJguQlGYq+dTxoxJF sFB+zA9Zegf8qJgj115hUmt1JynHpT4fijXHSSejc/FWNqgqRUL67LJYxQ/Y2lsd44vm 4WkTd1/uKmHi6K7VHp0rlanDERScKEv5+klv9P8iZloE4hu5Osyhab0NHHfOFH3Icp4/ Uk27xm+pHm24jTShSNOi8oRpxQrpRCdgk84e/HuvgRXNlJtGSEDHaaUITQ2M2fr4v8Dj LTTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=pCTnx+1y; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qf40-20020a1709077f2800b0070777336121si8836282ejc.446.2022.06.03.06.12.18; Fri, 03 Jun 2022 06:12:19 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=pCTnx+1y; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1D92D68B6EC; Fri, 3 Jun 2022 16:12:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AE8F668B6EC for ; Fri, 3 Jun 2022 16:12:09 +0300 (EEST) Received: by mail-ej1-f51.google.com with SMTP id s12so8631406ejx.3 for ; Fri, 03 Jun 2022 06:12:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JhFxAUKARIM9D97M1Ea28+gKgduxaNjinyOaM2mjsuM=; b=pCTnx+1yDu7uyt/sN1RrAkfYIK/nZ4hSKTuPJ4vERBIUMZQdlXy8jDTStVUKahycZd 3tsjuPFRTDvNOn1JVpymjyRgKtFtCyYivZzIolfT+n8InX3Dy41qhv8Meqy8o/6c+Vw1 aYI+wk3V5l/eKWUfFfBXgLefBuQ549Djp64cQ84ORndzWPvTAyMkVQ2dM/bzHCaWkeEU lnRTkGcph7OGLd9kbuWOsP3Kd14h38NBKhUnW2W2pkPIJeKrlcqYuUtqdP1sPrhgQKq2 lUPvcvPFvu51gimi8sGmlLJnUyDud4JAD11SbLE2ve+RGJ141nRR+sZ5JvXIK7HkJGxu sNOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JhFxAUKARIM9D97M1Ea28+gKgduxaNjinyOaM2mjsuM=; b=CS5GjoPw9kuJ9ErEMc2V+wnvQ3czFor1ts7OOX9QFceZ1GC89rpZ14u6EXbnHFcnWH uEe8ymxT90j9UVXdgOeyuDVeT08Ex/+WMEetJ3V8pVUhbCKfwzdp/8EdV4iUgz8Q+5TG xfFYvFAIbg4qf+TbbTxYccDT0meD6crDQrNmrOqItGSipll+Khmz4yEaQ1hv7pfeJbyW OrVhHMwlGoD59O5/8xE0l0ODHTa+2TrKJBl2S+gRn2LPajgEp/iHzCmy+adnEldvqjSv Iel6NUCp8WiLIaxCcVIjOI100j5vsKCxuA9VkCgruPpZa3Qc7z+q1z3TpK0RCzV0u1mn OmkQ== X-Gm-Message-State: AOAM530BlbBIEJiJw1SohxL/cDDTcxYkApAUCqo4PiSvvsWRe4+twABP aYPdXNUVkZJAZUqzi4zbGn9fmovGcqgvwA== X-Received: by 2002:a17:907:7b9f:b0:6ff:f87:f534 with SMTP id ne31-20020a1709077b9f00b006ff0f87f534mr8374204ejc.114.1654261928757; Fri, 03 Jun 2022 06:12:08 -0700 (PDT) Received: from localhost.localdomain (92-64-99-37.biz.kpn.net. [92.64.99.37]) by smtp.googlemail.com with ESMTPSA id g3-20020aa7dd83000000b0042bc5a536edsm3880102edv.28.2022.06.03.06.12.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 06:12:08 -0700 (PDT) From: Martijn van Beurden To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Jun 2022 15:11:56 +0200 Message-Id: <20220603131156.1772629-1-mvanb1@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: L+tDITSKloaP 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.