From patchwork Thu Feb 29 16:42:59 2024 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: 46669 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp720539pzb; Thu, 29 Feb 2024 08:45:28 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVloie+60q4R0G9l0MFxwNrIb/N/d9Z3rs97vKprQ+Y9Hh5Ql9+oR1lxSVlVnrV0TQWr8B7Z9tZVrt+hba+JIYALuxj6iYSZDvQ3Q== X-Google-Smtp-Source: AGHT+IG760Xfo6rJQP0oz2VLnTM4r10dQVf2ooR6bDKexXPpC/Kft98FlRsyFUOYIsIEnB3x3mKF X-Received: by 2002:a50:fb0c:0:b0:565:9b18:8af5 with SMTP id d12-20020a50fb0c000000b005659b188af5mr2053005edq.39.1709225128650; Thu, 29 Feb 2024 08:45:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709225128; cv=none; d=google.com; s=arc-20160816; b=X/rLoQrq5DZP/CpLV+/5WsT9/6FqtJu0aDzP+mnAfObSX25LJb0zdMuPkPgVA4KY8D ZH30qHmd1ixhiDnC56m6+7HyM/HEQM19RQ6J5lbV038gAVSr7Ur8yNJcHUI6+s2mATOB RoA0Tf/JDh4e9gN5fGTrPx1KAHlxlYc8wtWxbGruuitMXZaciJKdl+tXMQ8qEVF9eaV8 VBDEASgiaI3N2PK8v3hW8zia1jBZPdxmDxueORtaRUBol9J4t9sOlGrd46zrnh4fT/xM HD1Akc0FYtURCXwXr2xe0WS2+Ur15FmpPGUGMSE0ve297ttYOa+5Rb++KpnzkKDborrf /IaA== 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=SUSo+KNhT8dUjq150DbxWDSXmXsSkyUmNG9kwZxd8Nw=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=JzsESFtBUvcn7BpWfS8Xg8qvY6YAGiy+t3wWActY8ua6jV0s+4F3T/RzfebDFm+WIq UuFOIWQQEorbjY50TncszNHxEHd1k/o8zbSipVY7m3HrBDk+wGtrykWiynEhmaCHyaEh 1jcbZCFmLiXofEiN6xm7uY1YfnNGEJ4D8pHABYk0JeAeGcLpzzlv21yOcR+9IzbyfpLz yGOqlFIyfpJEjQAL8v0Kv1XYTZ2avi8Jvh3d0Tj8B3EHA9BZ3BOPQw3AaiZTernafCu8 KqKnuxDJpBZ+EiwBvOSlFon8xeh9a4XQFONowvMb0ScERAZVrO27GVP2yA3OyCfK0LRN gw1g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=lpcRjImV; 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 y7-20020a056402358700b00566a3aaba8dsi648051edc.45.2024.02.29.08.45.28; Thu, 29 Feb 2024 08:45:28 -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=lpcRjImV; 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 E232F68D221; Thu, 29 Feb 2024 18:43:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1AB4B68D1D5 for ; Thu, 29 Feb 2024 18:43:24 +0200 (EET) Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-5131f3fc695so1228637e87.1 for ; Thu, 29 Feb 2024 08:43:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709225003; x=1709829803; 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=UIcOOM4o0wvtLeN/oe74E7lI2ShbBMkXVWszgZuW+OA=; b=lpcRjImVexNTU5PKmMLkEdD2wayOPVgSgzHdkYc8FCCw9zbdRlRu2rfrT/cKRuoXqq jR9f18gnyLvPn8lzfY6jZDjcsECwKJq7Wd4VGBPGPD0nkH6b9dOOaewf1KEbodcrrEUD siwUtDxXcFKpq+KPVRlhEEjZubhEBSrhhK84f72cNXigWO7ERxf/s+sZtUMdWUtOquC2 P3IXBFTCAewNOYeIBvsW1QucRV1Ja8n9V5+va8cMX+7GgLDKU/Xf9jevwaVYOoW1XIT6 Wq68gPkk7+viywG7Cbb8BBgOpHkg9+tPz8IlBNdgCirsim96EWU5lmZVcxvtejP0Is0y fu7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709225003; x=1709829803; 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=UIcOOM4o0wvtLeN/oe74E7lI2ShbBMkXVWszgZuW+OA=; b=Fd8hrlUIaTqy6nc1gmz1c/7vjSzVzz2vurm+Xfq4w3AIiCdSzwC7c2FIkSizo0n5rc 2Ju71TUBm7trsbsm1QTQ98NNIoSOyp3oJ2I49q8ZemOVsBqWbpkXH6dzH7zZLJk9Ag6h C/OkXS9+gFIM67xkzU7mXkwHHOZi9Hb0mixE1vRDJ/2jqWRlGkxWQmmIZ3XOg4h5TpWU cUEqdaqV67lsnAmVxhFoXmPNZlTdRff6LtCtI4iqTkHM0wQGcNtKijM6b+7GzA9Z8B4A fQMn2yqXGDluE/wX0jcfhQ4oFwfo99TK7O8J0eiXYISwpuC+wzMwZEIuPN31iyU5Br5b 6jeA== X-Gm-Message-State: AOJu0YzsNmnPLkaTWwMLx2DPP64fnZT0HU+NHqbYcOvDVYyPxdt9iyMF 32WDqYb53qEzBszSC9p+m+A3ZdL7JH68Bz9NUL82t+GjLJABBN9nwf8lDiwP X-Received: by 2002:a05:6512:1255:b0:513:2c6c:4cc8 with SMTP id fb21-20020a056512125500b005132c6c4cc8mr529543lfb.63.1709225003326; Thu, 29 Feb 2024 08:43:23 -0800 (PST) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id k6-20020ac24566000000b00513290734cbsm206248lfm.292.2024.02.29.08.43.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Feb 2024 08:43:23 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Feb 2024 18:42:59 +0200 Message-ID: <20240229164307.3535613-13-jeebjp@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240229164307.3535613-1-jeebjp@gmail.com> References: <20240229164307.3535613-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 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: QGeYTV5Dzag+ 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 | 68 ++++++++++++++++++++++++++++++++++ tests/fate/enc_external.mak | 5 +++ tests/ref/fate/libsvtav1-hdr10 | 14 +++++++ 3 files changed, 87 insertions(+) create mode 100644 tests/ref/fate/libsvtav1-hdr10 diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index 1eda63200c..072496a945 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,70 @@ 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 AVFrameSideData *cll_sd = + av_frame_side_data_get( + (const AVFrameSideData **)avctx->frame_side_data, + avctx->nb_frame_side_data, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); + const AVFrameSideData *mdcv_sd = + av_frame_side_data_get( + (const AVFrameSideData **)avctx->frame_side_data, + avctx->nb_frame_side_data, 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 +346,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