From patchwork Sat May 30 13:16:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 19986 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0C97944B5EE for ; Sat, 30 May 2020 16:45:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DACCE68A41E; Sat, 30 May 2020 16:45:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f195.google.com (mail-oi1-f195.google.com [209.85.167.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C20C688040 for ; Sat, 30 May 2020 16:45:14 +0300 (EEST) Received: by mail-oi1-f195.google.com with SMTP id m67so5196807oif.4 for ; Sat, 30 May 2020 06:45:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=RBdof3O67P3wtsL0HuKW694WVX+FOdKH9kfvSMam1vw=; b=vXTpJbu2yacxK1s/XURq+SrrIT/mJUz31Z+qLbFkhdlSafvOnNzzzBaXQgz0QKmojL //ItZtscsXT8wuCmvYMH0YRr2jUGOJcxD5j5LwjqqyxGCAZpjPjolSFOfFWXDYK78l89 YpcZiQI4kXgyj+RjMhLp5NY1kKeDCsBGYwt5dpfSb+tePXHofd26u2GxnIrJSbE4iz/5 sxyDhj5OVt5+z10Ui0XtbkXuSeidOm2uOASi8AsKTrZsklM09KvjkOOZDbpLayJERcaK PP+0PvkeRrMi5v4rA0UuA6IgLaLmPUr1oBk50yOO2OJtdjW/ToCRxDskVPMQKDP739TS KB0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=RBdof3O67P3wtsL0HuKW694WVX+FOdKH9kfvSMam1vw=; b=P+TB3l78chRUYQOXCSwX1DTMqwKNx9cH7Ar07pi+pzaRas0Qxa6xkgxC5qjTEPVzM1 F9WH4JQY+36m9DyR2zZOd9KbPrK5zvA7VoulBKi0gxtiwc2H1JZ5ohCkU8EjzgClmI0x bW716S+Xwl+j+5VDz9jT31au212qxyIGUYQBRgz9KeMlRGOYb8CSISG9JroI5ONeZO96 DtERCRVTZ3oCcC28Wnn7g0wQ1fKADg6pfcEAPCn++g7FJbNoJTHySbDurpKDwhcqhQbb i1Vn4TkZgO7iLtwV9zRoBBTynTquHpu1MeFusPi1kWpwosWZxWOcR2NxAg+NqrRNTySt YWEA== X-Gm-Message-State: AOAM532ZVrUnkXvkByVBB0dx82PWNhhx+CyH969PgEQsGSAiiGziCyW3 GGvFR7yC4OkfH1AtSE9q8m0+7qTJ X-Google-Smtp-Source: ABdhPJy7CpMSw6y+rDjm0O60wO59LGjg1JqFIDuUYx3kF3qqlFfe8yhq41J8pGC7sUBBZqTj2t1PNQ== X-Received: by 2002:a17:90a:b011:: with SMTP id x17mr14261297pjq.175.1590844605915; Sat, 30 May 2020 06:16:45 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id a20sm9200420pff.147.2020.05.30.06.16.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 30 May 2020 06:16:45 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 May 2020 21:16:35 +0800 Message-Id: <1590844596-1577-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH 1/2] checkasm: sw_rgb: Fix mixed declaration and code X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao Fix mixed declaration and code. Signed-off-by: Jun Zhao --- tests/checkasm/sw_rgb.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/checkasm/sw_rgb.c b/tests/checkasm/sw_rgb.c index 1e8ea15..e5aad20 100644 --- a/tests/checkasm/sw_rgb.c +++ b/tests/checkasm/sw_rgb.c @@ -137,12 +137,13 @@ static void check_interleave_bytes(void) int w = i > 0 ? i : (1 + (rnd() % (MAX_STRIDE-2))); int h = 1 + (rnd() % (MAX_HEIGHT-2)); - memset(dst0, 0, 2 * MAX_STRIDE * MAX_HEIGHT); - memset(dst1, 0, 2 * MAX_STRIDE * MAX_HEIGHT); - int src0_offset = 0, src0_stride = MAX_STRIDE; int src1_offset = 0, src1_stride = MAX_STRIDE; int dst_offset = 0, dst_stride = 2 * MAX_STRIDE; + + memset(dst0, 0, 2 * MAX_STRIDE * MAX_HEIGHT); + memset(dst1, 0, 2 * MAX_STRIDE * MAX_HEIGHT); + // Try different combinations of negative strides if (i & 1) { src0_offset = (h-1)*src0_stride; From patchwork Sat May 30 13:16:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 19985 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 7E495449402 for ; Sat, 30 May 2020 16:39:05 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 60F8C68A454; Sat, 30 May 2020 16:39:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D5918687F62 for ; Sat, 30 May 2020 16:38:57 +0300 (EEST) Received: by mail-pf1-f194.google.com with SMTP id 131so1211929pfv.13 for ; Sat, 30 May 2020 06:38:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RhgD7+pTsjIOxoAXZgaNUMsKQi/EyZuE6NUeMDEgET8=; b=Sj+9o4Rea7Acjh325m5nBsTjf2bq9NRN4jXSudlgwvwZybjD1ApFMmssXsy1O5u08T XqdVEIbe6VI9IG/R4rF9AjBqIUlN4OVGs14vykqkC03o4NPGz3OSOcKIEJL0qoX7l1Jg AfU2qiXFFShNeJDy2ZLZeMLGCYq4VlSwDPtu5Mj5Gjp9Tyc0RehVJbU8wyPMj6F9vEvU uAVc8AhDihy9+2AUO+kM+gMDm+1luwnP/8uQeOHTk44t/P48UtL1AaRHH+aZ5vHnLqKa cf5iQqm5ruBeBvulwBJ7eYhtGk6HY84SqtsQJeQggHzpxsOnaizk6ZpHXKHmvkXQDWPP OC8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RhgD7+pTsjIOxoAXZgaNUMsKQi/EyZuE6NUeMDEgET8=; b=V0xapqPlQZ/3MYYVYYfiP1nYXvsFW9l4xfEbIi9iq5WyPcT/LDa+7f2HB8dJtg/hrG lF9a9c1BxhlJTFOchXeph2/A3oqqj4wHNsigvJ2S8NEzmPlkNdkFYQhpYOTN6ADKA/ED ihWS5RqolDHiIvNpEfLcVCQGkQRoyZJfrGKPE1iIUBLEOL3QxSPhZzrjRT/9tNnP5ROa MirmDsZ8I9H/JcKF2ZTrPNoo84J9k1irG67RGdRmpj/qSPiXVAVH4boChDCxqNrTMFl9 ddRbLWzAxfjH2sp9b/fmc8L28u3ylkCwo2PQ4O1xc1Q6XMwOXU9tOfQ2hqm64WuxHDGW V9xg== X-Gm-Message-State: AOAM530Qpb2sn23BffXwoccNL+DngMVYnL0F4WJGIWJKUA0hREd02NQJ XyApvZ8Q2bHSrF10ubtqCqiRSgl/ X-Google-Smtp-Source: ABdhPJxr8zjv+8yMKwO56sWiWumcS6zazoMU4HuTqeurugrPEJiVdOq4h0KQQh9vhuUWcG2y1TRUMw== X-Received: by 2002:a65:68c9:: with SMTP id k9mr12110179pgt.77.1590844608882; Sat, 30 May 2020 06:16:48 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id a20sm9200420pff.147.2020.05.30.06.16.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 30 May 2020 06:16:48 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 May 2020 21:16:36 +0800 Message-Id: <1590844596-1577-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1590844596-1577-1-git-send-email-mypopydev@gmail.com> References: <1590844596-1577-1-git-send-email-mypopydev@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] hwcontext_vulkan: fix make checkheaders fail X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Jun Zhao Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao make checkheaders will get error as follow: CC libavutil/hwcontext_vulkan.h.o In file included from libavutil/hwcontext_vulkan.h.c:1: ./libavutil/hwcontext_vulkan.h:130:23: error: ‘AV_NUM_DATA_POINTERS’ undeclared here (not in a function) 130 | void *alloc_pnext[AV_NUM_DATA_POINTERS]; | ^~~~~~~~~~~~~~~~~~~~ ./libavutil/hwcontext_vulkan.h:199:43: warning: ‘enum AVPixelFormat’ declared inside parameter list will not be visible outside of this definition or declaration Signed-off-by: Jun Zhao --- libavutil/hwcontext_vulkan.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavutil/hwcontext_vulkan.h b/libavutil/hwcontext_vulkan.h index aba9833..0f6a51f 100644 --- a/libavutil/hwcontext_vulkan.h +++ b/libavutil/hwcontext_vulkan.h @@ -21,6 +21,8 @@ #include +#include "libavutil/frame.h" + /** * @file * API-specific header for AV_HWDEVICE_TYPE_VULKAN.