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 E6A5149558 for ; Wed, 14 Feb 2024 01:56:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7F44368D1E0; Wed, 14 Feb 2024 03:55:45 +0200 (EET) Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D706F68D16C for ; Wed, 14 Feb 2024 03:55:35 +0200 (EET) Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-a3832ef7726so596510166b.0 for ; Tue, 13 Feb 2024 17:55:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707875735; x=1708480535; 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=AcMOmLMKzscjDGeJvZ0PfrBVtpBiKsUbNlGdEdzAOgg=; b=K8iwt68bKoz7k9dbtuo7UTB5K9owDEKiGzx0FZ6aqw8Us6G8fQI7JKWaQjaguermXt aZg5xpFj4kDNLS2Cb7bRap5yIH0YISsR8sMnYcskNnwvZNiWTUoGiqd+sa0ZT5w3IUEH CT81jZ3CJ5T6pSzJmi9Rdd78jtJ9cSSxO7KVKt3255W+pRHtdmP2YcIC/6if2FSLi5YQ daEOCehzlJihEAfRtoAYsCQtjKWf6qyjrSBU5AG9ruKyhR3U85mBvfbE5Yur/5YUEt0d s1Y8A8tzMqqSXfnVRofB9OV5oKCHBU69p0aI1ai4wbS50nP+hEZT3Jm5S+i13CEjDfEO d7Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707875735; x=1708480535; 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=AcMOmLMKzscjDGeJvZ0PfrBVtpBiKsUbNlGdEdzAOgg=; b=haDc8qLKyhe+ydjbL0gijM0WnrkentoFZWncoZgP0fBbvxuUpnBiP8PoFV2VR5JuQd wDB4l77gzy+jtgdU4qU7iWNoVbtQdgPCBv2FoO5yx3XI6wtwn7Xye88alwgPER3WWDAi 8/II6mIZiqwf9Pk+pYy222wiWuSE5CbQDN1P4NajgrhOeh6eo7aPTQw8PTOzshBd1vqG 12m2uvIpNrgCw0H8JfeCrjRDEtC3aNEiTobkJyrANa24ozsiP1IXpg1+w/kVhJaJ9PhQ BCgB+Eg8hKOFHtCVcgJrJDF6gYJUbeUjZ3cOaq07nIrLRjicG5zap4fwo8BK//YeqTdC Gqkw== X-Gm-Message-State: AOJu0Yw7jfFuyQF8K00i9akjROtU4IDMgiocYkGBRD+nabYjDtF2KeTz iD4wdgwowl5CuuCtdIQBwFuVotRTrSSarIl3xcqabw0P7Qwo1JP5otqeXU31kfc= X-Google-Smtp-Source: AGHT+IG7z6Jy6dLxhIqGXqll8oOgLnct+daDJxjd5HlLPZxwRmYLq3z2g+rYFBPmBgzO7RE3mJ1eAQ== X-Received: by 2002:a17:906:f6c3:b0:a3c:f71e:65dd with SMTP id jo3-20020a170906f6c300b00a3cf71e65ddmr658232ejb.59.1707875734679; Tue, 13 Feb 2024 17:55:34 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVLXzihxX9APZVeBtZtEEjJD20IygVsQhWxLuWNSDegxN94SE8/SSpZCeKB+OnqQCMe5dcwIipuTdiN3ghg7YzHKC9Cs7IvYsHjWaLJoA== Received: from dovchinn.amd.com (cable-178-148-16-149.dynamic.sbb.rs. [178.148.16.149]) by smtp.gmail.com with ESMTPSA id vi16-20020a170907d41000b00a3ce31d3ffdsm1663230ejc.93.2024.02.13.17.55.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 17:55:34 -0800 (PST) From: Dmitrii Ovchinnikov To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Feb 2024 02:55:11 +0100 Message-Id: <20240214015515.1027-5-ovchinnikov.dmitrii@gmail.com> X-Mailer: git-send-email 2.38.1.windows.1 In-Reply-To: <20240214015515.1027-1-ovchinnikov.dmitrii@gmail.com> References: <20240214015515.1027-1-ovchinnikov.dmitrii@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/9] 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 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: 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 3f164ccc59..9b32616aa8 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".