From patchwork Mon Mar 20 23:34:06 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: 40746 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp2166463pzb; Mon, 20 Mar 2023 16:36:08 -0700 (PDT) X-Google-Smtp-Source: AK7set87M7meMDV37XDdg43lTi+09it6CUFkXOTUIy4StTc/Tye1Ml7i7+zx2iPodUPAYMvlt7WB X-Received: by 2002:a17:906:9392:b0:932:66ca:faf4 with SMTP id l18-20020a170906939200b0093266cafaf4mr865772ejx.54.1679355368368; Mon, 20 Mar 2023 16:36:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679355368; cv=none; d=google.com; s=arc-20160816; b=Kcj8cBjEj7oY78FTYTju1arMbYleSevRnbhjdXkhw1vaNjop9K3UXqEzVeH1S9ie1R lfrDIP2oq/A/W6QMHSocA7XrJEGwRCo9Is15nltyBMdoVdv9itu54BWD1BWcT6OtabmI Eg6kW4UF1CaInWDRs9IkPvaewa1sr5jvtyOy8frhX7iNMaPnz1CrWofMedWrGznNcZlR 7J3Wj9Eytn9RVW+SbqINuCBL5qZHWZlgva10AlL/LMwUl29duWybrJGYXBSRkAEy5Zlf VNCcr/uVSIDbFL2myiOmZCE/sMCDaJcyl+SmlO1aHw3dx/lrFXLpCOpAssNCblyAEg6q PFng== 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=Yd1L2E9iXzx6YYPEs9SwNdTRyk5SsD3BQCi/39xBjUU=; b=c5O2JTci5WQnBiGV14hZkIgvuIguYGEhcRK2zfHl3nvwqwHZmvoF7a9bE/1cbKLN8L u5Bb5d27hF9rQxtwHqpyH0juRL7qXOv2pwboko39Tr+AG5qy6mrLWRo0LB5fRmkBPqrm fSsJnBEpAxHVwVlE3WW02AeqFpsNaRrX3WGVQgxPLiMQepumCkJSVIW/+DrK2Tp6I0DO SRViofjHoPnzJhKk1RAzHt4tvP8Vl+S2l4ODUm356VWs3/Ug5UVx/JOZgorT1pCn1DHY wQ1CYPwhp7Y17bag1Z2djZo+9IYnbJseqaGapM01r1sMrEryIqmX4JWUIRm+Z0spePXe vWyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=nVLCeTXl; 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 hx24-20020a170906847800b0092b71bc8201si7509913ejc.921.2023.03.20.16.36.08; Mon, 20 Mar 2023 16:36:08 -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=20210112 header.b=nVLCeTXl; 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 D1A4668C623; Tue, 21 Mar 2023 01:34:34 +0200 (EET) 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 D16AE68C5BE for ; Tue, 21 Mar 2023 01:34:20 +0200 (EET) Received: by mail-lf1-f51.google.com with SMTP id s8so16728827lfr.8 for ; Mon, 20 Mar 2023 16:34:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679355260; 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=0oLGlggx2gtbNiSzEYc1eoZ77ZKUCFpPuctE2y7NQJE=; b=nVLCeTXlJ8hgbIZsg6ZWKQWwiZvC+Sm3RAZsGnQGm1YBD7VazGO8EkhUa1IJT7bNEr 7e3gYe5iIA6uuEU0nG85QfEtUsPFq/zGeaF8Bs1Tmdodo9eUNqKsrWeitiCkrkANP+q8 +sB+Bf6JLmdvHw2SVhcmZ3ewoFMARY1Jevj8PfJtnBKstZVDhB8lYfoG6Sv6eAFMbxia XeeTghHuwKBUVEEreRBy902XDKqOOKimnnzsMH5DO8p9DW+1oamue67usd7inTHF8650 LkL+lNJmR5JPqRrJdEflPi/zoGLduf/F661gzbWzcyKK3evJSxJ8QyecQkxjt/uqUPqK VP6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679355260; 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=0oLGlggx2gtbNiSzEYc1eoZ77ZKUCFpPuctE2y7NQJE=; b=GrFavu/F2dUX+Gu/RNVtpCGdD+Yg1aqo5RwwtptqhXQEe6QPyhQS+a3LX17ERZvdT/ 1/sP2neO44MfLjrGGQSPQkpCXF0WHazJxewc93fUOT1ZW6m5+waoD8kvDeYLo5puAggO sd7LzqvgAGX/nRKKcJLChYYgGixRt+gNb8GLkH0h8yZiKI5hnD6Ak0/wOGYHIfVAqEFE qdD1XgP+KfqLFBT2Y0z/YXY8rDWQI6gW6tRqJPfI7Ev+ZEU7kLnzm20HEnOsCXboB8ow ud8UN6uIZRu4c9ftNIq9SjkzxfE6YpYigdz3T/Eifm+Q1jG3AUhnBDhSqOnOleWmZ6cp 2yQg== X-Gm-Message-State: AO0yUKWy9rqk05GwV16Zq1WyJrnX/gZqDrZFP5EPuB2LwFSuswVt1/GX Krl27kw6oG/jy/6scLcEuuhRl9qEtGo= X-Received: by 2002:ac2:51a6:0:b0:4ea:c730:aabe with SMTP id f6-20020ac251a6000000b004eac730aabemr219707lfk.20.1679355260240; Mon, 20 Mar 2023 16:34:20 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id j19-20020a19f513000000b004e84b79de9bsm1900701lfb.254.2023.03.20.16.34.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 16:34:19 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Mar 2023 01:34:06 +0200 Message-Id: <20230320233408.134255-13-jeebjp@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230320233408.134255-1-jeebjp@gmail.com> References: <20230320233408.134255-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v0 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: Kcg343XKcP2K 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. --- libavcodec/libsvtav1.c | 70 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index 9174e2753c..a3fb3535c9 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->internal->side_data_set; + const AVFrameSideData *cll_sd = + av_get_side_data_from_set(set, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); + const AVFrameSideData *mdcv_sd = + av_get_side_data_from_set(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) { @@ -256,6 +324,8 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, /* 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);