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 D88C1410B1 for ; Mon, 9 Oct 2023 09:56:44 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AB46768CA1B; Mon, 9 Oct 2023 12:56:40 +0300 (EEST) Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C4EF068C90C for ; Mon, 9 Oct 2023 12:56:34 +0300 (EEST) Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-9b98a699f45so729489766b.3 for ; Mon, 09 Oct 2023 02:56:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696845394; x=1697450194; 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=BQ3F1Gbf7MkiGOm3CmS9L8adFD/EDXz7vOlKE0R9abKR7BOryBd6y47UCTUUsfBu02 ITL0+s4oVvq0m++4sGMhPF0f0VDdnBs+RWalq+I0DtxCsh6PH9A2tLaco+jBo7Ihs/tr 443rXA18syxsacCUuqOARZQU4Mi+fh2wTA8ZGSP1zL5zrvixi31AYdquUNIklZozx95G miLK6ByfFzEfA7C3eHB4AN1D3wY4JCXcSEWfW3r29pdTT38Tx2ouWKj/sRhv4oGEFks1 iIPMMBHqzkjCVZu0en1K7KrY7GhPhro7Uj+uFS6Z0E8g4S62I9YXqyfULSsLHkRzNOVV EGHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696845394; x=1697450194; 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=scCIBkueTaqaRsMUNPmMHUc0a/BjWYth5nj7GSoF1kNsfY4slfeIDImDxUh1uJEPeS mjcinHQzfYRJrxqFRtFcKHxGkkENJNq3Ry9G3FPpkKbeV4DQdWy627bsrXIuL7SAEBg0 rwWtiaO68I2Aeh6/JPbS2Uq8nnhtG3w/i6ZHd0vn/+jfXgv85aIs5GamEfoMJj6t1gKj bGHx4xQJ0Rll9FJ5WIVLXl9WoDXBIuBZcHh1qQ3X2/gxHpnCXP8YVrpb/98dPyjAw+PA SBpgKBkODoc/NoV4N4KjUh7fcRRnuBqL+VYsr0EB2wtcQyd/L6sP/mrnrQn9oWPVm3RL 4LRg== X-Gm-Message-State: AOJu0YxWwJIqUE1Z74wOFS6HlLXLJPqp11C2nTKicwRvPREZDwSlhU2s 7y3GQoSsewUlBeNfeIOTnQXWdjzoC0f7awiew8M= X-Google-Smtp-Source: AGHT+IEe8dRBv/xkHdFvvsrXjkxj4dl5Aodne0uvev65KzOhl0RKBUy71Vbi8+NFyxMYSJoTcDxVog== X-Received: by 2002:a17:906:318f:b0:9a1:b05a:c07c with SMTP id 15-20020a170906318f00b009a1b05ac07cmr12221415ejy.55.1696845393499; Mon, 09 Oct 2023 02:56:33 -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 ca9-20020a170906a3c900b009adc743340fsm6547954ejb.197.2023.10.09.02.56.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 02:56:32 -0700 (PDT) From: Evgeny Pavlov To: ffmpeg-devel@ffmpeg.org Date: Mon, 9 Oct 2023 11:52:52 +0200 Message-ID: <20231009095340.41807-3-lucenticus@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231009095340.41807-1-lucenticus@gmail.com> References: <20230726113943.1140-1-lucenticus@gmail.com> <20231009095340.41807-1-lucenticus@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10 bit support, v4, 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 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: 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 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".