From patchwork Tue Aug 1 14:18:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Cheng X-Patchwork-Id: 43060 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c11f:b0:130:ccc6:6c4b with SMTP id bh31csp6739pzb; Tue, 1 Aug 2023 07:18:50 -0700 (PDT) X-Google-Smtp-Source: APBJJlGG24TXxN2GtD31Z7zzgpQzC6PEB9Kz0P1WoKSn/Q8z16vxc7HRHvrrtDJ5g2WUunadEnuY X-Received: by 2002:a17:906:10c:b0:99b:ed53:5c12 with SMTP id 12-20020a170906010c00b0099bed535c12mr2656311eje.17.1690899530141; Tue, 01 Aug 2023 07:18:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690899530; cv=none; d=google.com; s=arc-20160816; b=t/t8sofaamkfg1sEoeQuCtfkBwNIoMsKbsLzmyca22AtG+78xEH6Tr5tQ2Wnwk5aW4 hAEdIJeSznIRXJBSDnBoTe3llSlKapih04xDycLHiIQDTALhO6vDnKhcT3f4yA7VkWBa gyovQI6KK6+5bBU6BcgJCQi4OHJavK2sR4fGUUTIEkkqdApZVNkKftTDsk5Xq5vfydQY fSmXXAYJrCJuH8R5CtBY1IZ+6dP/YXVD0TL9W7Xsk5nc5UOm0o+nM1n9mfAauNPl+SJX Wzm/0X44MbyEvMZ04ta8jZgzTuzFWofDRbcAoPMg409CRTsQ3YMMM4024cJ4x2VD8ght /ajw== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=2fNvrHSce86koZ2A3Kbfd0gRouyqPsxbRoL8oZQ+j2Y=; fh=nIiBA5N5VLEOhrD4Hg6puXpJPA/uiw+r2g9MqSStBWs=; b=JdM0j55fTcQq9VrmwKIkdUHc/5Ld66b5S0JlVjllpS9HfvmJ5et+rsHjSHNDsAWz7w 42fHrKzLpYFwT6Nn5CFR/Di5lX8du8J6GikjGRUg1BuWWAlYPUVx6c7aIObtguCYnmbl HdlMGlhZvwTp4NKpoiJxLFWvto7dHVJ6h2H7dXVO39OOZ/TNm3urCQ6qIebCDmrq2jNZ 1hC6z+ajaJ46egQVpeONHzW5bZp3dv0sPoNcu0gHR6KhYRoHtE3KrH7PDuhRV48zCdXc dvn02F8xGJsaozrCO+AyqHaB5Kddn7SnIHF8rwHE2kTT/2VnTYclbBWgiL4qWUW6xUN9 IR0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@bcheng.me header.s=key1 header.b=ewTAJzcs; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bcheng.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s13-20020a1709060c0d00b0099bc9896c74si5068138ejf.175.2023.08.01.07.18.49; Tue, 01 Aug 2023 07:18:50 -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=@bcheng.me header.s=key1 header.b=ewTAJzcs; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bcheng.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 72382687FAE; Tue, 1 Aug 2023 17:18:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out-112.mta0.migadu.com (out-112.mta0.migadu.com [91.218.175.112]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1276068BCFB for ; Tue, 1 Aug 2023 17:18:39 +0300 (EEST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bcheng.me; s=key1; t=1690899518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=iKXFLPszuWQQJbPVCOmoZoPqyTBdmW5c1Qr3uvu+KRg=; b=ewTAJzcsi4ao4crWIaJ2KRZ8NQSG6LqpkqKp0rLR2xaca4S0qX0CKM/ElK0/OoWGWZ50cV nHf6FsudLgXVN46Igd4BY6jyIxCrH2oFYSLEhjFJCL99hC+mFQk/yYGt//zWAjvD6IvzGV POizc3+zOgym3ct3vKwsF8dPnjN/DMAgWejprT3idiWi4Ul4/KI797dVfW0t/KbRn9yE1b mKekMM5X5z5kjKXrzBo5rBAiY5OvPtGnA6ITTYkk3jdZ4R9QeTWdwKboJbM7A/PsSp9ycc Bv9VxlxhNeNLIySBYtpKcfQ6h4zbio1ed5xLKTJkr+yheQ7gNseXGACcBTe6sw== From: Benjamin Cheng To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Aug 2023 10:18:01 -0400 Message-ID: <20230801141801.2324-1-ben@bcheng.me> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT Subject: [FFmpeg-devel] [PATCH v2] vulkan_h264: fill correct ScalingList8x8 entries 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: Benjamin Cheng Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: uMXOIz7zpQgq The Vulkan spec wants ScalingList8x8 as defined by ITU spec, which is in a different order from how ffmpeg parses it. --- libavcodec/vulkan_h264.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/vulkan_h264.c b/libavcodec/vulkan_h264.c index 84bcef7933..9d4ffa1f9d 100644 --- a/libavcodec/vulkan_h264.c +++ b/libavcodec/vulkan_h264.c @@ -43,6 +43,9 @@ typedef struct H264VulkanDecodePicture { VkVideoDecodeH264PictureInfoKHR h264_pic_info; } H264VulkanDecodePicture; +const static int h264_scaling_list8_order[] = { 0, 3, 1, 4, 2, 5 }; + + static int vk_h264_fill_pict(AVCodecContext *avctx, H264Picture **ref_src, VkVideoReferenceSlotInfoKHR *ref_slot, /* Main structure */ VkVideoPictureResourceInfoKHR *ref, /* Goes in ^ */ @@ -147,9 +150,9 @@ static void set_sps(const SPS *sps, STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS * sizeof(**sps->scaling_matrix4)); for (int i = 0; i < STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS; i++) - memcpy(vksps_scaling->ScalingList8x8[i], sps->scaling_matrix8[i], + memcpy(vksps_scaling->ScalingList8x8[i], sps->scaling_matrix8[h264_scaling_list8_order[i]], STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS * sizeof(**sps->scaling_matrix8)); - + *vksps_vui_header = (StdVideoH264HrdParameters) { .cpb_cnt_minus1 = sps->cpb_cnt - 1, .bit_rate_scale = sps->bit_rate_scale, @@ -252,7 +255,7 @@ static void set_pps(const PPS *pps, const SPS *sps, STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS * sizeof(**pps->scaling_matrix4)); for (int i = 0; i < STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS; i++) - memcpy(vkpps_scaling->ScalingList8x8[i], pps->scaling_matrix8[i], + memcpy(vkpps_scaling->ScalingList8x8[i], pps->scaling_matrix8[h264_scaling_list8_order[i]], STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS * sizeof(**pps->scaling_matrix8)); *vkpps = (StdVideoH264PictureParameterSet) {