From patchwork Sun Nov 26 19:58:31 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: 44819 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca6:b0:181:818d:5e7f with SMTP id fx38csp2880509pzb; Sun, 26 Nov 2023 12:00:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IFASLl+j2A9wlxpy077io/Oifd25xPxJAaVrPQhsbB0bTbifzmqBPbdnHgZfibAcMDA6Pkv X-Received: by 2002:a17:906:20de:b0:a01:811c:ce9 with SMTP id c30-20020a17090620de00b00a01811c0ce9mr7489442ejc.0.1701028845603; Sun, 26 Nov 2023 12:00:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701028845; cv=none; d=google.com; s=arc-20160816; b=RvsK7pwGtw7lCzX48swF0mposUyj/RNw07TUbNp6idAU+5FI+V0DVdYz0OCGBh8k5q jiWr8nzAzUNQFeJqEMPwdejn4iQ+4hczp63Qm+XDF5lEAfPmSt0ndVhgsQgo6jN9vMyV cWDutc1OhEP64nb0hYAx5rJ6HFuuK2tiRxDAwNlFBYSf1iCG6sXI1v9SACa29KnJe/CJ yLM7l4FBqvvvaOai3Jl6K5gn6opkIv3fQMpnFBX0qrKe4ijuUUJOb0Su0LM9d7SgS9ID nOZW3lz/Jqr5LbIyFUe61C/0rqxLP5GOa8Y6laGmXWWO4hyYW+Z/HaZ5SBc7uwFJmAyN 3o4A== 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=vYChFm9xkIyQM1quWXJzjDJaaV3yHWHpua0BvsGmdag=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=dagfsVh1m+9Ds0Sg2z7BsuXyjINJppGlrvwTDQ1+iCKDbl97U4X4kwK3IvxHeYnWDP LRqVwHNCIi3bEQZBw65F6klfSC6lSsGGTqc2cnAh/bD1ZmRst8l8H9OQQ93UxEj/YNtc TNjHkVxY70ZTaBmBEIcigMnU/sqeP8iE6vLtSP4m/+6t6f44gmpJYt0w1VglCYKdthXq a5IHB+x2wTR9BEsqQmac7TNdsS3eMCHr74ApvqUMSPmQGQEbOkWOEm8Jjl7sR0kLBOAB 2zAY89ew5yZhqEIrP9gzgZ5uyNXfrD6V4nDqUEJgze3iRN1a6Qdi/vfJ5xV9a1QK+nA+ ORAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=nZ09mlta; 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 y5-20020a170906470500b009ddf665acd9si4383504ejq.433.2023.11.26.12.00.45; Sun, 26 Nov 2023 12:00:45 -0800 (PST) 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=20230601 header.b=nZ09mlta; 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 716CD68CFAC; Sun, 26 Nov 2023 21:59:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4869968CF7A for ; Sun, 26 Nov 2023 21:58:53 +0200 (EET) Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-50a6ff9881fso5445600e87.1 for ; Sun, 26 Nov 2023 11:58:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701028732; x=1701633532; darn=ffmpeg.org; 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=IGcY6hYBppdVSgVcaqqz1PA893cDP1FvRfZ56oPpRFM=; b=nZ09mltaAKnztecnMbvexmtkRsPxfvHPYjIlKrw0U6JhXFU6bbyEg7SlBrv1t8hkrF YVEhDsNskZdoWrcFwRrB0LRNvpibcggvp44CRW84btU7pyQzfhWGyc1/sGHDjIDUgSm2 3PoriyPMkykRKn4vEp70PZG/Abn6FqKBz2HAG8jVBalKiljYDuBL/xc2VWPu/M6ISAGu jlFP3xlEBjvfxhlSECpekxPD7ECawVXI/4UroeV7iQ+PSMT0dS3hqCadRrR6FuwgsFkI RS+FVlusJ5F3+eH2DhtX8eQ5bX1CEzIbPq3sgcLG2EB1evaD0DF8mds4D40ZZApMcfut ww8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701028732; x=1701633532; 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=IGcY6hYBppdVSgVcaqqz1PA893cDP1FvRfZ56oPpRFM=; b=STMt9cjnubW6nYHFhiMLkIDZkXpoWmjfqadP3QRuxW2//1FsHMaQB1XYqZ9TgShR2v AC3gGzTestXM6r6x+hSMYTbUmArxweucbqbyOdKLqoSXB+i0Bl+vNaPBhc9CS0dLaZqV +lUix/RRS8YOf8QelS2M54mbB6bvqOGG3Wqr9U2i/H4LrynRmI0d67/Yv092Y62aFa/q trPG+1PkdSIJi2RBA5pEO22SnH4wpGOFnYdMoHr2utM0tiWG2XGJuqjviylLnHvPhZrK wvRGzOrgjaplms9YmO1wXwEofqU7/zqkOnIJnxVHGhjJ393h5kcG8vE3R6snqMZIcCno 0y5Q== X-Gm-Message-State: AOJu0YzMWlZFCYAFx6xdG6hjiRcezbzHfFlXKrgCL25s6B0k/zrac1qO cgitBTHznIKH1RGJuWyQUHMYmYrFKpk= X-Received: by 2002:a05:6512:3a8f:b0:50b:ac34:142f with SMTP id q15-20020a0565123a8f00b0050bac34142fmr2961355lfu.41.1701028732198; Sun, 26 Nov 2023 11:58:52 -0800 (PST) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id k16-20020ac24f10000000b00500d1a72734sm1281833lfr.130.2023.11.26.11.58.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Nov 2023 11:58:51 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 26 Nov 2023 21:58:31 +0200 Message-ID: <20231126195838.392467-13-jeebjp@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231126195838.392467-1-jeebjp@gmail.com> References: <20231126195838.392467-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 12/14] 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: mKrfq+rNOFFu 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 | 67 ++++++++++++++++++++++++++++++++++ tests/fate/enc_external.mak | 5 +++ tests/ref/fate/libsvtav1-hdr10 | 14 +++++++ 3 files changed, 86 insertions(+) create mode 100644 tests/ref/fate/libsvtav1-hdr10 diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index 862192945b..ee75570c00 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -27,6 +27,8 @@ #include "libavutil/common.h" #include "libavutil/frame.h" #include "libavutil/imgutils.h" +#include "libavutil/intreadwrite.h" +#include "libavutil/mastering_display_metadata.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavutil/avassert.h" @@ -146,6 +148,69 @@ static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc) } +static void handle_mdcv(struct EbSvtAv1MasteringDisplayInfo *dst, + const AVMasteringDisplayMetadata *mdcv) +{ + if (mdcv->has_primaries) { + const struct EbSvtAv1ChromaPoints *const points[] = { + &dst->r, + &dst->g, + &dst->b, + }; + + for (int i = 0; i < 3; i++) { + const struct EbSvtAv1ChromaPoints *dst = points[i]; + const AVRational *src = mdcv->display_primaries[i]; + + AV_WB16(&dst->x, + av_rescale_q(1, src[0], (AVRational){ 1, (1 << 16) })); + AV_WB16(&dst->y, + av_rescale_q(1, src[1], (AVRational){ 1, (1 << 16) })); + } + + AV_WB16(&dst->white_point.x, + av_rescale_q(1, mdcv->white_point[0], + (AVRational){ 1, (1 << 16) })); + AV_WB16(&dst->white_point.y, + av_rescale_q(1, mdcv->white_point[1], + (AVRational){ 1, (1 << 16) })); + } + + if (mdcv->has_luminance) { + AV_WB32(&dst->max_luma, + av_rescale_q(1, mdcv->max_luminance, + (AVRational){ 1, (1 << 8) })); + AV_WB32(&dst->min_luma, + av_rescale_q(1, mdcv->min_luminance, + (AVRational){ 1, (1 << 14) })); + } +} + +static void handle_side_data(AVCodecContext *avctx, + EbSvtAv1EncConfiguration *param) +{ + const AVFrameSideDataSet set = avctx->frame_sd_set; + const AVFrameSideData *cll_sd = + av_frame_side_data_set_get_entry( + set, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); + const AVFrameSideData *mdcv_sd = + av_frame_side_data_set_get_entry( + set, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA); + + if (cll_sd) { + const AVContentLightMetadata *cll = + (AVContentLightMetadata *)cll_sd->data; + + AV_WB16(¶m->content_light_level.max_cll, cll->MaxCLL); + AV_WB16(¶m->content_light_level.max_fall, cll->MaxFALL); + } + + if (mdcv_sd) { + handle_mdcv(¶m->mastering_display, + (AVMasteringDisplayMetadata *)mdcv_sd->data); + } +} + static int config_enc_params(EbSvtAv1EncConfiguration *param, AVCodecContext *avctx) { @@ -280,6 +345,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