From patchwork Mon Mar 11 20:58: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: 46963 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dc95:b0:1a1:738b:6bc0 with SMTP id ky21csp1470161pzb; Mon, 11 Mar 2024 14:00:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVHIxfg0cm/vG+LipEBchD2I6go9ECusjFituf4ozZuMDHnVYM3rUMGlo4PyK7/L++5TwD9cHccos170ewA649Nrrkr9ftmiQAhpA== X-Google-Smtp-Source: AGHT+IGikCLdv76NCJ0Nc02H4CSZ8Z9n367bi5pm4aYCaU8drm0NO86wennUWymdf+aWqg/8W+2J X-Received: by 2002:a2e:88d4:0:b0:2d2:ed31:9fb7 with SMTP id a20-20020a2e88d4000000b002d2ed319fb7mr6131344ljk.4.1710190843299; Mon, 11 Mar 2024 14:00:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710190843; cv=none; d=google.com; s=arc-20160816; b=drJZkIZygY1aGqPTZdmhdyX9PSlHNBEQQ1MCynvuSg7ncfpnm1KO+4fGdUB1RjtXwK NzAk+quLdtqdedm8sfC8/rvWC74383JJuCg3WGz/DuYkMt/hMBJC2oOs8yBbT7xeZ7n8 ZAs0FRjrFzTBKOgbluA0qIJsxNiKvlh4Cl7XC5Or6lttNrdj9yczeKDRT2v+02WOmi8a Nba0lIXsnvXc8vjhlRTyVM7AVzm3SFWquwn39/efwxtG5wQT+D4roc4Yi5rvkH6Hg+Ye UXNmEAA8+v5l03SIPJWDxzjCqJ3kqNG4zOtSzKKWe1wH3f6SdAzEZV6XrSQ5vPUHDpup VR8A== 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=g7C9fbELC/3FGmJSCaaar2CS+PV3eSmmWp2O0TFViWk=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=O5SsG7Voktfi/K4ODFOMeRun2HqlOtccijf34pBp4lHObZES9nvIdAMNJ7zA/s9mJo sJtvNHiuJbLBMTocMsDxLF5Jccti6fO0lpwAeNYAr6bMurZ2SyNLF10DUS3WlvXYzkCL HcYQ/gEalJPnM0BlbVer/XSoUIOtN4SfxHeJEriKvons40KZEg93V63XiGx7mDc1mSdn PhlfbU6eaGRCnLhkLhjmoKngr9p5jrK/waPLLu3bhn5BvWLwhCXadpD6JuVU54A5QfjI CL3mTvuCSHbkx1fqxDByxJNcjQc2xiXao2TKXgcA1LAfHfG5kd3Tg/7SNGOAXhUm6sjG q4WQ==; 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="Lu/BB+ya"; 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 z7-20020a056402274700b00566dc656008si2979875edd.75.2024.03.11.14.00.42; Mon, 11 Mar 2024 14:00:43 -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="Lu/BB+ya"; 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 732A068D177; Mon, 11 Mar 2024 22:59:05 +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 03A3668D11D for ; Mon, 11 Mar 2024 22:58:51 +0200 (EET) Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-5139d80f8b6so2566772e87.1 for ; Mon, 11 Mar 2024 13:58:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710190730; x=1710795530; 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=DTX7EVYYLl5x54Oh5xqojGkJrZ772lrJsgCUcDGrDcE=; b=Lu/BB+ya3lcAvDHyppOiuXyazX7uGGOLzHe2BDMU0tCV/6yuJiKBXhSdNuSViLg3Zm vTv2j6E8WdB78E24N9ridl7TDATPLZ0E5gSM06wsN+5wqFo4dwpk2T2P7xbHzBtMdZIj ReQgguXGHnPlKqwr5xvjjRKHA0TBCBGklrdxjEfgXb7mUhx/KlClFI0QOHeYJ5KbwA/R 2P3O3bon0wF0f1nO1LrCFnnKNPC6SOl//0W5AGOqLcIz7A1grqbvlTEHbVOk+Evog2nQ Tx9U2EDUqC1Z3KurAeXCkYzQvNJ2QvWZnEGeEBctnZcXAWLwvkdu0Dt6j3nGmWX60Uhu 7E+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710190730; x=1710795530; 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=DTX7EVYYLl5x54Oh5xqojGkJrZ772lrJsgCUcDGrDcE=; b=jAh/UrHlymfPKbFP+olN79Yf5kJlBpGn0g75AFtxufRDPjJCTya8gorIvV1JnZhgok iDZnAw15CRGPHmGxUSTmjR7AngDB57iuTvA+4Ad6Btty2yGaj/Gj/HSbYh4pjbUHU95Y pmnNasw8IuJ1pjZdtpUWy6tEHL71bZjvYPP7rItTS5kQjqeQ2Ww9nQm/Etv8IcXg8Vly T+ngxw/6Az2igmq/3BeW9fF4CX99q2SJLrX5aGIxbxw0YokntQVSTFuAsfzjCXa3zENo 5wfeC6bt6tH2/TB6Gd4G9wzuhxJo8SJeZs8IgQW9ocRFG57czxCRDTfhqqDDldcb0KrY h7Ng== X-Gm-Message-State: AOJu0YzUnsgGnLD3wjhjSgl7wN3eQRL+JJgkAwswED/YNcAo/cILq/fv a/7NaLhkExPIO7hxgrcJ52zxCQmAp4mFA4aYAbWVYFi8MpeLOuvVVP8Ol9eU X-Received: by 2002:ac2:5f7b:0:b0:512:e58c:7bf1 with SMTP id c27-20020ac25f7b000000b00512e58c7bf1mr4614753lfc.40.1710190730074; Mon, 11 Mar 2024 13:58:50 -0700 (PDT) Received: from maomao.mshome.net (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id c17-20020ac25f71000000b0051333104075sm1249247lfc.259.2024.03.11.13.58.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Mar 2024 13:58:49 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Mar 2024 22:58:35 +0200 Message-ID: <20240311205844.3569895-13-jeebjp@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240311205844.3569895-1-jeebjp@gmail.com> References: <20240311205844.3569895-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v8 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: ytk6FS9OZCLr 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 7721e01677..66fa019aa0 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,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) { @@ -254,6 +320,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