From patchwork Sat Aug 6 08:39:42 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: 37151 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a9:b0:8d:7f3b:94fc with SMTP id q41csp704697pzg; Sat, 6 Aug 2022 03:17:12 -0700 (PDT) X-Google-Smtp-Source: AA6agR6lSLtl71/qxFX26jk4HFGDi9sUOOW/FkGJfEoNcHPAdgfWqQTtr5FWwXwNQ+vK+7iwi0hl X-Received: by 2002:a05:6402:288c:b0:43c:d371:48e4 with SMTP id eg12-20020a056402288c00b0043cd37148e4mr9993142edb.239.1659781031948; Sat, 06 Aug 2022 03:17:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659781031; cv=none; d=google.com; s=arc-20160816; b=fH4vhJX1sHjVPrg7HTTyQVaBmjXDpP4tKCdgtguugfWuTfuLTH35XRsArBWbMsUouJ 02sf2eshzAkCCaylGIWsaYiCsnTkAkr3xNJAr4ZBHxVkSjqChUIupDeqfRcgrcn9V2nx MBu3WOuuU04T+UMEz1hpYt/K5So1RMWbOJy03Fd4gehfQc6ElRwF7vnk5oDRRJAOPFKL 8UudN91IQeqenCKgXDzy1lijmzy2mkMM7PnfOU5MNgfS/6LA1/Z+8+vJWjpHz30FoSxU g3kfAL+qQeUcWOb1or0aR9Dbj4emWBlFACy2XLK89oHVuKEKc9eUw9f/W4FpKw/kGdby zXXA== 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=rSzMk2cIkBhsPzlJIB/x++j+JrwmPlSJmiWtgxihZbU=; b=UDLx33sUWTAIt4RvMA8yRZEvKv61hn4bO5Ymlrk4+aZUbAF+lENy2rcneLy6uYgxvY maGPXdTWuX1of+OPCUyFLyayKjUvBfkByMp2ZaPq+iwzZqd34KlIgw3T9d0A3QYnU0JC k2znZXq78OGW1xiz9fPoNNIdMFdrbfHakjD+PdL3BumfIv4kjkwfPI8ckrXepU2HKfs+ UMezT6wvpOQf7kjtF658GQzBfO5yPccooAUGiPNyd5gSzpqqgqfPJxYDBKa9Q8tSnUVl WSWnKGBilvF3PW4jN4ctcIFFZWF8/jVebXajmUvM0w9NW5gPjLWtEr+NLtdj8ugno3a/ LplA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="U2/qyEM+"; 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 b9-20020a170906150900b006ff094a9c10si4754918ejd.322.2022.08.06.03.17.11; Sat, 06 Aug 2022 03:17:11 -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="U2/qyEM+"; 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 6DFDD68B6B1; Sat, 6 Aug 2022 13:17:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CADFC68B423 for ; Sat, 6 Aug 2022 13:17:01 +0300 (EEST) Received: by mail-lf1-f43.google.com with SMTP id x39so6473653lfu.7 for ; Sat, 06 Aug 2022 03:17:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc; bh=4RuIo23ueCTzZN5hU7HjXIuJov/88IFZJfEycFN+KF8=; b=U2/qyEM+mXnkw/tdNNntiT6U+2HFKY3gHuY1cK6WOvBDeHH2/UCceomfv2uaLJvize U2DzlQpMKf3a7y2E2Yq2ldNWhi1yUrfX3EbMG/8SQhrtcFpZ0aIHJrquPZTrnm73JwdW dzlGcpZ/QG6yunB+nOXctdenHvqj7gh6LWXEkhoHQm6PjIjoPNpuyb75mvUlNne1YpEY rSlUAeFevQdybQ1/qx4PV8gkkT+q/vsCIVfhQGNdSCwMnqjwTmDoiKMGJ2dbXWaFVp5Q /Vyk+HS3AjOvFVN4p7+W63o3Jz/aWRS0nkmBAB/alIv5wGJTB2+L/osGVz4SigoUuHyy U6mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=4RuIo23ueCTzZN5hU7HjXIuJov/88IFZJfEycFN+KF8=; b=GfiBqukdn9H5EJ2wRk6Qh53pS9UOqOWnltBqZ55Aiy2ZkaguY6IQBuVLIDO3g498Y5 A3yHEDd6A4ywWeGj3A2s8Si4AWWgqITV2wSLCsUEk0szgBDM8HoH/H+hfXUjMXiaP/Z8 o8TnH0KFS+INr6ta3xHgMGiSA+gJxC69nXjxTNPE6WZ/hpAf3qN6xwgIBIOnfDlEBMLS PS8fKvLwK9vJC1Br24Do1WMNlE7kSwlYswGc63pwLJuMLJgrEYB1rjoPLO26tIc9KZHY FnjQ5ZFNfodygcHAwsG53CBEmjsgO5yXYPCioav4c2MB7S9+Taghv6UgOyGptBB5CEk+ KWbA== X-Gm-Message-State: ACgBeo2iiqk7wYlhaD1ADq4udnPjacJOcibUDTUjXYoE/cadvlzPkTew DcXw7qxzLupLwVwOfMCciF5BszbYdFVKZQ== X-Received: by 2002:a17:907:7209:b0:72b:924b:60a8 with SMTP id dr9-20020a170907720900b0072b924b60a8mr7995310ejc.442.1659775194650; Sat, 06 Aug 2022 01:39:54 -0700 (PDT) Received: from localhost.localdomain (92-64-99-37.biz.kpn.net. [92.64.99.37]) by smtp.googlemail.com with ESMTPSA id v2-20020a170906292200b007309d640484sm2415676ejd.91.2022.08.06.01.39.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Aug 2022 01:39:53 -0700 (PDT) From: Martijn van Beurden To: ffmpeg-devel@ffmpeg.org Date: Sat, 6 Aug 2022 10:39:42 +0200 Message-Id: <20220806083942.166569-1-mvanb1@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/movenc: Remove experimental status of flac-in-MP4 muxing 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: 8JWtBMbv4VYL The fLaC and dfLa box IDs have been registered with the MP4 RA (they are now listed at https://mp4ra.org/#/codecs) and support for muxing FLAC in MP4 has been experimental in ffmpeg for 6 years now, since Nov 21, 2016 This patch removes the experimental status and removes the MP4 object type, as none has been registered for FLAC as it was not deemed necessary. --- libavformat/isom.c | 1 - libavformat/isom_tags.c | 2 +- libavformat/movenc.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libavformat/isom.c b/libavformat/isom.c index cf27f58082..6d019881e5 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -61,7 +61,6 @@ const AVCodecTag ff_mp4_obj_type[] = { { AV_CODEC_ID_DTS , 0xA9 }, /* mp4ra.org */ { AV_CODEC_ID_OPUS , 0xAD }, /* mp4ra.org */ { AV_CODEC_ID_VP9 , 0xB1 }, /* mp4ra.org */ - { AV_CODEC_ID_FLAC , 0xC1 }, /* nonstandard, update when there is a standard value */ { AV_CODEC_ID_TSCC2 , 0xD0 }, /* nonstandard, camtasia uses it */ { AV_CODEC_ID_EVRC , 0xD1 }, /* nonstandard, pvAuthor uses it */ { AV_CODEC_ID_VORBIS , 0xDD }, /* nonstandard, gpac uses it */ diff --git a/libavformat/isom_tags.c b/libavformat/isom_tags.c index c5fd7987f6..362cb77e8f 100644 --- a/libavformat/isom_tags.c +++ b/libavformat/isom_tags.c @@ -332,7 +332,7 @@ const AVCodecTag ff_codec_movaudio_tags[] = { { AV_CODEC_ID_SPEEX, MKTAG('S', 'P', 'X', 'N') }, /* ZygoAudio (quality 10 mode) */ { AV_CODEC_ID_EVRC, MKTAG('s', 'e', 'v', 'c') }, /* 3GPP2 */ { AV_CODEC_ID_SMV, MKTAG('s', 's', 'm', 'v') }, /* 3GPP2 */ - { AV_CODEC_ID_FLAC, MKTAG('f', 'L', 'a', 'C') }, /* nonstandard */ + { AV_CODEC_ID_FLAC, MKTAG('f', 'L', 'a', 'C') }, { AV_CODEC_ID_TRUEHD, MKTAG('m', 'l', 'p', 'a') }, /* mp4ra.org */ { AV_CODEC_ID_OPUS, MKTAG('O', 'p', 'u', 's') }, /* mp4ra.org */ { AV_CODEC_ID_MPEGH_3D_AUDIO, MKTAG('m', 'h', 'm', '1') }, /* MPEG-H 3D Audio bitstream */ diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 5608afde42..c8b2e141cb 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -7160,7 +7160,7 @@ static int mov_init(AVFormatContext *s) av_log(s, AV_LOG_ERROR, "%s only supported in MP4.\n", avcodec_get_name(track->par->codec_id)); return AVERROR(EINVAL); } - if (track->par->codec_id != AV_CODEC_ID_OPUS && + if (track->par->codec_id == AV_CODEC_ID_TRUEHD && s->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { av_log(s, AV_LOG_ERROR, "%s in MP4 support is experimental, add "