From patchwork Tue Oct 31 17:42: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: 44453 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da5:b0:15d:8365:d4b8 with SMTP id gl37csp496940pzb; Tue, 31 Oct 2023 10:51:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG3q3QPVqwGjDKHDPvfTGARvq2S6v1hwKuXjecP56ujvQHhOsuvcqpbCmcC6d7SzC5qTURF X-Received: by 2002:a17:907:70c:b0:9d3:5d4a:8b6a with SMTP id xb12-20020a170907070c00b009d35d4a8b6amr49815ejb.42.1698774681521; Tue, 31 Oct 2023 10:51:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698774681; cv=none; d=google.com; s=arc-20160816; b=QQRjootXJVupGHKJ9FhaS6aLLh3ydsOLcTapWvAwZCnXTRx8d6UTdlTYOyifBVVzDo ymp2uLwJIa0lMNuOl2+G1Gs0+13MBHZz8beW8tinQPF4+2rftvwZXurTQQBfJslY2GLm a21/vFPHK051018SqxbWxaJeRhnUd1A4H7VrENMFymhBqeEAiWjBtb2NIh4ap0eHqPlC 5jGnwe87u3lluo90859usP1hdUGie3xwcBZgkBvuVglVCp5nOuouw/eG0NVtbG0KzWRK syEpBNMQrdCsQ6lD98wcSgYpMJeOURZ1kBaNhUD3n8pKGdAL7Mt2KW3p5K6vmFbhYWl7 L65g== 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=nQXLYHTU+pzuXnAClmiMA38bfEI/TvjQj+sU31BLIk4=; fh=s4NEqlgyeQvuJ9M2FER/qIrd96lZ1v/frktaqQpFGmg=; b=Ggdq2pwJ3LXb92twbW7PoCeHhqJ5hI/Z5M4zsu1Niu4/hsptoHaRktXFncGtmdvshI FjwS4D/EXKJSO5mXay1Re0kn8jfV0MMICgRvrbBp9tkxZmoXjaHKc/Bc6Cyp7bgzFvYQ 1teCr2yHoTWVhNyrWYedLLZJ6P+kIH6zTclyevT1Qj9uG7kHAl/eWlyX2DMod08QNo0Z OCTMbCrBkC6BqQ6QoOUDQZPH0Fe4610snADMRg1piFndIFLQ11KRTfI2cq+lYunpa8TW uD04/w2nIwHsI2f+kXb+R6qeddLUqibiYrc6Psg4a4aSTqm8BNAjK9Q2kPGILAuL5LD8 cwfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=OWOr6BwA; 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 ec27-20020a0564020d5b00b0053e73726c8fsi824204edb.1.2023.10.31.10.51.20; Tue, 31 Oct 2023 10:51:21 -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=OWOr6BwA; 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 6DAE268CD7C; Tue, 31 Oct 2023 19:51:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 93B4B68CAD6 for ; Tue, 31 Oct 2023 19:51:11 +0200 (EET) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-40891d38e3fso44909385e9.1 for ; Tue, 31 Oct 2023 10:51:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698774670; x=1699379470; darn=ffmpeg.org; 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=JX4G0I9AfulDVPsYmdrP3bDhk9RapAH7Dgp5Ckjk1xY=; b=OWOr6BwAi5/D11GJ/D/hMZ3c8PuSmkxfZLHBDzNQtS8x5OgPd2eDVcI8U+cutpLa2M +WeqWi1I8IDPK0hFaUj58DFUikgKWvUQFdy/J3muNS2ixR/afcr47gOlApxRZMSVheQE /d+aOgMJ78RSZiZIxBphvVBRE4FTgOy+rtzCwCH3HRQpbb9cKq381pU3SAFGhDOr0oC8 doyp5LiJHe3uRFK3UBqcZCW8siUQJFtlzKpeo2vH5ksRRxoRUElXIyGbZam2IYM0Xpwu +T5AjJVid2iXnlh7vQ7476kEOVGNSS1AQ3Ejd13FU6p/yLAU0ViicpxaQmXHEo719iQC TMow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698774670; x=1699379470; 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=JX4G0I9AfulDVPsYmdrP3bDhk9RapAH7Dgp5Ckjk1xY=; b=D8Mfp9FyEY0g+uZCvtTUooHG0W/JQIH49dg3uys/3M0tgdNvyV7z6PliYspjlz3v+U sg4d0tTyynsgvJwk7B6WnCRQaUwB8hEUbql04R4+/lh6nFpvQZ8sWR4TZjoceHXUAk7I 0YgmB0dfNj6BYuViy0NJwb9U0FDfE1u26tXdTue5EfWNZ6yjhtEkWGr8EBaLuv3ebTDH pumDu5DEgJAPfMEgpFm+TL4T5WWzPzzof9hybLe1DWPMLyQRi2ndkXCQAiUL2Ty16wiE uvSGYucVY8kvrHT+IVWg5e6myGiMHos15ixkeltiEeDt0EZShFFqJk1IY7eKDIoMfiYt +tMQ== X-Gm-Message-State: AOJu0YywKpXCBDuYEryzrUqNJmBeHUZEh/SNlR4sH0Wo9cbKrK4BiGn8 /8T+ZODb7D716MbkFAgztKEXH79NRmHkwcto X-Received: by 2002:a05:600c:3589:b0:401:b2c7:349b with SMTP id p9-20020a05600c358900b00401b2c7349bmr11960991wmq.7.1698774670121; Tue, 31 Oct 2023 10:51:10 -0700 (PDT) Received: from MSDN-EVPAVLOV.amd.com (178-223-50-56.dynamic.isp.telekom.rs. [178.223.50.56]) by smtp.gmail.com with ESMTPSA id t4-20020adff604000000b0032db4e660d9sm2021907wrp.56.2023.10.31.10.51.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 10:51:09 -0700 (PDT) From: Evgeny Pavlov To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Oct 2023 18:42:28 +0100 Message-ID: <20231031174359.6757-5-lucenticus@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231009095340.41807-1-lucenticus@gmail.com> References: <20231009095340.41807-1-lucenticus@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10 bit support v5 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: rrrJCEeTUIYr From: nyanmisaka v2: fixes for indentation --- libavcodec/amfenc.c | 83 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index 0bd15dd812..068bb53002 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);