From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTP id 794AA47EF8
for <ffmpegdev@gitmailbox.com>; Tue, 31 Oct 2023 17:51:48 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 49CCC68CD74;
Tue, 31 Oct 2023 19:51:47 +0200 (EET)
Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com
[209.85.221.49])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE1A368C924
for <ffmpeg-devel@ffmpeg.org>; Tue, 31 Oct 2023 19:51:40 +0200 (EET)
Received: by mail-wr1-f49.google.com with SMTP id
ffacd0b85a97d-32f70391608so2800573f8f.2
for <ffmpeg-devel@ffmpeg.org>; Tue, 31 Oct 2023 10:51:40 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1698774700; x=1699379500; 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=U3ChQMg88tK/c8FFryxr+OB3y/Wvk5x6Ega8fV2XuD0=;
b=Z5sOMp+l2L7tA1OL/LZpvw2e9d73gU4oAFt1awkveYve09i+4g/94HTtwzVIItUzdK
A58das1g++xss2Chjp3niWSvi4sUaszO6dHOw2fVI3jaGHGhLHSSK6sF91a2RLNdxbEo
cAfsYw8qE0uQuHdEbwxpXRvdJW17Kh4C2JNBrdS05s9xOEcnkN27a9jHVKCtA+29ADU5
kqzv/fZGkbsdLLcwRLIRvtS5J4t+JODSrRWCokWHH/kSRdanoKx2B+/hQ/MVxD4wP0OS
4yaUMgsMm8LaX3CkV3xRHS6xi926TrksjIfeOska82olh690GMLYb29YdMUnqJyqAVp0
oBPg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1698774700; x=1699379500;
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=U3ChQMg88tK/c8FFryxr+OB3y/Wvk5x6Ega8fV2XuD0=;
b=MEwmBph9yQ/g07SlMUoUo2pBgZGt/l6fx8zvce2/FglTJ3Z9Pnp06qrFDq1rXuLdku
sFT4ePC4jvQxdGQrVsFBEl3p0x/B/ruNMoVfFP4q5Um8NC5EyWd71cGVuTWTjpg1CL0M
rkcrtON9Tzpba0wYb34kOmSo8ql5FofKvwlC4ndQ9tM2p1M+iMXgIRbxcbxqyEjDWXUS
hmFdsEwTFJNZpp+WWippbvxxrTddDYI2RYNy+NqNTH+DahJFrUjOPtyI+Dyog2C8oY7h
95tAUDm8A++dJxHiLYNs2PSXN9m+FpTp2A/e7b9x24c6AYutHGtO2U9y2swjT+xtI06R
63SQ==
X-Gm-Message-State: AOJu0YzBB+IW/yAg1yzOu5u/Nbwx9VTzlfmvr/Us5jenLQj2eY1iFG/x
P8kbtpxV3Vh9xx31jXsA7ZrdNqdi6HBjy5Ka
X-Google-Smtp-Source: AGHT+IEkx37IeOEBB5uXGTB8mF8o7hV0jlroo0MlPhu2weTdx/EdvdvnrcBANcryCgV9RJg+vSea5A==
X-Received: by 2002:adf:e548:0:b0:32d:8830:ee2 with SMTP id
z8-20020adfe548000000b0032d88300ee2mr9737074wrm.43.1698774699867;
Tue, 31 Oct 2023 10:51:39 -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.38
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 31 Oct 2023 10:51:39 -0700 (PDT)
From: Evgeny Pavlov <lucenticus@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Tue, 31 Oct 2023 18:42:30 +0100
Message-ID: <20231031174359.6757-7-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 10bit support v5 3/3] 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 <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Evgeny Pavlov <lucenticus@gmail.com>,
Dmitrii Ovchinnikov <ovchinnikov.dmitrii@gmail.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20231031174359.6757-7-lucenticus@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
v2: refactored after review
Signed-off-by: Evgeny Pavlov <lucenticus@gmail.com>
Co-authored-by: Dmitrii Ovchinnikov <ovchinnikov.dmitrii@gmail.com>
---
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;
--
2.41.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".