From patchwork Wed Jul 26 11:39:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Pavlov X-Patchwork-Id: 42994 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7528:b0:130:ccc6:6c4b with SMTP id r40csp458484pzd; Wed, 26 Jul 2023 04:45:34 -0700 (PDT) X-Google-Smtp-Source: APBJJlHnPgv9JllY0DxbmVcHyrrQVWohZ7xzMrKRZfPaI/a7yLEsI2jMDE4BMfA74h6RNusWXkbh X-Received: by 2002:aa7:d74b:0:b0:522:5a89:8518 with SMTP id a11-20020aa7d74b000000b005225a898518mr1287168eds.12.1690371933686; Wed, 26 Jul 2023 04:45:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690371933; cv=none; d=google.com; s=arc-20160816; b=d61vZFMtTQwa255hHOmWGDVYVsfOcjzHYEN/OtOFKFwvhWq48e5daf1fHreFOWOz3n H9Ra1zwpou0PCtf2N1+Bc0E8a7NGn4mvIhcPytAKyDxiANeyMuTmaJLgCvUUpOS3uV2u yh/UAhES1csXT8dStBBG+3ZV3N/37AfJlG+NiCDx+GcreFrg3DR9xuMdZx/9dxhta9QG FwtiIz2dLxWVaQua4LRK0IEgAvOvLqfjWlFZlDSr54gX8HIqm0EDWaAJXArK0z1B2++F tLjZABfz2RP0lZLdCzWWz8uix+6ROzEGlxAQc4Ecuhixkk+Rxc0Tdsv6lsgAgY5GjJBY mapw== 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=qVQux09w2znseaIt8wxh/NSMa68tmLt8+jt1xjdn9K4=; fh=8KOGQe4RXRgu0UN7g3z2nnyp2thAPLMfNg7Ff7UMJ8A=; b=QjQiKh/bNTu4B4j1F+FR23m/V6uQU+hda8Bx/xQ+Z4+H029oiUG1y5t04/kGQwZTUT 88RGnrqlzE0t8yIQs1TJsjbJK2sjis3pI0RUZaeD54dgl/MNs11js93WZvOO+Wf5wcIW /cE9i/lyqmARnrdofuY0+bAB27obqUOSjZBYGhtDuNj6PRN1N2OuWGzyrf0/kQfIUgD+ zqorDGDZVd1+la6igWTq2fwLz/TwfBb7UTdJXOaRQrUtoRr6GTYqqIY196O1IrRxUSfx 6Zc8am6c/eGjuPDnvkG+BtGEvUxSmqjlSeW31UfMhLcUH/GCC8ORChdum1czbsxlBfqk A0AA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=oFIU5BsE; 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 k4-20020a05640212c400b0051da4b65e72si9204752edx.360.2023.07.26.04.45.33; Wed, 26 Jul 2023 04:45:33 -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=20221208 header.b=oFIU5BsE; 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 80E9668C951; Wed, 26 Jul 2023 14:45:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9304068C74F for ; Wed, 26 Jul 2023 14:45:23 +0300 (EEST) Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-991c786369cso1027957566b.1 for ; Wed, 26 Jul 2023 04:45:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690371923; x=1690976723; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Cmo/hBpLLrtRRdEDli+BM9FH6pmhW24arY6qhR+YKAI=; b=oFIU5BsEWfBNG/u7l2hxD+I6OagReYOjmMcOrW3Z5Jwg5uYT3PpSQqMB5rUbLUuCZO BAUy507+SX7bn2auqacY3t7nbxsFCUzAvQhohIdqbN6v3JJB7C6Qzz7WvU4iYcq7KAL0 GFHkzPlImayRx+k7XaFqewpVihTMdvDvErm7L3UEvOwBIEItvlFVC91yxfGeTbRSjvki SWQg8XczMj9uxCHn0tdiJ0mGKIHElnOvCslHmajtt7QGnffp4giiogaw/96HtnUBdswO QQhOGhhyynYwU3Froi6RDg7nqbXuFpPaSuTVPD4YzVLpuqB/jv2whQUjLP2jJHvz2F0p ZtbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690371923; x=1690976723; 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:message-id:reply-to; bh=Cmo/hBpLLrtRRdEDli+BM9FH6pmhW24arY6qhR+YKAI=; b=JLO9imaW3avIeDDTtDuSqWYs3qTnPiftUUoD9F7c6/Y7pkx9/C36G+56vfF4Id/N9O Fzl2clYt8O7jfQ20lqh5I+WUs2Gd6p8PHF6zUBPNtkzLMb5YA064tPtsWOCxIE0ueXG3 VYVMcP1KP19HUH6oG4FrLmLCHsY4y7SqFbrfnNZl7dYYjb6DjrzeP8ogvG6Nx7lY7m3m VoTDpxKJCk4c007KJsw1TKtPP9xRW/18yArk6C6cXEvKFs8Tk41Ro1CjAHpBN0Uhxqqx JlaVPcnFJdh2ou/Hrao8cPQXJTsT7hAQatxBTWEzQcgIFZ2g+Pmqi+iNWvkjNJUfTQht L1hg== X-Gm-Message-State: ABy/qLZ4nu7tHnNcOMR5suB4cMbRuSuVxXuzh++GnYEmLYLx95Yh+Mlm lNdro2qFVyt4XyieA9lccsqJxrArZlxbSXzI X-Received: by 2002:a17:906:10cb:b0:994:1844:caec with SMTP id v11-20020a17090610cb00b009941844caecmr1337240ejv.77.1690371922464; Wed, 26 Jul 2023 04:45:22 -0700 (PDT) Received: from MSDN-EVPAVLOV.amd.com (79-101-179-103.dynamic.isp.telekom.rs. [79.101.179.103]) by smtp.gmail.com with ESMTPSA id j1-20020a170906254100b00992076f4a01sm9411968ejb.190.2023.07.26.04.45.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jul 2023 04:45:22 -0700 (PDT) From: Evgeny Pavlov To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jul 2023 13:39:28 +0200 Message-ID: <20230726113943.1140-2-lucenticus@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230726113943.1140-1-lucenticus@gmail.com> References: <20220907134122.1244-1-ovchinnikov.dmitrii@gmail.com> <20230726113943.1140-1-lucenticus@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH avcodec/amfenc:, 10, bit, support, v3, 2/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: hY5ov88ZesDb From: nyanmisaka --- libavcodec/amfenc.c | 83 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index 1d863afdc4..ec71f899fe 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 @@ -683,6 +734,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); @@ -746,6 +817,18 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt) } res_resubmit = AMF_OK; 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_resubmit = ctx->encoder->pVtbl->SubmitInput(ctx->encoder, (AMFData*)ctx->delayed_surface); if (res_resubmit != AMF_INPUT_FULL) { int64_t pts = ctx->delayed_surface->pVtbl->GetPts(ctx->delayed_surface);