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 1F5BD4BB7D for ; Mon, 15 Jul 2024 09:30:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C9CB568DA1F; Mon, 15 Jul 2024 12:30:06 +0300 (EEST) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6DADB68D73E for ; Mon, 15 Jul 2024 12:29:59 +0300 (EEST) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4279c10a40eso24585355e9.3 for ; Mon, 15 Jul 2024 02:29:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721035798; x=1721640598; 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=meKTxPPSUZBhzl3bDAVSatP4YewFPEvo3OeRq/JTqTI=; b=AhXTr6+WwyJNkYJQQp8jfqz/CdXHYTVoP4Twf63iX2R1i4NhAJPTMMT1wZEUowv+XI 2ULiU9qLR99aBTx0jtM9ZEHSOTzQqGuzcwHYVxHvFY+GrFK4UQg7CQvvnysE/do7Xhuh B3Q5v8wW4E+3vU2s3ggweFiD4zO+PE8rTRkXEVLnuX8HH6TdxMa7jLkLhd4CYdJOEhrQ dAPP40WBuvylGyEnD+iIXZh0ZTzJLbmVsTwerV8Iq4E0Wp1XWjOrJRxQXrhXtAyOPpbx wy/xfK9LIrDD145nt49ox+6cGQNmQUTPa2p8Y1d1CCdJgXCzPIH2tVTLf4m+PbcnkXAQ NX+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721035798; x=1721640598; 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=meKTxPPSUZBhzl3bDAVSatP4YewFPEvo3OeRq/JTqTI=; b=IroesNTVi+3l7Nf+y+UCWwCIZwTzNeXQ0u7jBQUSEL8TDOzv3JNTLN9CktpxWXIS9j FsLcgV8x0pcz9qHfzwIsh8yasm7uiGZGcOViPlJkkYiQkQFUyEGUNHDXfbQs0j2PXZks 6zTuu9hVX6UuPvQW4XHZHBMEr2yl3u/VveAELyY3tnzrDWzyjju7YNWv+DLpcEFRJL3P AaNAoNjAe9RuRxUwVCYs6cSLspJgkGsMONh/OUdKqEXa+qoNuRO4se79ewqEj/rVoKFo U/SMshAB8ad9ROKacd9EnbT9g6YQtO4rylnIzZ8GZftxCsZZquZtcf4/69u+Tq+cTeJD eojg== X-Gm-Message-State: AOJu0YyuLJz1m35+1pNjG6sy74gXVbZVbh7rmXCSDiE6TpyoO9bwNgw2 oRcGtixF0daPnTWSdGWWTC7ZkHt/i70ZBzxJ20zfFd+pk/bxb6GothYf8rsQ6uc= X-Google-Smtp-Source: AGHT+IGd+ZGqIo1QXP0LGC41ukUtVBMALApziIzjkkaigYDfUJ1gcnh0++vLzcYnMqMttUDjqGSeqg== X-Received: by 2002:a5d:4491:0:b0:367:9754:810c with SMTP id ffacd0b85a97d-367cea965b9mr10728376f8f.38.1721035798060; Mon, 15 Jul 2024 02:29:58 -0700 (PDT) Received: from aiusubov.amd.com ([87.116.132.223]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3680db038f4sm5703856f8f.94.2024.07.15.02.29.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 02:29:57 -0700 (PDT) From: Araz Iusubov X-Google-Original-From: Araz Iusubov To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Jul 2024 11:29:44 +0200 Message-ID: <20240715092945.521-3-Primeadvice@gmail.com> X-Mailer: git-send-email 2.45.2.windows.1 In-Reply-To: <20240715092945.521-1-Primeadvice@gmail.com> References: <20240715092945.521-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 , 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: v2: refactored after review Signed-off-by: Evgeny Pavlov Co-authored-by: Dmitrii Ovchinnikov --- libavcodec/amfenc.c | 2 ++ libavcodec/amfenc_av1.c | 27 +++++++++++++++++++++++++++ 2 files changed, 29 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 d40c71cb33..a8629d74b0 100644 --- a/libavcodec/amfenc_av1.c +++ b/libavcodec/amfenc_av1.c @@ -166,6 +166,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; @@ -211,6 +214,30 @@ 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); + if (color_depth == AMF_COLOR_BIT_DEPTH_8) { + /// Color Transfer Characteristics (AMF matches ISO/IEC) + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_TRANSFER_CHARACTERISTIC, AMF_COLOR_TRANSFER_CHARACTERISTIC_BT709); + /// Color Primaries (AMF matches ISO/IEC) + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_COLOR_PRIMARIES, AMF_COLOR_PRIMARIES_BT709); + } else { + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_TRANSFER_CHARACTERISTIC, AMF_COLOR_TRANSFER_CHARACTERISTIC_SMPTE2084); + AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_COLOR_PRIMARIES, AMF_COLOR_PRIMARIES_BT2020); + } + profile_level = avctx->level; if (profile_level == AV_LEVEL_UNKNOWN) { profile_level = ctx->level; -- 2.45.2.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".