From patchwork Wed Jul 26 11:39:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Pavlov X-Patchwork-Id: 42995 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7528:b0:130:ccc6:6c4b with SMTP id r40csp458578pzd; Wed, 26 Jul 2023 04:45:45 -0700 (PDT) X-Google-Smtp-Source: APBJJlH3E2yy6487peP4KcUDiAappewuIIyudhtR/BrgG1ZEqiXKKGv+1wZ3xZoQ/MZXiI6c/+RY X-Received: by 2002:a17:906:74d8:b0:97d:2bcc:47d5 with SMTP id z24-20020a17090674d800b0097d2bcc47d5mr1526685ejl.49.1690371945683; Wed, 26 Jul 2023 04:45:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690371945; cv=none; d=google.com; s=arc-20160816; b=Pn5/Eqfoi42BQJF+vnWV9KWkjy8oUfHuVlNsxUDOhXPboCA3HGjPcDnDPbKLZ/3Wj5 guJ+T4w2dTcy1xHqfiOPLIS3Go/uHSAjyAtMO6PQ0QvMz+50e8ZZfT2YqCdmXdQBEQlQ tKtVzlzqwLUb8DdsSXe3Egy+GapI/ZUflrq+tUcW2do1vIq9znJaZtv4so7ZTUd1/Lsy 9bi9qLgDxsapbyI/Yi/hsyGIfBkl30OryVDn+bDZWVLI3ypVrQtAngdTRrhgJfAKfeNw iYPgUIb5p9bIVe3MXuv80NplMA+6LnYc0dmad8T00Wgufd7h7K9+6/1aRkplotinEmmB Rgmw== 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=TcIEdcudOp7YRfX2dgIHsgA5BoZaMthBIEefxrHp+dM=; fh=LFfhhmQxOykW3KntSZSFVLEF45T3WGpGALUVCHvC0O4=; b=iAO22WFA1/lPAfc5UIs8DhIbK4kGhP0vapQpP4FN7Jb5kNVIGg02LYkA7SgHzsjRRM MtXJvGcO8nVeTHC1gb67x/LHLbzd8An0KorNg7MeGCr7hfzsZnA6XMrwXNMJQpIvX3YG g0rM0v/6dUCvlWYop+8xuMFoZ3N8LK74JC8OwX2QwYCNPL++kl8FtxMc9AK3Ons+Jwsu zRKEl5IPpfEcJn9mlmFbDP8EIpkO85NkKEnuXW6NBJ254zJIk7vVbn2jsm5+C/hgQatw siu4fjC/qv/Zjrkpy1gBLkJhl50LoBIqlCwQ6MBKxZ+5IBNogEYryzhSufZZ9f+pe05T SVew== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b="U8b/dkhy"; 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 u24-20020a170906409800b009938d70d887si9036229ejj.382.2023.07.26.04.45.42; Wed, 26 Jul 2023 04:45:45 -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=20221208 header.b="U8b/dkhy"; 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 BB1EB68C957; Wed, 26 Jul 2023 14:45:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2B5FC68C94C for ; Wed, 26 Jul 2023 14:45:27 +0300 (EEST) Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-99bc02890c1so113701766b.1 for ; Wed, 26 Jul 2023 04:45:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690371926; x=1690976726; 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=VMc0a2Xn9d+1dLLKdsz4jD58GaI4PRplT+qKOKPYA0s=; b=U8b/dkhyHsyiRaNXbrjgP6SCNDTDIU6zW2fC5pNy+yL/myXZSdKbVd0kp4eUF5hOqj Gs9+AK6ZEUfokhdHwq7JngmVbCjxkkx+O21tWEgOcIY6jKOlTKKI8+avb0rxl8yE/VRA GrZY/orWnrq/j9OQOGd5bcnWmqtxWxJb7ajCCHaKctc3dTagMWKcdprUvL87qv5OTguB FfNZ/Ztn16FX+Aopk2L1Ao2s/0b0yFcskTRJjiue/7DH4jQqqJrtuqscN6FKqWGUUKPP SDn8NcuiBesa9Qt0GsSXXAdOBPeC4slEiMXVvLRyBQY8zyYd6pEcLpFrGptODsHVlyU9 d8xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690371926; x=1690976726; 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=VMc0a2Xn9d+1dLLKdsz4jD58GaI4PRplT+qKOKPYA0s=; b=Aq2Qzq4iUZyogNCAMLc7fo2kDeB7Ag2twytpMhCWLGC1gLLR4fmdKuea/2Na0UNdOJ 63WK3xjpWS/HstokSO3jp+KEnXyfHI58L/GtNHSM7BzlvHUj+eKp3IQcQOgIC8ZgvRVV LyF4D/R9Mje1hmh8nXkkkVzMW0+pu1Ooo/XP3aLzOGj50/qEJMflurU53t6ofFLyAaoS 4BjvhvSJEtuZPNgR9EBuovb6uv0sWVAJOjguzb5agi5FGl3ObnDeelapgfZEmFPmQPL4 JnAKD+VNkRSgf+dI7clsyo+qbclPhCPNfzaIvVdQurnzCFc6TqEzizbjIp11AlV5j0qf twYw== X-Gm-Message-State: ABy/qLbovC3mevH6hBmzhlUP0oiXRiWGqww5kxJzBTQeiMNqAYuwmmV5 MYC2HT6PlYjWMthbu8t5Mac06YGA9SRjR6uBigA= X-Received: by 2002:a17:906:224e:b0:982:45ca:ac06 with SMTP id 14-20020a170906224e00b0098245caac06mr1708746ejr.60.1690371926093; Wed, 26 Jul 2023 04:45:26 -0700 (PDT) Received: from MSDN-EVPAVLOV.amd.com (79-101-179-103.dynamic.isp.telekom.rs. [79.101.179.103]) by smtp.gmail.com with ESMTPSA id j1-20020a170906254100b00992076f4a01sm9411968ejb.190.2023.07.26.04.45.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jul 2023 04:45:25 -0700 (PDT) From: Evgeny Pavlov To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jul 2023 13:39:29 +0200 Message-ID: <20230726113943.1140-3-lucenticus@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230726113943.1140-1-lucenticus@gmail.com> References: <20220907134122.1244-1-ovchinnikov.dmitrii@gmail.com> <20230726113943.1140-1-lucenticus@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH avcodec/amfenc:, 10, bit, support, v3, 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: XhnpmcUEWWhR Signed-off-by: Evgeny Pavlov Co-authored-by: Dmitrii Ovchinnikov --- libavcodec/amfenc_av1.c | 47 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/libavcodec/amfenc_av1.c b/libavcodec/amfenc_av1.c index 30c0a9fad2..5c5313001d 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,50 @@ FF_ENABLE_DEPRECATION_WARNINGS } AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_PROFILE, profile); + // Color Metadata + /// Color Space & 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; + } + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_UNKNOWN; + + if (avctx->color_range == AVCOL_RANGE_JPEG) { + switch (avctx->colorspace) { + case AVCOL_SPC_SMPTE170M: + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_FULL_601; + break; + case AVCOL_SPC_BT709: + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_FULL_709; + break; + case AVCOL_SPC_BT2020_NCL: + case AVCOL_SPC_BT2020_CL: + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_FULL_2020; + break; + } + } else { + switch (avctx->colorspace) { + case AVCOL_SPC_SMPTE170M: + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_601; + break; + case AVCOL_SPC_BT709: + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_709; + break; + case AVCOL_SPC_BT2020_NCL: + case AVCOL_SPC_BT2020_CL: + color_profile = AMF_VIDEO_CONVERTER_COLOR_PROFILE_2020; + break; + } + } + 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 == FF_LEVEL_UNKNOWN) { profile_level = ctx->level;