From patchwork Mon Mar 18 21:31:35 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: 47206 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:958e:b0:1a3:31a3:7958 with SMTP id iu14csp1290108pzb; Mon, 18 Mar 2024 14:33:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVKgFH/pRKYeMbx3b4JDdZkWBdos+5L1DgGolSxzXbKyS0fmB+rjISQCW/Sf3bg332N38LZ7xS/BH6hKAQn5CXbfWYXhFk53XZ3kw== X-Google-Smtp-Source: AGHT+IF61wxeblh2HnwtrzMi7BN1wdX98nT8DQz5C8h4XZ3msVfDCrnuf7EI1ekZfn1l5jnFRk0N X-Received: by 2002:a2e:3a1a:0:b0:2d5:9703:2645 with SMTP id h26-20020a2e3a1a000000b002d597032645mr1579156lja.2.1710797626822; Mon, 18 Mar 2024 14:33:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710797626; cv=none; d=google.com; s=arc-20160816; b=NU5A4lCWEBqED2Onyv5r8n1T8bPk1sB9LGxbAL/9NQv5lXxATp7uo8SPphJJrYAiFa XQZ08slAQWwtCq8Sm48E8zPcGMjDc/B9dw26X0gWdPIZe61p2Q/3229ZcUxSJgs1W9Vz IjU4+goFsjHkQSS50O61LxjuI7s6PNlX48F4/BqdMcn0hkaidlOkoX5KESztir0gLZw9 lTPsX83ENeLNoyBTxn6q9XAwWliRr3pg3JSbwgxYuqulBxTV+LM/a5YXPet21anpaXKm fYfJtKVtTC72UNGE2xhmMQVdVIjkKORL62Wgj1ZSEFmq8zhO/bCu8AVmI6RT7lryOx2J G0Ig== 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=cjb5evz/mPJRPLici5F0pKF7Me0AeAR0XqvU6JUvtLM=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=EB5vz5W6BijqTXO6QVEeFJvUjFxdnO6vz3l8Q71vYQNomnTa51dpSdfUmg3irb/rx/ qtrbb+Lrr9xbyuqo0rgxfZZ1NiOANCN20lx0nGOUXSZ78XPu0S4vAaCjp1cKbubUpD3D s09MlvMCrmtCgxY+b/lBfaLD+em2Cys2scgZY0OtBaf73ezmzP9ePWhmRfFM/2bcQlnQ 6MRrrA4x2wDMGrqWCyhmV8CVvUAXOnq+9dHkcf6c2Zf3a8gH9tev4smIjnd+voUY+y/b P5oSIoxZFmzXcrvYTAONxj4ZsrX16D1qF6bSOO7Vd8coCdXLbeRnSnmSPas/v2u9A/s2 zIZg==; 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=M4tRxPkY; 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 w30-20020a50d79e000000b00568a309a3bbsi4358756edi.188.2024.03.18.14.33.46; Mon, 18 Mar 2024 14:33:46 -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=20230601 header.b=M4tRxPkY; 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 186D868D3DC; Mon, 18 Mar 2024 23:32:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AC82468D3A0 for ; Mon, 18 Mar 2024 23:31:55 +0200 (EET) Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-512e4f4e463so5520403e87.1 for ; Mon, 18 Mar 2024 14:31:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710797515; x=1711402315; 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=s+y/adyCOM7zR2HgNI7Fii9Pthwy2tv6hKAVqJZNE+w=; b=M4tRxPkYnpwiHIqeuAV/7RoDS4C8u9hSi/88xRGOdTeZnPYrotoTcNKMLsFilx7Xtz drTyXUE5p3IZR+CKTqvaeWN5B1ya4WcYOGDY4T224pQ2QEKgfJ5WIFL8/jVnrY2ma6Ga TYDq6W1Z+Q46W/wvqMKrX48fBGzQtIus1HrzPBD9/ZtblKN2RgSmTq9gtUhVJTuyYOtu d5Zr/dS9mHVo2Fo4cG7bYHg2Rb1i59sP7hhKTR3uei+xQHXab1OEKW6XulbaAK0WarZI sE2x8RwSVp5ywCkQuRS+yhZNgwI3INxngcSr5oLSmv39QUB14jmCxv7DMN8Sa9RpJIS8 e7Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710797515; x=1711402315; 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=s+y/adyCOM7zR2HgNI7Fii9Pthwy2tv6hKAVqJZNE+w=; b=KVUNubvuG//RP4n2Yl7T4SBUlqQirsN+BoBq/zDvu/sjuP4sKwdCe9ueLYrl8xhmH6 hbVPGdwUTXf/RteK8NY0gWoAoVbg6irGWavGU4pyApkhKpq6zHce8RWaf8gSQIDHeD/4 PkqxLhECidji10KlWBgLe16OZVE3Ibqf9Pnh6PoBPup+HJbJUWO6TY/N84hcbMs9vnAw FmvXKvzaJlKUF7E9K+hDBjJO0U2VWv/X/8imVPEbph38MMvMoyYlNHacPPB8eIHYs4WS aIpJW4eFqfuoYIYpVq4kB4V0R7M4vVXohMetwiLmHQDfQe7j8Ms7YecraRiQMQ8wVrNG K8NQ== X-Gm-Message-State: AOJu0Ywd3vEWQh2/FAFb+MHTpxmkTLjS9PGULnxc0Yv7bU5cLiHxOMQB kelnNkU6keRIC4xCWvvFHZqAHyMDcVrQahSxuxVc+jn0O37vxL03+DMl8sDw X-Received: by 2002:a05:6512:3447:b0:513:9ae1:4708 with SMTP id j7-20020a056512344700b005139ae14708mr8877787lfr.46.1710797514837; Mon, 18 Mar 2024 14:31:54 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id c13-20020a056512324d00b00514b5462dc7sm186929lfr.56.2024.03.18.14.31.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 14:31:54 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Mar 2024 23:31:35 +0200 Message-ID: <20240318213141.1376789-13-jeebjp@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240318213141.1376789-1-jeebjp@gmail.com> References: <20240318213141.1376789-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v10 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: L8o8s1HZCEXL 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 | 69 ++++++++++++++++++++++++++++++++++ tests/fate/enc_external.mak | 5 +++ tests/ref/fate/libsvtav1-hdr10 | 14 +++++++ 3 files changed, 88 insertions(+) create mode 100644 tests/ref/fate/libsvtav1-hdr10 diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index 7721e01677..6400a6507a 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" @@ -136,6 +138,71 @@ 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->decoded_side_data, + avctx->nb_decoded_side_data, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); + const AVFrameSideData *mdcv_sd = + av_frame_side_data_get( + (const AVFrameSideData **)avctx->decoded_side_data, + avctx->nb_decoded_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) { @@ -254,6 +321,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