From patchwork Wed Sep 7 13:41:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitrii Ovchinnikov X-Patchwork-Id: 37740 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp3916591pzh; Wed, 7 Sep 2022 06:42:04 -0700 (PDT) X-Google-Smtp-Source: AA6agR67ot83Nt3c9MlJjr0Tf5wodiNAnKScwqa8ycBFaFxDmS8ZcnEkKYonrvw02A6TlGpFflU6 X-Received: by 2002:a17:906:1350:b0:741:7a1c:f857 with SMTP id x16-20020a170906135000b007417a1cf857mr2404211ejb.612.1662558124388; Wed, 07 Sep 2022 06:42:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662558124; cv=none; d=google.com; s=arc-20160816; b=nYKHrh7ic3DjmZ1jcbyfibzjrOO9+Ac2Coe1D8WFtIxTcP0u/ft7cND6gwBN+tm6rU R524CU4CcKH1A39BgB1zPN8B8UN9COC/ekmdfBp8pRIvN8ZzLJ8Y5sl/WQ2jBLFUeZLC G+6uZ8hbKMwS+ZgFUDMK5wLCoXauBfeMtJrraKRpQQCbBSm8b8LXsloDFzRYWUY3RQlK ThasAz+SMrO1O2QdN12DRRsp85Tsso+MDLysRR8Z8o5zNUQT1TslsAgMm0iZeSqa61jq F61x3OPY+Mr1yUkn3Qars83WDTq0NTF08RpEbJ05mgmuE+PRUAgbmRsKt14mdXn7WOGj Mi9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=X2+cpnFqjGaCw6JtEcnzjiBHAx2TX51vNzTd+gDjzZg=; b=B/s/2eVVddps9/cTcM5txHTaHazYcJFMJ7JHtliRJ1F4vjGk0PsFzEHKSKbXWav8xy vqS/zy78y2/qxZhkIlH144DnnP+Dd4PbZZMrQ90akFBxDPwv18Qb+VO60tre5S/FReK5 hnRYffLOGR+mhlB2B/wfceHoqeD4Ycuc8vSmdGY2ubl1FMqlP9mkjHNOy0tpRln2AQVW qQt9j2RllaS9ws6xigJiFWuuSxvKwLn4qTaGAP7cPRCeurch3+hB+a6vIkTQFK/9/gQR aOQlyWq/8WrEbIsgBoBxLfnZs73P8uLrgSd5sgz1/CtPTd/bXxdt3BuTTvc67AW/M6rd dJyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=PKNPEnaC; 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 x7-20020aa7d387000000b0044e9151d561si5172372edq.542.2022.09.07.06.42.03; Wed, 07 Sep 2022 06:42:04 -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=PKNPEnaC; 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 F404D68B7AB; Wed, 7 Sep 2022 16:41:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2D4A568BAAD for ; Wed, 7 Sep 2022 16:41:38 +0300 (EEST) Received: by mail-ed1-f54.google.com with SMTP id z8so19776404edb.6 for ; Wed, 07 Sep 2022 06:41:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=o9kcE8K/RPd1h9GB5WbdXY913eLh62c/yeuQVvbAyz4=; b=PKNPEnaCIyA4kOqnxVjUG4OMPOCvj1UzrasUA/WkpI8UdeFfgEn01rwMGK8yRpjSzm rVab5Hrtiq8rAVsVc7KQDXMqh8wZntkP0JDLOf1/z9mSCzLq8jQlG95+nXQrFSMUZm7g J+ZFBGVeVzzK7yEmWTbdz2iCtBkwMOnRU4TMjCQygcq/lRhKSOBwFO9qk+dnmhBfw5qw kgIyj39iJW8YUvYL7s0iip7EacY6ayqLomOW5BrraidABLsF2Ux+5uIXnoCnNZDNOFQq 68qPhp5MRgR0ib+m8d8dW39+XAEsvl2L2G/qs+t3Joci9T7Yb5F9oEWbTdIaDgVFspvU ZzVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=o9kcE8K/RPd1h9GB5WbdXY913eLh62c/yeuQVvbAyz4=; b=MJbmwLrPGnoE8IU1HEECIKfx+gKKc1BK3VeHkrF7iJEt8uZLQAX38bNRMc+tgKYyVd dG2KxGdA3gDzQOstpKaa771uJkF7r/K9qZcR7ou9WMWCzmbgkTUgKlYCgOkaXk3GCYrV J4YJLOXv5pYRe5WY68wwQbHzW6oQU27LddxYTdSCATxxN5JQBraa5ZP/PAujGsurjkAb T0eQZ6CW0QFRWi1+VIFdEQsOpLlobRkQEipKR8QNpw1Pi6a2ddcfuhe/lUBAPRuwxnxN +VFs+ItxO69LNr3eyr231/BuuY5w3PsxgAeaOkMG/gUc2zJddZoEqluKhovX/ts6/NpU eqsw== X-Gm-Message-State: ACgBeo0/P5qiAM21wDxaxqM/jersZPqBLM8AFRSguu8VhUHmZwDV/exr MHfviLdqQG5kxQ0XBPK5mRL+wAhnRCxv6M4piFA= X-Received: by 2002:a05:6402:217:b0:44f:2d3:c8af with SMTP id t23-20020a056402021700b0044f02d3c8afmr3226224edv.388.1662558097275; Wed, 07 Sep 2022 06:41:37 -0700 (PDT) Received: from localhost.localdomain (178-222-7-135.dynamic.isp.telekom.rs. [178.222.7.135]) by smtp.gmail.com with ESMTPSA id 18-20020a170906301200b0073d6093ac93sm8626616ejz.16.2022.09.07.06.41.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Sep 2022 06:41:36 -0700 (PDT) From: OvchinnikovDmitrii To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Sep 2022 15:41:22 +0200 Message-Id: <20220907134122.1244-3-ovchinnikov.dmitrii@gmail.com> X-Mailer: git-send-email 2.30.0.windows.2 In-Reply-To: <20220907134122.1244-1-ovchinnikov.dmitrii@gmail.com> References: <20220907134122.1244-1-ovchinnikov.dmitrii@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [avcodec/amfenc: 10 bit support v2 3/3] avcodec/amfenc: HDR metadata. 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 Cc: nyanmisaka Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: XXQsStDfJTHQ From: nyanmisaka --- libavcodec/amfenc.c | 83 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index efff9b5ae8..346f86bf00 100644 --- a/libavcodec/amfenc.c +++ b/libavcodec/amfenc.c @@ -36,6 +36,57 @@ #include "amfenc.h" #include "encode.h" #include "internal.h" +#include "libavutil/mastering_display_metadata.h" + +static int amf_save_hdr_metadata(AVCodecContext *avctx, const AVFrame *frame, AMFHDRMetadata *hdrmeta) +{ + AVFrameSideData *sd_display; + AVFrameSideData *sd_light; + AVMasteringDisplayMetadata *display_meta; + AVContentLightMetadata *light_meta; + + sd_display = av_frame_get_side_data(frame, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA); + if (sd_display) { + display_meta = (AVMasteringDisplayMetadata *)sd_display->data; + if (display_meta->has_luminance) { + const unsigned int luma_den = 10000; + hdrmeta->maxMasteringLuminance = + (amf_uint32)(luma_den * av_q2d(display_meta->max_luminance)); + hdrmeta->minMasteringLuminance = + FFMIN((amf_uint32)(luma_den * av_q2d(display_meta->min_luminance)), hdrmeta->maxMasteringLuminance); + } + if (display_meta->has_primaries) { + const unsigned int chroma_den = 50000; + hdrmeta->redPrimary[0] = + FFMIN((amf_uint16)(chroma_den * av_q2d(display_meta->display_primaries[0][0])), chroma_den); + hdrmeta->redPrimary[1] = + FFMIN((amf_uint16)(chroma_den * av_q2d(display_meta->display_primaries[0][1])), chroma_den); + hdrmeta->greenPrimary[0] = + FFMIN((amf_uint16)(chroma_den * av_q2d(display_meta->display_primaries[1][0])), chroma_den); + hdrmeta->greenPrimary[1] = + FFMIN((amf_uint16)(chroma_den * av_q2d(display_meta->display_primaries[1][1])), chroma_den); + hdrmeta->bluePrimary[0] = + FFMIN((amf_uint16)(chroma_den * av_q2d(display_meta->display_primaries[2][0])), chroma_den); + hdrmeta->bluePrimary[1] = + FFMIN((amf_uint16)(chroma_den * av_q2d(display_meta->display_primaries[2][1])), chroma_den); + hdrmeta->whitePoint[0] = + FFMIN((amf_uint16)(chroma_den * av_q2d(display_meta->white_point[0])), chroma_den); + hdrmeta->whitePoint[1] = + FFMIN((amf_uint16)(chroma_den * av_q2d(display_meta->white_point[1])), chroma_den); + } + + sd_light = av_frame_get_side_data(frame, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); + if (sd_light) { + light_meta = (AVContentLightMetadata *)sd_light->data; + if (light_meta) { + hdrmeta->maxContentLightLevel = (amf_uint16)light_meta->MaxCLL; + hdrmeta->maxFrameAverageLightLevel = (amf_uint16)light_meta->MaxFALL; + } + } + return 0; + } + return 1; +} #if CONFIG_D3D11VA #include @@ -673,6 +724,26 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt) frame_ref_storage_buffer->pVtbl->Release(frame_ref_storage_buffer); } + // HDR10 metadata + if (frame->color_trc == AVCOL_TRC_SMPTE2084) { + AMFBuffer * hdrmeta_buffer = NULL; + res = ctx->context->pVtbl->AllocBuffer(ctx->context, AMF_MEMORY_HOST, sizeof(AMFHDRMetadata), &hdrmeta_buffer); + if (res == AMF_OK) { + AMFHDRMetadata * hdrmeta = (AMFHDRMetadata*)hdrmeta_buffer->pVtbl->GetNative(hdrmeta_buffer); + if (amf_save_hdr_metadata(avctx, frame, hdrmeta) == 0) { + switch (avctx->codec->id) { + case AV_CODEC_ID_H264: + AMF_ASSIGN_PROPERTY_INTERFACE(res, ctx->encoder, AMF_VIDEO_ENCODER_INPUT_HDR_METADATA, hdrmeta_buffer); break; + case AV_CODEC_ID_HEVC: + AMF_ASSIGN_PROPERTY_INTERFACE(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_INPUT_HDR_METADATA, hdrmeta_buffer); break; + } + res = amf_set_property_buffer(surface, L"av_frame_hdrmeta", hdrmeta_buffer); + AMF_RETURN_IF_FALSE(avctx, res == AMF_OK, AVERROR_UNKNOWN, "SetProperty failed for \"av_frame_hdrmeta\" with error %d\n", res); + } + hdrmeta_buffer->pVtbl->Release(hdrmeta_buffer); + } + } + surface->pVtbl->SetPts(surface, frame->pts); AMF_ASSIGN_PROPERTY_INT64(res, surface, PTS_PROP, frame->pts); @@ -731,6 +802,18 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt) AMF_RETURN_IF_FALSE(ctx, ret >= 0, ret, "amf_copy_buffer() failed with error %d\n", ret); if (ctx->delayed_surface != NULL) { // try to resubmit frame + if (ctx->delayed_surface->pVtbl->HasProperty(ctx->delayed_surface, L"av_frame_hdrmeta")) { + AMFBuffer * hdrmeta_buffer = NULL; + res = amf_get_property_buffer((AMFData *)ctx->delayed_surface, L"av_frame_hdrmeta", &hdrmeta_buffer); + AMF_RETURN_IF_FALSE(avctx, res == AMF_OK, AVERROR_UNKNOWN, "GetProperty failed for \"av_frame_hdrmeta\" with error %d\n", res); + switch (avctx->codec->id) { + case AV_CODEC_ID_H264: + AMF_ASSIGN_PROPERTY_INTERFACE(res, ctx->encoder, AMF_VIDEO_ENCODER_INPUT_HDR_METADATA, hdrmeta_buffer); break; + case AV_CODEC_ID_HEVC: + AMF_ASSIGN_PROPERTY_INTERFACE(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_INPUT_HDR_METADATA, hdrmeta_buffer); break; + } + hdrmeta_buffer->pVtbl->Release(hdrmeta_buffer); + } res = ctx->encoder->pVtbl->SubmitInput(ctx->encoder, (AMFData*)ctx->delayed_surface); if (res != AMF_INPUT_FULL) { int64_t pts = ctx->delayed_surface->pVtbl->GetPts(ctx->delayed_surface);