From patchwork Mon Jul 31 22:53:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Cheng X-Patchwork-Id: 43054 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4c89:b0:130:ccc6:6c4b with SMTP id fq9csp45557pzb; Mon, 31 Jul 2023 16:06:14 -0700 (PDT) X-Google-Smtp-Source: APBJJlHQs+ntuRIzbDHeM7kMu+ZRlWl5M0yB6xPw5tmKOgoQOe94O6UlPBhLAs0pg8V13AFvNhDg X-Received: by 2002:a05:6402:358f:b0:51d:b184:efd with SMTP id y15-20020a056402358f00b0051db1840efdmr1210061edc.20.1690844774152; Mon, 31 Jul 2023 16:06:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690844774; cv=none; d=google.com; s=arc-20160816; b=wpTTMOUm8SLZBMGElADIgEUqjIfZeNxBCIo3i8Q5ObqwsXIAJ/37xG577ROUUJWJnr VbEO8ki7JSGDrEJyG93PystpZ+l1aNbKbwFHQ+6dQ9Tu1s9A5UCNTF8OdaWX0qmaembA 7dDVqX5e67pJVaORfdaMY9+SBl7UDW447+YaSwNU/VALDRqxbUt6Yz498/p+xEy4diS1 RVV8wxYVRiTDq0caLFUvkV9JDvkEcxEeih+FImvgE/G+tSKKIl3QnA040EMJsrnDQQSp NJHn6dea7wrjpIZei4fXn/ruJKIeGYG6CXZXnXhkHyrRvRnEiKIJHUU0NCobZbTrd7SY glGg== 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=Uv22Qf+CeeXKZj5Z8Y9h9NOpNO/xFDzVYcwxmpuWTbA=; fh=nIiBA5N5VLEOhrD4Hg6puXpJPA/uiw+r2g9MqSStBWs=; b=cK7URql9Ximd13aoydInCukSmm2QA9rLlln/VMFBqFurKrQJwJx+2xkjfCHndLwL+L McTn28T5TNwusIhdUA3s/vCZrrvdgQC0tLU17ytiOySuqEqAxBFiDpJt6esRuFpu5SyR 873m+F2Qe3Kdnkxs+EI49ChUaHawjs8Rr0f03uUQpGRMxvV/Moq536xYSGcNhjJwG+6/ 8Em+fFOdsGly37aRvPWpZyMLYTen980ZoAACJg7/P1FYhfmiSCPMtTTxaEPv3eGdpx3e 91m4iwuED/LOXSbxVzWGwvIZ11H913PlmAH5TUTlkgExuUOkxcnXTYijrnPse8jWOq2u NtTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@bcheng.me header.s=key1 header.b=WTf3z+xq; 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 x18-20020aa7d6d2000000b00521764d4012si4371899edr.213.2023.07.31.16.06.13; Mon, 31 Jul 2023 16:06:14 -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=WTf3z+xq; 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 B8E7968C3A4; Tue, 1 Aug 2023 02:06:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out-71.mta1.migadu.com (out-71.mta1.migadu.com [95.215.58.71]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F97668C152 for ; Tue, 1 Aug 2023 02:06:03 +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=1690844762; 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=xlFe79oerlvxkCmujUOneAtFNNyF8ocfJCTU0MSkGyM=; b=WTf3z+xqNkS2JyVDbxgMdN9motZ0AwcheJ096uWL0gWcCoirMqK4LtkfRuQyJPy5cAW8uZ OV87rdhMBjdvZ2ElUeCPn0VmZsKC1pYkfiuaAocaHo+kPAL4+2rbLU4C26SLUBIa3ghWWK 1dYp41vpnYU4zzzZ4CAzR/Q1nPuDI/0DeIsaZXAYSn9E8COVfEPu3EAWCBWxCQPVgTgkce 49nUw2507yg7lQubIzypk0It+RY6uyajfZUfWKuYtdOAqWgOHvHnQ+iCu0FmgQQjNmStTH MdvUqo0X7KhCwGIu+C1mCXYFfxHwoF0t/t5X5qKtwiaFYTwmnYx2EYqT0/kiFg== From: Benjamin Cheng To: ffmpeg-devel@ffmpeg.org Date: Mon, 31 Jul 2023 18:53:14 -0400 Message-ID: <20230731225314.9407-1-ben@bcheng.me> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT Subject: [FFmpeg-devel] [PATCH] 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: TbvNiUtTBAyt The Vulkan spec wants ScalingList8x8 as defined by ITU spec. The latter only defines ScalingList8x8[0] and ScalingList8x8[1] when chroma_format_idc != 3. --- libavcodec/vulkan_h264.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/libavcodec/vulkan_h264.c b/libavcodec/vulkan_h264.c index 84bcef7933..0d81ae8a3c 100644 --- a/libavcodec/vulkan_h264.c +++ b/libavcodec/vulkan_h264.c @@ -146,9 +146,17 @@ static void set_sps(const SPS *sps, memcpy(vksps_scaling->ScalingList4x4[i], sps->scaling_matrix4[i], 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], + if (sps->chroma_format_idc == 3 /* yuv444 */) { + for (int i = 0; i < STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS; i++) + memcpy(vksps_scaling->ScalingList8x8[i], sps->scaling_matrix8[i], + STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS * sizeof(**sps->scaling_matrix8)); + } else { + /* All other chroma formats have only 2 scaling 8x8 matrices. */ + memcpy(vksps_scaling->ScalingList8x8[0], sps->scaling_matrix8[0], STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS * sizeof(**sps->scaling_matrix8)); + memcpy(vksps_scaling->ScalingList8x8[1], sps->scaling_matrix8[3], + STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS * sizeof(**sps->scaling_matrix8)); + } *vksps_vui_header = (StdVideoH264HrdParameters) { .cpb_cnt_minus1 = sps->cpb_cnt - 1, @@ -251,9 +259,17 @@ static void set_pps(const PPS *pps, const SPS *sps, memcpy(vkpps_scaling->ScalingList4x4[i], pps->scaling_matrix4[i], 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], + if (sps->chroma_format_idc == 3 /* yuv444 */) { + for (int i = 0; i < STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS; i++) + memcpy(vkpps_scaling->ScalingList8x8[i], pps->scaling_matrix8[i], + STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS * sizeof(**pps->scaling_matrix8)); + } else { + /* All other chroma formats have only 2 scaling 8x8 matrices. */ + memcpy(vkpps_scaling->ScalingList8x8[0], pps->scaling_matrix8[0], STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS * sizeof(**pps->scaling_matrix8)); + memcpy(vkpps_scaling->ScalingList8x8[1], pps->scaling_matrix8[3], + STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS * sizeof(**pps->scaling_matrix8)); + } *vkpps = (StdVideoH264PictureParameterSet) { .seq_parameter_set_id = pps->sps_id,