From patchwork Wed Sep 6 04:21:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 43576 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp2277973pzb; Tue, 5 Sep 2023 21:21:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHBiR8M7GWL2TEhjFxAGhl1Ma1sTjFPSmqPnNxrhbv4kl0VDbDGOfQM+CdZCsbG//r0rQhJ X-Received: by 2002:a17:906:cd1:b0:9a1:c376:9d7b with SMTP id l17-20020a1709060cd100b009a1c3769d7bmr987068ejh.32.1693974106100; Tue, 05 Sep 2023 21:21:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693974106; cv=none; d=google.com; s=arc-20160816; b=ck5vnJ7C9tW3zvoE0RYWUnHGb6vpI0uiHKhzEu6t7RC0cy3JBwUf/KO1QOA21FWFMm 0It1sjLZ79s42SVaEUvFdskfMmO95z4pCaF7vLluO11yTNimXdubpaXvswNBmT9NSpex 120X89JsLqxEl0zI9tTZErb1CRGOhIWEMN7wUyAXLSii2vGqaheQUEiPtKl+yB3yul+f iqfXoP/f2J3g5eaDU3pKlhFSivbd5E3wcZdnW+zo86qNlsqlfoFBHK9mkoq63zDfMTdm lmHl93Fv23IZ48RIY1fcg8uPc0xfYvXTQDxymZuvpJNF57iOgsh9nlBk8+hDM7DurvnJ EjOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:to:from:date :dkim-signature:delivered-to; bh=cyGqwAWNiqvlAAjw5mNefoQVHwsGkRb1vNhjmTzCY4w=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=h2lbhFE+dBbfKpwAa5BXEGG1GSvL+6PzDSaL37kpjIBdMHfnHlj7AfEQy8As5JLvKE sHqK4d4DnVIv5hVLGDWGiyu7+lkX9S7E1Wnv6o7jI6t4lQZaK/Bfumwm+96CKJvSElR8 3IYR4Luv/ZMf0prmonYP0Fy7ZM//bRnrLPN8Ot6sK3vdLlODcDDNP443CB4L8PtfEgLV t0CacszIyyR711xoHGL/EJ4Cs3fHq1BnAO+2m+GH5fjZ/vEIiRSHpqigMNtykLrS7/y4 Ar6752X9R6b9vZ54MD7U6ID78I4CPYvllQ7geRn0vS34GPUEUgUww+nw7tDwBSQN15Uy az6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@lynne.ee header.s=s1 header.b=RdGK6DB5; 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=NONE dis=NONE) header.from=lynne.ee Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ja8-20020a170907988800b0099e02fe7b8csi1602536ejc.799.2023.09.05.21.21.45; Tue, 05 Sep 2023 21:21:46 -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=@lynne.ee header.s=s1 header.b=RdGK6DB5; 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=NONE dis=NONE) header.from=lynne.ee Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 07B6A68C750; Wed, 6 Sep 2023 07:21:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from w4.tutanota.de (w4.tutanota.de [81.3.6.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C14CA680B62 for ; Wed, 6 Sep 2023 07:21:36 +0300 (EEST) Received: from tutadb.w10.tutanota.de (unknown [192.168.1.10]) by w4.tutanota.de (Postfix) with ESMTP id 79AB210600DF for ; Wed, 6 Sep 2023 04:21:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1693974096; s=s1; d=lynne.ee; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:References:Sender; bh=4CxuN872QNAE+AVOLmYuF0zyJTtw3Dikfej/DPT6hGo=; b=RdGK6DB5fTd/1fx4SSE4zPKuGGsbwSnwARprpwnstIK0jWDcfz1OkYGCTPUc2aMJ VipeNA/pXVj2rBH+2l279rPRnOaxHIHdNWG7/pHqkSui21gSyqDZATjx81bD101PERK tubjJMGUOjFUrG9saw4dw8d0OfNrxRQUHKUiHSnV8ymm+S+Kjb/o1JywhF19TAdPuig usTNgupMRvTYMbl3oRKdRy9srqVoc/ch1cTePxQ81zjHG5ro3VbED0QfJE6vQ5QeRNy HALUOv4lLaVKJdAMeNX90NnhAqpYnz9E4LIBYq/zKslivazLjUHF6RV94qNhLWMCbrf D99BCem3KA== Date: Wed, 6 Sep 2023 06:21:36 +0200 (CEST) From: Lynne To: FFmpeg development discussions and patches Message-ID: In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] vulkan_decode: convert max level from vulkan to av for comparisons 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: pZJax6jVQZyc The spec finally clarified the meaning of the field to: > maxLevelIdc is a StdVideoH264LevelIdc value specifying the maximum H.264 level supported by the profile, where enum constant STD_VIDEO_H264_LEVEL_IDC__ identifies H.264 level . as defined in section A.3 of the ITU-T H.264 Specification.1 Annoyingly, we have to convert it to an IDC value to compare it. Mesa commit: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24649 Only mesa currently uses the IDC value, all other drivers use the enum. Patch attached. From eea4b14917083ad1a8881e2793bdc045869d5b15 Mon Sep 17 00:00:00 2001 From: Lynne Date: Wed, 6 Sep 2023 06:15:32 +0200 Subject: [PATCH 2/2] vulkan_decode: convert max level from vulkan to av for comparisons --- libavcodec/vulkan_decode.c | 4 ++-- libavcodec/vulkan_video.c | 45 ++++++++++++++++++++++++++++++++++++++ libavcodec/vulkan_video.h | 7 ++++++ 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/libavcodec/vulkan_decode.c b/libavcodec/vulkan_decode.c index 1b2ff0045d..d97abe8896 100644 --- a/libavcodec/vulkan_decode.c +++ b/libavcodec/vulkan_decode.c @@ -837,8 +837,8 @@ static int vulkan_decode_get_profile(AVCodecContext *avctx, AVBufferRef *frames_ return AVERROR_EXTERNAL; } - max_level = avctx->codec_id == AV_CODEC_ID_H264 ? h264_caps.maxLevelIdc : - avctx->codec_id == AV_CODEC_ID_H265 ? h265_caps.maxLevelIdc : + max_level = avctx->codec_id == AV_CODEC_ID_H264 ? ff_vk_h264_level_to_av(h264_caps.maxLevelIdc) : + avctx->codec_id == AV_CODEC_ID_H265 ? ff_vk_h265_level_to_av(h265_caps.maxLevelIdc) : avctx->codec_id == AV_CODEC_ID_AV1 ? av1_caps.maxLevelIdc : 0; diff --git a/libavcodec/vulkan_video.c b/libavcodec/vulkan_video.c index 9a363aab02..236aa124bb 100644 --- a/libavcodec/vulkan_video.c +++ b/libavcodec/vulkan_video.c @@ -154,6 +154,51 @@ VkVideoComponentBitDepthFlagBitsKHR ff_vk_depth_from_av_depth(int depth) return VK_VIDEO_COMPONENT_BIT_DEPTH_INVALID_KHR; } +int ff_vk_h264_level_to_av(StdVideoH264LevelIdc level) +{ + switch (level) { + case STD_VIDEO_H264_LEVEL_IDC_1_0: return 10; + case STD_VIDEO_H264_LEVEL_IDC_1_1: return 11; + case STD_VIDEO_H264_LEVEL_IDC_1_2: return 12; + case STD_VIDEO_H264_LEVEL_IDC_1_3: return 13; + case STD_VIDEO_H264_LEVEL_IDC_2_0: return 20; + case STD_VIDEO_H264_LEVEL_IDC_2_1: return 21; + case STD_VIDEO_H264_LEVEL_IDC_2_2: return 22; + case STD_VIDEO_H264_LEVEL_IDC_3_0: return 30; + case STD_VIDEO_H264_LEVEL_IDC_3_1: return 31; + case STD_VIDEO_H264_LEVEL_IDC_3_2: return 32; + case STD_VIDEO_H264_LEVEL_IDC_4_0: return 40; + case STD_VIDEO_H264_LEVEL_IDC_4_1: return 41; + case STD_VIDEO_H264_LEVEL_IDC_4_2: return 42; + case STD_VIDEO_H264_LEVEL_IDC_5_0: return 50; + case STD_VIDEO_H264_LEVEL_IDC_5_1: return 51; + case STD_VIDEO_H264_LEVEL_IDC_5_2: return 52; + case STD_VIDEO_H264_LEVEL_IDC_6_0: return 60; + case STD_VIDEO_H264_LEVEL_IDC_6_1: return 61; + default: + case STD_VIDEO_H264_LEVEL_IDC_6_2: return 62; + } +} + +int ff_vk_h265_level_to_av(StdVideoH265LevelIdc level) +{ + switch (level) { + case STD_VIDEO_H265_LEVEL_IDC_1_0: return 10; + case STD_VIDEO_H265_LEVEL_IDC_2_0: return 20; + case STD_VIDEO_H265_LEVEL_IDC_2_1: return 21; + case STD_VIDEO_H265_LEVEL_IDC_3_0: return 30; + case STD_VIDEO_H265_LEVEL_IDC_3_1: return 31; + case STD_VIDEO_H265_LEVEL_IDC_4_0: return 40; + case STD_VIDEO_H265_LEVEL_IDC_4_1: return 41; + case STD_VIDEO_H265_LEVEL_IDC_5_0: return 50; + case STD_VIDEO_H265_LEVEL_IDC_5_1: return 51; + case STD_VIDEO_H265_LEVEL_IDC_6_0: return 60; + case STD_VIDEO_H265_LEVEL_IDC_6_1: return 61; + default: + case STD_VIDEO_H265_LEVEL_IDC_6_2: return 62; + } +} + static void free_data_buf(void *opaque, uint8_t *data) { FFVulkanContext *ctx = opaque; diff --git a/libavcodec/vulkan_video.h b/libavcodec/vulkan_video.h index 183ce89bf0..b28e3fe0bd 100644 --- a/libavcodec/vulkan_video.h +++ b/libavcodec/vulkan_video.h @@ -71,6 +71,13 @@ VkVideoChromaSubsamplingFlagBitsKHR ff_vk_subsampling_from_av_desc(const AVPixFm */ VkVideoComponentBitDepthFlagBitsKHR ff_vk_depth_from_av_depth(int depth); + +/** + * Convert level from Vulkan to AV. + */ +int ff_vk_h264_level_to_av(StdVideoH264LevelIdc level); +int ff_vk_h265_level_to_av(StdVideoH265LevelIdc level); + typedef struct FFVkVideoBuffer { FFVkBuffer buf; uint8_t *mem; -- 2.40.1