From patchwork Mon Apr 15 09:04:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Araz Iusubov X-Patchwork-Id: 48066 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:670b:b0:1a9:af23:56c1 with SMTP id wh11csp1713552pzb; Mon, 15 Apr 2024 02:05:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUUBalYahsXNVrqfjDk5hiJD771a07iMtB5E9bkPw0d/2MyiV/juN3oUIkotOon66Bfk9EsvC4O5/pFYTgiDTTM6L7OOcQKVaLyaQ== X-Google-Smtp-Source: AGHT+IGkf8N+i1yzVTGM5aJUqiaQFyU0yRcHMJtdfEaL0yOwUy0ANHIO61pQxXKlFmGHj/1VeB7u X-Received: by 2002:a50:a455:0:b0:56d:fc89:ecf8 with SMTP id v21-20020a50a455000000b0056dfc89ecf8mr7742137edb.10.1713171915847; Mon, 15 Apr 2024 02:05:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713171915; cv=none; d=google.com; s=arc-20160816; b=TALJg3aLglnXM+dTmUrh8t2fiqx9WijLUM4qdR0mWZpeLR5DTvI4jdT5u4qlasjInq Bd27QnW9JUwVhxk9icucaRRLfn9K7Olk5uPljBRwfoBqYaURROq4WBCWeZh3k7AdiEkf PjeEyo7l0OZK+Sk9TO0bHt56X/hIPJkNZNJRFIGK+1WGDfJGRdX1Jy0YerVAVaMXtj6M rwZXc73kWJOrIxa5C+RXOKI9auTd6Acq8eubK1owDPLcA1UVotsvAAblPA/hDy6v6YMK ApDhhy18ZUzX2vNQt6xNFTWp8N7ONMwSjQLFAk08PCWXHORcpsJqMmlUwg90N1kHahs7 3xUw== 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=aRDQuPW8pFGD+bUhkrkcx4L+/dIVHzjBPw25djRvQ6Y=; fh=GFMLWjWsOMgBmoPKQLjFbTnXINkN4pkSjsZqwDcYLuI=; b=vgRortsRwAKglqRpgCbdJtFC2tYU1l+8bBI7hi1yFqXgsnVihJJnBnHNRZde+rfxkf ZsWt5cI9npPinXUcfup4W29IAF01HW1qCVfbK5f2L08AWodg0FqomY7GGpLv7kqeuM4q MbisqBG2x0T+FbCaGXdSLQP+yUDJDmPh61OUscEts5/FDppP+kzbhWMtdjXCY0L8rm+n WPpPFTm0TSWpxEdRcfKs89HM/uhrc82QGDNDzWA4P54YTXozeE5LBmrCJsc9tFkoiE7M ANCwEgFmU19vBmE6PbtR9zg98tGcMjLHD0DhC9ZrxVZZ4th/5kaXpYyOZ/2WfBYzZZay Hyng==; 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=Ip67tZOs; 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 d8-20020a056402400800b005700374d478si2912261eda.641.2024.04.15.02.05.15; Mon, 15 Apr 2024 02:05:15 -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=Ip67tZOs; 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 D4B1968D31F; Mon, 15 Apr 2024 12:05:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7281368D3A3 for ; Mon, 15 Apr 2024 12:04:57 +0300 (EEST) Received: by mail-lj1-f175.google.com with SMTP id 38308e7fff4ca-2da01cb187cso53085141fa.0 for ; Mon, 15 Apr 2024 02:04:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713171896; x=1713776696; 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=g2+vXeqmRr60G684vQhUPsi0OYrJlWpEomR/2OzMm7c=; b=Ip67tZOsh5gvTJ8gFzfC/YjSpcirBNocLkxlcGo6/verVl8EJVGtk1ay0sLMyIdw6w lMoWkKhItOTpdRggqk0B32EtywLdKpH81bVEB9ZLU/vvm3v4g5cPlVNhm+2vsvqL8CTS oNK9tC09qnVnLTm5p62y8eX+tjoZlNypaHre0XKKz8cs3asXMfWPljqZn0rn1rqx3Tsc MuQxd/sd2fGXFj48igxoFxH7fITxoWR2mWBJPzgJRnDNoJUWEbWaIwaBSFZcl1PPtJ7J U6e2awwloM7oB09a1b+MMwhKmI8FjSDZFHgOG8h7P5AQ9wlEhHrdvhKBfuS+1ZxsOx7B ZePQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713171896; x=1713776696; 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=g2+vXeqmRr60G684vQhUPsi0OYrJlWpEomR/2OzMm7c=; b=p67RQlunoicXyrTa8nK3Jx4pXgwPKk6I36Hz7Y7vtSglnC3DhjnvJNQ/FALb8ZzbFt tbgECSIHdkbb3kAgE3NJLz5IH0JZ3YS074dmDUMGCejMfPnS3B3pdwIOtmOH6JJIbPok cUkl02Tl5xQI707Y1YU3DfVKFoQnXf/jHG9ETEUzpd6O+IvUbsJcCv9S6pSE7TFqoJbD kOI/QZoFYoWL6BYYyVvhw6M4QwrkrcK94AnjpFWtM/NyNA9pgQpiqSkuS6OQzNaLGpAN mXQ5gDY6J95Oq3lTJgDYzSe8yaEUuTDRcXbA4YybBmde2JmT7+SBFjIgtLJxdirK9A7p FU/g== X-Gm-Message-State: AOJu0YxLM4iGDn6SFFWP0KeI5GIj3qjrr4FCJfvf8uCrB/a9oCx48Gm3 9Tw2Ww1xF4QZVSwzsNcjJGEjGORM3Zbf5YellJ1Uizo6+7qGRNyKdyU1HEM6 X-Received: by 2002:a2e:a718:0:b0:2d8:687d:b22 with SMTP id s24-20020a2ea718000000b002d8687d0b22mr7294903lje.20.1713171896134; Mon, 15 Apr 2024 02:04:56 -0700 (PDT) Received: from aiusubov.amd.com ([87.116.133.126]) by smtp.gmail.com with ESMTPSA id ay8-20020a05600c1e0800b004181c91d1dcsm9283139wmb.18.2024.04.15.02.04.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Apr 2024 02:04:55 -0700 (PDT) From: Araz Iusubov X-Google-Original-From: Araz Iusubov To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Apr 2024 11:04:09 +0200 Message-ID: <20240415090410.1138-3-Primeadvice@gmail.com> X-Mailer: git-send-email 2.43.0.windows.1 In-Reply-To: <20240415090410.1138-1-Primeadvice@gmail.com> References: <20240415090410.1138-1-Primeadvice@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/amfenc: add 10 bit encoding in av1_amf 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: Evgeny Pavlov , Dmitrii Ovchinnikov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: aNDVEcf/7vKk From: Evgeny Pavlov v2: refactored after review Signed-off-by: Evgeny Pavlov Co-authored-by: Dmitrii Ovchinnikov --- libavcodec/amfenc.c | 2 ++ libavcodec/amfenc_av1.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index 068bb53002..f1b76bd6aa 100644 --- a/libavcodec/amfenc.c +++ b/libavcodec/amfenc.c @@ -826,6 +826,8 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt) 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; + case AV_CODEC_ID_AV1: + AMF_ASSIGN_PROPERTY_INTERFACE(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_INPUT_HDR_METADATA, hdrmeta_buffer); break; } hdrmeta_buffer->pVtbl->Release(hdrmeta_buffer); } diff --git a/libavcodec/amfenc_av1.c b/libavcodec/amfenc_av1.c index 8f13aea29e..634eeea48f 100644 --- a/libavcodec/amfenc_av1.c +++ b/libavcodec/amfenc_av1.c @@ -165,6 +165,9 @@ static av_cold int amf_encode_init_av1(AVCodecContext* avctx) AMFGuid guid; AMFRate framerate; AMFSize framesize = AMFConstructSize(avctx->width, avctx->height); + amf_int64 color_depth; + amf_int64 color_profile; + enum AVPixelFormat pix_fmt; @@ -203,6 +206,25 @@ FF_ENABLE_DEPRECATION_WARNINGS } AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_PROFILE, profile); + /// Color profile + color_profile = ff_amf_get_color_profile(avctx); + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_COLOR_PROFILE, color_profile); + + /// Color Depth + pix_fmt = avctx->hw_frames_ctx ? ((AVHWFramesContext*)avctx->hw_frames_ctx->data)->sw_format + : avctx->pix_fmt; + color_depth = AMF_COLOR_BIT_DEPTH_8; + if (pix_fmt == AV_PIX_FMT_P010) { + color_depth = AMF_COLOR_BIT_DEPTH_10; + } + + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_COLOR_BIT_DEPTH, color_depth); + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_COLOR_PROFILE, color_profile); + /// Color Transfer Characteristics (AMF matches ISO/IEC) + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_TRANSFER_CHARACTERISTIC, (amf_int64)avctx->color_trc); + /// Color Primaries (AMF matches ISO/IEC) + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_COLOR_PRIMARIES, (amf_int64)avctx->color_primaries); + profile_level = avctx->level; if (profile_level == AV_LEVEL_UNKNOWN) { profile_level = ctx->level;