From patchwork Thu Aug 17 21:48:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 43251 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4c9d:b0:130:ccc6:6c4b with SMTP id fq29csp2265751pzb; Thu, 17 Aug 2023 14:50:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGmYM+ES4+W+DYf+zdi2tjN+rBNxtsEZ+Yit6lp3Ov09oEaOLkoTNDxu169oPGpyDxGxw74 X-Received: by 2002:a17:906:27c8:b0:99d:fe2f:d104 with SMTP id k8-20020a17090627c800b0099dfe2fd104mr499068ejc.32.1692309039003; Thu, 17 Aug 2023 14:50:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692309038; cv=none; d=google.com; s=arc-20160816; b=LvCSXADDHSlEKO0OQfKCqpK8PWKDoK0o2rr+EM19yhheynfl4Mg7aW10/JLZiZykpW njjKXoU07ssmUOybanAKtrQhPh44J6ZEw6OsDPZGD2uQAbZLRjQH4x1M2agebcAil946 i1eLCgU/Oj80xR+tc5QaXyoOGoQ6ZGW3lWZ7mkBiYupFnK6ZrdPKevliO7sWazcZoDgS DMJkrP5IzdRPVzyIQfKGbyO6lvh/0K5JK33imoh19DQ5cvWTeW5aaFsv+yVVn4lejegk m/ZbbcUncEbYBfh+UcKrbI/exbpPm0fxizOwZHfcJBX2aio3hAF2BR0Tohn8qUM0XX4q t9Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=vQvi+NMZeWlBLk3b8vT4hl7sS1z0403y7bWOTszIvyw=; fh=DpbP4OnC98Ct+zBdrpJgv1NgOvKTVLIsArQu/ER33Zc=; b=Qq4DEK/+vkkWmEJZaTNdy92zpJSYc8o3wGoQGH3BwsD09hVDTN+Z+hQb+h7TyN/OHx f5kh7r5CSm8fNoLlZjuliYLqVKkpNoaCy9fuxYZsKC56ngo2JhIWPUE2j6NzMxUXnP6p nUt4MtQp7p9ASyCSJ0ZdvC1T3oRgOCRBZr/vW04oAIXjR/sXlsaDxTAeVqre3SY9VeaC 1ZkvIpGRVrjbg7CiahU0KX0fJy0V6OhH4Q1Dh5K49RWSJ5cjQPC1JsvupLZas4E88vK4 vdbeqe91taeDTsmx3j03zP+wu5uLcFlDaZ6wsgzBZ8LgrvVP0GXyVgtdEdG5eHVx8UTk zM0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=qt3JFa2+; 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 v5-20020a1709061dc500b00991df86ac0fsi286526ejh.290.2023.08.17.14.50.38; Thu, 17 Aug 2023 14:50:38 -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=20221208 header.b=qt3JFa2+; 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 EBC6168C7AF; Fri, 18 Aug 2023 00:49:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 48F3868C759 for ; Fri, 18 Aug 2023 00:49:04 +0300 (EEST) Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-4ffa248263cso293292e87.2 for ; Thu, 17 Aug 2023 14:49:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692308943; x=1692913743; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=zXQ1iDJF6B+YrFaDtNEpyyw3wuUo7Sf+gygwKbvdK7o=; b=qt3JFa2+UzKwz+tJxt34SLuRW5Pmx3nBpsMXqAZkEf+q9u2SsZaSWFDi40icpeEsvK mAhmPbm40aYDj7Hfayzwsh76B5V4R9OmA8hgtR2UiKp7wKiGO6vJYGC2wjDXcvrzbdsv Ma1D51xWAUfEqM6i1U+MpAp55uUJbnVvPgtumpkBkjVpX8zfswZ2RW20kBBswfRDJduF Mnl9s4LHb2rkEajQGpUomfrLvu2kl4q2lr3sy84bm7jVCBPpmJM9CL7+EHCs9RuxOKbt pKs9aEGe/kYF7DorkzyMx6RHgaIANyZFYia/1WyKTJFJ0EGyYIo51q7E/oJyO0ZLX6RM lXcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692308943; x=1692913743; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zXQ1iDJF6B+YrFaDtNEpyyw3wuUo7Sf+gygwKbvdK7o=; b=ZUgkdanBpMdtGShQnnbgGYmh3dJm6X6taVLLe88Znamo7sy/INahIfjt9/3KPhfOFC +DneVZ6la7F1M/aWCbwvV95uOGbK/j4jdQP6PeP7xNyifX7wHgzGW8qfX4UHDFtLiadM oIgEKrgzoPwbezVBw5nvPlUXwVOPv8+xj9S9EfWGZAmnE1dEL9nH4VUxjpQtxtRf2EaA +OPfyDAWhMovH7Zc2Vx1mQsAUJ6PYxCA/XvuJOsF4GjlFCnI6mWdNavpudtVF+rI0m7y UIuRmhaf0XyDxWVB6OBHr7IkXiGneGby0nKyuHxJjqIzSL9AORsYyMpT7UAFCAs6AXoq 2V/g== X-Gm-Message-State: AOJu0Yz3Pvh/DRZxy7/feZtn+kMvEUU+Dhy7drN0MrFT8FqcIAexgJKr /68d8H6+eO1eWA3Ola5+uyGEnxXiNAE= X-Received: by 2002:ac2:5e6c:0:b0:4ff:70d2:4512 with SMTP id a12-20020ac25e6c000000b004ff70d24512mr307785lfr.23.1692308943423; Thu, 17 Aug 2023 14:49:03 -0700 (PDT) Received: from hifumi.mshome.net (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id w2-20020ac25982000000b004fe20d1b288sm62813lfn.159.2023.08.17.14.49.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 14:49:03 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Aug 2023 00:48:48 +0300 Message-ID: <20230817214858.184010-11-jeebjp@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230817214858.184010-1-jeebjp@gmail.com> References: <20230817214858.184010-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 10/12] avcodec/libsvtav1: add support for writing out CLL and MDCV 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: L6mRLWn+qR/3 These two were added in 28e23d7f348c78d49a726c7469f9d4e38edec341 and 3558c1f2e97455e0b89edef31b9a72ab7fa30550 for version 0.9.0 of SVT-AV1, which is also our minimum requirement right now. In other words, no additional version limiting conditions seem to be required. Additionally, add a FATE test which verifies that pass-through of the MDCV/CLL side data is working during encoding. --- libavcodec/libsvtav1.c | 70 ++++++++++++++++++++++++++++++++++ tests/fate/enc_external.mak | 5 +++ tests/ref/fate/libsvtav1-hdr10 | 14 +++++++ 3 files changed, 89 insertions(+) create mode 100644 tests/ref/fate/libsvtav1-hdr10 diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index f2b73361d8..d4f9fa14ba 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -24,9 +24,11 @@ #include #include +#include "libavutil/bswap.h" #include "libavutil/common.h" #include "libavutil/frame.h" #include "libavutil/imgutils.h" +#include "libavutil/mastering_display_metadata.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavutil/avassert.h" @@ -146,6 +148,72 @@ static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc) } +static void handle_mdcv(struct EbSvtAv1MasteringDisplayInfo *dst, + const AVMasteringDisplayMetadata *mdcv) +{ + struct EbSvtAv1ChromaPoints *points[] = { + &dst->r, + &dst->g, + &dst->b, + }; + + if (!mdcv->has_primaries) + goto skip_primaries; + + for (int i = 0; i < 3; i++) { + struct EbSvtAv1ChromaPoints *dst = points[i]; + const AVRational *src = mdcv->display_primaries[i]; + + dst->x = + AV_BSWAP16C(av_rescale_q(1, src[0], + (AVRational){ 1, (1 << 16) })); + dst->y = + AV_BSWAP16C(av_rescale_q(1, src[1], + (AVRational){ 1, (1 << 16) })); + } + + dst->white_point.x = + AV_BSWAP16C(av_rescale_q(1, mdcv->white_point[0], + (AVRational){ 1, (1 << 16) })); + dst->white_point.y = + AV_BSWAP16C(av_rescale_q(1, mdcv->white_point[1], + (AVRational){ 1, (1 << 16) })); + +skip_primaries: + if (!mdcv->has_luminance) + return; + + dst->max_luma = + AV_BSWAP32C(av_rescale_q(1, mdcv->max_luminance, + (AVRational){ 1, (1 << 8) })); + dst->min_luma = + AV_BSWAP32C(av_rescale_q(1, mdcv->min_luminance, + (AVRational){ 1, (1 << 14) })); +} + +static void handle_side_data(AVCodecContext *avctx, + EbSvtAv1EncConfiguration *param) +{ + const AVFrameSideDataSet set = avctx->side_data_set; + const AVFrameSideData *cll_sd = + av_side_data_set_get_item(set, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); + const AVFrameSideData *mdcv_sd = + av_side_data_set_get_item(set, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA); + + if (cll_sd) { + const AVContentLightMetadata *cll = + (AVContentLightMetadata *)cll_sd->data; + + param->content_light_level.max_cll = AV_BSWAP16C(cll->MaxCLL); + param->content_light_level.max_fall = AV_BSWAP16C(cll->MaxFALL); + } + + if (mdcv_sd) { + handle_mdcv(¶m->mastering_display, + (AVMasteringDisplayMetadata *)mdcv_sd->data); + } +} + static int config_enc_params(EbSvtAv1EncConfiguration *param, AVCodecContext *avctx) { @@ -273,6 +341,8 @@ FF_ENABLE_DEPRECATION_WARNINGS /* 2 = IDR, closed GOP, 1 = CRA, open GOP */ param->intra_refresh_type = avctx->flags & AV_CODEC_FLAG_CLOSED_GOP ? 2 : 1; + handle_side_data(avctx, param); + #if SVT_AV1_CHECK_VERSION(0, 9, 1) while ((en = av_dict_get(svt_enc->svtav1_opts, "", en, AV_DICT_IGNORE_SUFFIX))) { EbErrorType ret = svt_av1_enc_parse_parameter(param, en->key, en->value); diff --git a/tests/fate/enc_external.mak b/tests/fate/enc_external.mak index 7eabebcc51..d787941c16 100644 --- a/tests/fate/enc_external.mak +++ b/tests/fate/enc_external.mak @@ -2,5 +2,10 @@ FATE_ENC_EXTERNAL-$(call ENCDEC, LIBX264 H264, MOV, H264_DEMUXER) += fate-libx26 fate-libx264-simple: CMD = enc_external $(TARGET_SAMPLES)/h264-conformance/BA1_Sony_D.jsv \ mp4 "-c:v libx264" "-show_entries frame=width,height,pix_fmt,pts,pkt_dts -of flat" +# test for SVT-AV1 MDCV and CLL passthrough during encoding +FATE_ENC_EXTERNAL-$(call ENCDEC, LIBSVTAV1 HEVC, MOV, HEVC_DEMUXER LIBDAV1D_DECODER) += fate-libsvtav1-hdr10 +fate-libsvtav1-hdr10: CMD = enc_external $(TARGET_SAMPLES)/hevc/hdr10_plus_h265_sample.hevc \ + mp4 "-c:v libsvtav1" "-show_frames -show_entries frame=side_data_list -of flat" + FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_ENC_EXTERNAL-yes) fate-enc-external: $(FATE_ENC_EXTERNAL-yes) diff --git a/tests/ref/fate/libsvtav1-hdr10 b/tests/ref/fate/libsvtav1-hdr10 new file mode 100644 index 0000000000..6f0d34903b --- /dev/null +++ b/tests/ref/fate/libsvtav1-hdr10 @@ -0,0 +1,14 @@ +frames.frame.0.side_data_list.side_data.0.side_data_type="Mastering display metadata" +frames.frame.0.side_data_list.side_data.0.red_x="17367/65536" +frames.frame.0.side_data_list.side_data.0.red_y="45220/65536" +frames.frame.0.side_data_list.side_data.0.green_x="9830/65536" +frames.frame.0.side_data_list.side_data.0.green_y="3932/65536" +frames.frame.0.side_data_list.side_data.0.blue_x="44564/65536" +frames.frame.0.side_data_list.side_data.0.blue_y="20972/65536" +frames.frame.0.side_data_list.side_data.0.white_point_x="20493/65536" +frames.frame.0.side_data_list.side_data.0.white_point_y="21561/65536" +frames.frame.0.side_data_list.side_data.0.min_luminance="82/16384" +frames.frame.0.side_data_list.side_data.0.max_luminance="256000/256" +frames.frame.0.side_data_list.side_data.1.side_data_type="Content light level metadata" +frames.frame.0.side_data_list.side_data.1.max_content=1000 +frames.frame.0.side_data_list.side_data.1.max_average=200