From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id CD7B848AED for ; Wed, 1 May 2024 18:39:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C19D668D70A; Wed, 1 May 2024 21:38:28 +0300 (EEST) Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A8CE68D6F9 for ; Wed, 1 May 2024 21:38:20 +0300 (EEST) Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-a5883518135so793675466b.3 for ; Wed, 01 May 2024 11:38:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714588699; x=1715193499; 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=7VOLezHTsoTsOS0oo+4eyxvfiUlPvhAxWMTXRubE+g8=; b=ZEu9XXJFoiMrQKlaAjv5MyJVOYgguhyS2+JNgsEkNy9DEI+D4ocRLs9w5Cejq5uJ96 RbtYqFXIcWaVfljfelqLofP+qQRbnzJD2JzPM20dRgU5WvS8L9KaMOuEcjCcEQQrnArG bhxobOUxvVADCKYZN8xTgjb+kKzCP1+X23aLhr9LM0d7ltMmLq1ETp0zIRA/3czDCPRp AmAHek0S1fM64dBXnWhqAi1WDu/FnWAscWsXppL4p5wnV4VHWkL0lk5yvHGN6XG0EjO4 l6vvYWshQxdmosoWOBHSFwwmMczGgnuW5Pl9Vi3vre0xEDKuVWudmnaVaUa/rQtcpEr0 zZug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714588699; x=1715193499; 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=7VOLezHTsoTsOS0oo+4eyxvfiUlPvhAxWMTXRubE+g8=; b=p+BcM7GWltrVEs4wSfq7i0H/OH55r8vgaK687DVkzxfwyDo+ccrrLHEn+A366IKkXR c+Az/kSkxg2Knm3doP25OA1k/5yzzBsgrhJr98hP4ThtM8weL8DIbsSHzjObIbAXzR9d TVhKGRJxvd1TQqW2tAdqWu53zTfbI6I83IhxQn5GYuVhL2Asmr0yydVTpneJRD+p03Au gDuiMu9e/fdX6gaDbiHUa716kwOhQ+LG05V0GM7Voe0zFPPpLXlxZIDmXKvLRJ7iZal1 JtGA2OXglDBFz2ELon2vN6PKUHWCLeuPmD1KOwvYFbH7m1GCe0DxyciKryyQMXb+7P9A +rOw== X-Gm-Message-State: AOJu0YwxT6MZfxH2gie3RdCUpSFo1g6ZCRblfl/1d3W3YZPFfvuz6GtN FsymmLWiqFrp+DuEPLD4SBVxGKtpPtusGxUJz4C6+MnqtbJYzklT+D11YpYD X-Google-Smtp-Source: AGHT+IExzRlYyl089m7I4IUqCcqHYtNC/WcB7QSLa9lD2QVphfMAx4/Frsp+DQF0pO2hOVQcIMsNXw== X-Received: by 2002:a17:906:f353:b0:a52:3f01:e11d with SMTP id hg19-20020a170906f35300b00a523f01e11dmr2373592ejb.34.1714588699349; Wed, 01 May 2024 11:38:19 -0700 (PDT) Received: from dovchinn.amd.com (cable-178-148-16-149.dynamic.sbb.rs. [178.148.16.149]) by smtp.gmail.com with ESMTPSA id kh20-20020a170906f81400b00a58bf434876sm7367337ejb.58.2024.05.01.11.38.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 May 2024 11:38:18 -0700 (PDT) From: Dmitrii Ovchinnikov To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 May 2024 20:38:04 +0200 Message-Id: <20240501183809.1060-5-ovchinnikov.dmitrii@gmail.com> X-Mailer: git-send-email 2.38.1.windows.1 In-Reply-To: <20240501183809.1060-1-ovchinnikov.dmitrii@gmail.com> References: <20240501183809.1060-1-ovchinnikov.dmitrii@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/10, v2] 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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; -- 2.38.1.windows.1 _______________________________________________ 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".