From patchwork Tue Jun 20 23:50:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Airlie X-Patchwork-Id: 42264 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be15:b0:121:b37c:e101 with SMTP id ge21csp1742331pzb; Tue, 20 Jun 2023 16:51:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7+pJP4nu/MwN50GyxtmaNlOORCR7IYuDEgv/0eS5PpFHxvrmt+qT6GQ7ykiuKdtP3VhuWz X-Received: by 2002:a17:907:2d88:b0:988:56d1:10ca with SMTP id gt8-20020a1709072d8800b0098856d110camr9340515ejc.66.1687305068736; Tue, 20 Jun 2023 16:51:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687305068; cv=none; d=google.com; s=arc-20160816; b=R/0H1bN1ogd55BAxgEMIsRH+uRTc3LgLQ50yHOleEQSAwKe/paUq09WaLFqF0m43Vk z8IDNf5DIcXNMZnUxPS8ltUJdSZ+0y6ddvCziGz+d+ygZjIiE5GEDvHcWHzFs8yXddfk m6cOuZdDRI1YOZxeoRmCu+5KG4+QaJiSCv0AoU7Tc3FQ40fuif3d7iKnR9emPAXDMwdC 03Y4/sW2Ni8Ifm4DJkQ05Z0VgJ1w2EHQG1HJXT4eJsYvGHDEZNe6IzaXeG0EOdE8+8uY 2nzwYTFrhSgXmU+OWOL7pafgmQRafmrf+TWSyO3G5Uaf/julRhx+yynA7ncqm2/QUJrn aMig== 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 :delivered-to; bh=W3Msqgy9akHGrLT6WWEQojICQQiNmwARlJsl0ajOutM=; b=axcYFfF3vFpk5qgwR14jgWkNABFrTbGW88HPCKBzLnGJjuFNUrhvL3GTjEDTzNR3CW 3Em/+cO84+Qhiyc43QSX1KhzuAvq/G/S+MUUwab0O8msnkkLWbTMVhBYwODx9UhYm2aF IGDW3W4BNaBCfkte2cWZf5pG5LtgZhUoczutYfy9RkCfHGfyzNU0wgOAoTeWfg+FoSx/ 1Xur2dSrpjtR/AHS23JjCQsYwkxI9Aji5oBsdWflyvqvqyV+BGR+9V3Ix82OAr3rQKlQ gfPzwm0GN/i9MyAut819goKl591CdX0AGoORKwp2TBrXM8ZYVvLQcgjVkpAAHjj53Y/i QkuQ== ARC-Authentication-Results: i=1; mx.google.com; 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 b25-20020aa7d499000000b0051a47dc8f6csi1634038edr.31.2023.06.20.16.51.08; Tue, 20 Jun 2023 16:51:08 -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; 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 40C7668C124; Wed, 21 Jun 2023 02:51:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from us-smtp-delivery-44.mimecast.com (unknown [207.211.30.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5C00168B8AC for ; Wed, 21 Jun 2023 02:50:59 +0300 (EEST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-141-hcqt5sj1P7Sb246b3GI-xA-1; Tue, 20 Jun 2023 19:50:55 -0400 X-MC-Unique: hcqt5sj1P7Sb246b3GI-xA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9057280027F for ; Tue, 20 Jun 2023 23:50:55 +0000 (UTC) Received: from nomad.redhat.com (vpn2-54-59.bne.redhat.com [10.64.54.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id 929651400C34; Tue, 20 Jun 2023 23:50:54 +0000 (UTC) From: airlied@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Jun 2023 09:50:52 +1000 Message-Id: <20230620235052.1878524-1-airlied@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: gmail.com Subject: [FFmpeg-devel] [PATCH] vulkan/av1: fix tile upload offsets. 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: Dave Airlie Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4FIZfov9eQzG From: Dave Airlie This fixes decoding av1-1-b8-22-svc-L2T1.ivf while not breaking other videos. --- libavcodec/vulkan_av1.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/vulkan_av1.c b/libavcodec/vulkan_av1.c index 91e44ba803..005998b1bd 100644 --- a/libavcodec/vulkan_av1.c +++ b/libavcodec/vulkan_av1.c @@ -513,13 +513,15 @@ static int vk_av1_decode_slice(AVCodecContext *avctx, .tg_end = s->tg_end, }; - err = ff_vk_decode_add_slice(avctx, vp, data, size, 0, + err = ff_vk_decode_add_slice(avctx, vp, + data + s->tile_group_info[i].tile_offset, + s->tile_group_info[i].tile_size, 0, &ap->tile_list.nb_tiles, &ap->tile_offsets); if (err < 0) return err; -// ap->tiles[ap->tile_list.nb_tiles - 1].offset = ap->tile_offsets[ap->tile_list.nb_tiles - 1]; + ap->tiles[ap->tile_list.nb_tiles - 1].offset = ap->tile_offsets[ap->tile_list.nb_tiles - 1]; } return 0;