From patchwork Sun May 31 08:18:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 20040 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 E1B3D44B4E3 for ; Sun, 31 May 2020 11:18:57 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BF3C0689259; Sun, 31 May 2020 11:18:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8445E6808E5 for ; Sun, 31 May 2020 11:18:51 +0300 (EEST) Received: by mail-pf1-f195.google.com with SMTP id w68so1211284pfb.3 for ; Sun, 31 May 2020 01:18:51 -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=Wo9K8tPK/fGWtJvzhKWrMRVB6vGVt7KH5KxOc/uWptGsm4P94/7QO6mTrCDeZ3MAmH FwRkfX+SXIEFhj3/AkVrZb2H0gtCwkiQBc6wz7l86hX3bsq+a1pB3mPiMvfmavSt+HAt DsvvC11BQmjqG0jk+ZF9rrgY24xaO37V6Dc0jpmvfuL3LxNkf0x3fJ70559l4p5lxKXg WNDG1U9P3uWEq3u8GrcgKR63Cp0HEZF8vEegv0WszOczk1HCan1EdczwKdnrmbkEj8Ae 1b5cfa85WrD3sZV64KxmBafZ65+V/UQQp1iLrYLnayj/N/5VKy/+j+qccpthfvVosZ5G wlnA== 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=V1zML0J3FIz6SCr0DeScSShLNsCJ6er7zN6NU3dU3vq9GMhyNTLzPxFRtMW88Wj9HB C505hXYiPjN8Lhj74ifNMJooTL49aauYFNRxz93slbxqKfkL4IKwOUGbFlOXqy0zdqax rpKJhSHNeSjanTfVyjjPtWEjLUpRyqNzKW5uuT+kwIOubD2qMUTIcemFrnJfHbI+vPwb knsaj5QEytdHmj0rc4nmZ9G5RdXhgHFyk36TEik+sP1ROASBXlofbaQBed0bOGeofITq pxyumkzJ9JSnAj9HdLIYyN/kHlktotXMioDSRDk8EM+kvDg//Gkb4fC2kjSnG+yQcKQ0 dVoA== X-Gm-Message-State: AOAM531Yx06uW4kAd1MyegjU5eGqfGRCUGVrjcf/8GE3xAIONFY+yO59 keprt49gSgs0p+QciPxwkwDSvh1j X-Google-Smtp-Source: ABdhPJwR0QnawYRCH7ovK6Y7puu0zYAVbkVr+oFuqgxSTN+a/FX/JDRty6GEIzG3yAklBOjDoFumug== X-Received: by 2002:a62:8388:: with SMTP id h130mr15509625pfe.292.1590913129144; Sun, 31 May 2020 01:18:49 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id q26sm11328510pfh.74.2020.05.31.01.18.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 31 May 2020 01:18:48 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 31 May 2020 16:18:32 +0800 Message-Id: <1590913114-11434-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH v2 1/3] 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 Sun May 31 08:18:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 20041 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 C96FF44B4E3 for ; Sun, 31 May 2020 11:19:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B491D6883E0; Sun, 31 May 2020 11:19:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49A636805B0 for ; Sun, 31 May 2020 11:18:54 +0300 (EEST) Received: by mail-pj1-f68.google.com with SMTP id t8so3564356pju.3 for ; Sun, 31 May 2020 01:18:54 -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=yemqqQzx7TG84KlAbwZMAmZ80xObZr9csO+ZnTZ1+H4=; b=hkSdfb4RW27GUKxfx1CplrTTJjlgIQyU31FA18YgIL702QpVJgH1z91PybZq2zaZ2c belR6KoGx8a8EHJm6B2vZxz32uuP6a+57XRuNIAiy6pFut2qZyW5CpaZOi1hBxgbkCNp cIZM4GXZ80NPyLdzEPtUPAbmjULkMxcH0cT4nN8cnb3gATtl7e80XFj+F9qDF58y0rgl Yfo8J3ra2UKZpmZ4sgQTJvbG3PO+zPS9muey28xhRh7BJf4U9EVk1rHFyHpnAL1zQRXn SblpFqbowwaVW81MUzWWBt2NxJr60zRBGlDNU7rdR5HhtvYSzge1CMWrZG1MVUexH8fS j7Cw== 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=yemqqQzx7TG84KlAbwZMAmZ80xObZr9csO+ZnTZ1+H4=; b=mgbLX0qaXC8FXQ9+efyj0tjgRXOW62QIXUOEfIV9LY6iWS1KaDpnMgvChfsX9e8iFS DEX809T9tR9BSgb9ed6CYuhldpxCGtDjuEBClmTzW7g2FKoD2ZM2wxw2YNfkWaGd6v2q 3im3gl8jnlKfdcwViPQzFqclzlXA4aZWRl7g3vaiuetYZ36cEKS3Kz3WjHUiuk565zec on2KgmssNeUbMAmsVmCtwcES6C+a3h4yn6/AuZMc8rOoXQUQtu2lTwh76Mm2x3hhS6U1 oiOMpoRF1syQeZirUNcVzA0Rop+QxI2Ahn1fUvO4LkSYzmCin9RW1sZww+bOyyRRZVm6 s6WQ== X-Gm-Message-State: AOAM533fXv4WOwOtQ5Y7kAzd5ngfIyT+8+A7N06G1n7ztOSSm922tiFb LpgD916QuRuhNCS4l0wg2zrfRS7P X-Google-Smtp-Source: ABdhPJz8jLq8TnypAOnzS5miGPdEpXzfMoxZOmlGFyqC2r14ZdeJuz7tGBJiUOfN+kEHkGyLYkbH5w== X-Received: by 2002:a17:90a:394b:: with SMTP id n11mr18054553pjf.100.1590913132241; Sun, 31 May 2020 01:18:52 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id q26sm11328510pfh.74.2020.05.31.01.18.49 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 31 May 2020 01:18:51 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 31 May 2020 16:18:33 +0800 Message-Id: <1590913114-11434-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1590913114-11434-1-git-send-email-mypopydev@gmail.com> References: <1590913114-11434-1-git-send-email-mypopydev@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/3] 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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavutil/hwcontext_vulkan.h b/libavutil/hwcontext_vulkan.h index aba9833..5cbeb8e 100644 --- a/libavutil/hwcontext_vulkan.h +++ b/libavutil/hwcontext_vulkan.h @@ -21,6 +21,9 @@ #include +#include "pixfmt.h" +#include "frame.h" + /** * @file * API-specific header for AV_HWDEVICE_TYPE_VULKAN.