From patchwork Thu May 30 13:08:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitrii Ovchinnikov X-Patchwork-Id: 49396 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:5c1:0:b0:460:55fa:d5ed with SMTP id 184csp298912vqf; Thu, 30 May 2024 06:09:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXBJ4BcbjIVx39XRoEPQIjY2fBwjqTPt1w4LuJNcXM0xVftg1pOnYnKTOy4sWICGM8cCcFQx2XilATsaqfL1EY4K6ik3lKrr8JGMA== X-Google-Smtp-Source: AGHT+IFVZHYxojBCD+Yomk5nuAqwIGF/uhf0JqlJ1JCtUpY5lAQzn3og0L0DmYZzmwNAxLrnQtfY X-Received: by 2002:a50:bb66:0:b0:574:e1c4:6ea4 with SMTP id 4fb4d7f45d1cf-57a177c52eamr1408972a12.10.1717074578198; Thu, 30 May 2024 06:09:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717074578; cv=none; d=google.com; s=arc-20160816; b=C/q5gJUylXaUWEAD/hEonDIxesQGH6OraQUtqsNb+axxylZFTqp4xTaI/VEI/auTXm lyQMOE/zvV3/MTqxvk2OIxNGfipsJR22f5FcOMGbZfxwbX9yo6dbtsoiPzdJr8qLHqLn qJByQuHkCI2Fmy+s0WvjZNZoRTzvVSBEZMEznxE6/ZGipXiCEN0KDF4cZsIb32nFEbi/ 4caMamGIMl3TUGyn7ieXzbLt+6NyPjPAoMzp4BnfJ5BYKr6khY6xvQqUhgiOIdKw77ly X4MEBmO/Fu5kxobPuz5PRCUens8c4EtrTCq6B/6GLWYDwql4jgd2mUDjcNnUTv63zqQS db+w== 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=fQ3r66WVQv2kkEdKJBF9yTJlz8utDW+l02lqu3Glp7Q=; fh=ZIZ7Ej7aoSMNmZSSnSJ7NXY4c5NrV8up1kK8HgJcvhA=; b=iNZ3QoZPbTSTB8KdZOi/w9PI2HezPl3uDzPfD20Go5RwsaoK6O9/Glf/ba5cJMYX6/ WksIXGzWCNkWCmav9ma0mR8xprt8rJUzJqBjgFG7lbYSN1u4c05ppOKd9kSnlWf9lMeq r/22Wd75IXnW+O9CL1gol3h4fIQPo6NULmBZHjKJ4CF+jilCNwxGVODUVTX1NJjloC/0 fA6AjNbOuLYUqLuBKGkUlhmReEJPI/6c/kh7YmiZtzLdJ8llA0UuEEjK/DIruV2Mt1ZO 5VqERRt5csnhhkdfO5j1zpu5PIdXckr0yxo3gPrQZ5EKxttEENUND0zbfiyffVIY1qVX qd7A==; 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="M/CRf8H5"; 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 4fb4d7f45d1cf-579b633f20dsi6233049a12.517.2024.05.30.06.09.37; Thu, 30 May 2024 06:09:38 -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="M/CRf8H5"; 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 2B6F868D499; Thu, 30 May 2024 16:09:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f174.google.com (mail-lj1-f174.google.com [209.85.208.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5916C68D472 for ; Thu, 30 May 2024 16:08:53 +0300 (EEST) Received: by mail-lj1-f174.google.com with SMTP id 38308e7fff4ca-2e95a60dfcdso10303791fa.1 for ; Thu, 30 May 2024 06:08:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717074532; x=1717679332; 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=dxZqFLYWKuZm2W2zRcd4lg65wEK82QHx1bqDKWBw5DE=; b=M/CRf8H5JGB94vxsd8tDOHLgjQXTAR+kj+ouNDG3H2bX2McCgbRC9eDEmc+7NNNWe9 v8qAW3o+Keu6jG6mw7y7G704HgJ9We+MsNRaSNoqmow/yosdmsKUZ7lFTQUM9N7Y+5bD hyvODn2IFjUW/lgJqPkAn4medHLALmnIog1t6UfKykSuB6HJoOmS4bdFjx1e6BNKlDfM 0TgGczoDiB2AnfE0Lr4Pb2yP+wqslexRZzQisERrRd+QeLKkEihmv+2FMRwpLUuKQuph FdoGBsIu+qR3/sTiwUejb86HOX+gBVtYljFi+vjVWAjBmbpfcUxElVJtdEbnRI3ni+Oo vXYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717074532; x=1717679332; 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=dxZqFLYWKuZm2W2zRcd4lg65wEK82QHx1bqDKWBw5DE=; b=PnwpMqIc081ZiyVG1UL6U/wf6+coit5H6/hzfYP6Ib5iChyyb/nErMxttV2tQ32oHp BfmWI8CuEq61N+N8kp2HcAQGfAPJoxzfqAgIHYkatN5zx4Jk/foteX4VF/9JsA65dWtY EnMY21hZbNOfu0t+pTdyochevMkrw6utLtuU3ZKhZTRMhVHWW6dzjRwGDD/dOHkFiIXB z7LMpcfh9/w57kMYTznY/4eJEYa8PDu5ns8W36ajkivYSPtKaukcVpsGG6EN+qI5fGUo kaTI+zKV4Lqv9Ypud5tRhgg455uO26N8DNdpYnOQNotlS9yd9Km3L19yj7aavfc1FF0v zP6Q== X-Gm-Message-State: AOJu0YwqoyKKu1dY9OAv8zhOxQEKquUdfUSkomNOqlpgvBPaqyz44CZ9 2L9Cds5GRYeX3A/NUP7XRR7qreQfO/aTV+civ+d5/yv27fNZgBjJSwJQrDeyZCk9jYVM0GMHdg= = X-Received: by 2002:a2e:a681:0:b0:2ea:7688:4e8d with SMTP id 38308e7fff4ca-2ea84899b5emr9537481fa.49.1717074531861; Thu, 30 May 2024 06:08:51 -0700 (PDT) Received: from localhost.localdomain ([87.116.134.204]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3557dcf03c2sm17710671f8f.96.2024.05.30.06.08.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 May 2024 06:08:51 -0700 (PDT) From: Dmitrii Ovchinnikov To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 May 2024 15:08:21 +0200 Message-ID: <20240530130826.374-5-ovchinnikov.dmitrii@gmail.com> X-Mailer: git-send-email 2.45.1.windows.1 In-Reply-To: <20240530130826.374-1-ovchinnikov.dmitrii@gmail.com> References: <20240530130826.374-1-ovchinnikov.dmitrii@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/10, v3] 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 , Araz Iusubov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: caotz/t9Ol8H From: Evgeny Pavlov v2: refactored after review Signed-off-by: Evgeny Pavlov Co-authored-by: Araz Iusubov --- 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..49dd91c4e0 100644 --- a/libavcodec/amfenc.c +++ b/libavcodec/amfenc.c @@ -746,6 +746,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; } 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); diff --git a/libavcodec/amfenc_av1.c b/libavcodec/amfenc_av1.c index 9f18aac648..cc48e93fcb 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;