From patchwork Fri Oct 27 15:37:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 44376 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bf16:b0:15d:8365:d4b8 with SMTP id gc22csp1188754pzb; Fri, 27 Oct 2023 00:37:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHNSXV8bf8AlQh4mAL8zNlBDjsiFBgA1dPbdWr2B4Hv7IERHDRAb/bjBrOy2wrADL5SHYud X-Received: by 2002:a05:6402:134f:b0:522:4dd0:de72 with SMTP id y15-20020a056402134f00b005224dd0de72mr1549323edw.27.1698392244848; Fri, 27 Oct 2023 00:37:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698392244; cv=none; d=google.com; s=arc-20160816; b=lOIMBMBprAciuQ6dhjzaDyo2hC1sFYBBgpBRUNs/YQZbvBk9C1A+Iw46oFTYeZY21N qEy/FjGmzAQHWvhVg3KmXlMWFamvlZmIGzIbfkWcN7VE0ftdXyhiflQJQR4NNYTvmGZt 8UNZZo6THMf18mHo1x3P8mRmvP2e4B1mQyyrnrvTvKqHwrfuS5KN/NpEH85K2GrNN4IH uFbwOK432KMTb3J0XVyn3UxLymsMJpiB11Ec2rFwbtsdUM5eFLtUluYo0x55Xtx+HlZd koJDOl6YxlbWRa0t7jpAuUtvAfTeez+XQRr2RkIxdrnp27lCKBLnfu1TWZoV+eIfZBpa Tb8w== 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:date:to:from:message-id :dkim-signature:delivered-to; bh=/FMhFnL1TzCIUa8r3hwPNF/6xTUjuXf1eT9UlI1w4pk=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=rORWh2gq9rP/70kZ93MEQ2KEu9xxepqFJWuz2yJGxZMT3v00/JlfZlRWBKx6xyn+I+ q2AtolW3QXmINnl4OMF0icLsZzbo4cCC2VEExyjaAMSk6zpzmEtimJxNFXLndtLtSiXf frSaPr0MVv2em2GW3o131n3So7kjFzmC7M12HsG07mqcptP0YUeigTsuiNvmp2MGL0L5 R3aUdvt2S45nuUWeUfuwZ/CuDRqsoRYV41Dc5/QZBSu2SPAnL4pMcLrdmzyGDmBwHQJ0 gR3vbG6sCx7azAxhEY4wO3Xcr9SyFrsaW1WNNNxT+VOovTccqHtBe0+RTFa73H8nHpl+ 5nUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=qBrvKuvd; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s21-20020a056402037500b005411fa9157dsi532025edw.51.2023.10.27.00.37.24; Fri, 27 Oct 2023 00:37:24 -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=@foxmail.com header.s=s201512 header.b=qBrvKuvd; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7DA5768CC0B; Fri, 27 Oct 2023 10:37:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-210.mail.qq.com (out162-62-57-210.mail.qq.com [162.62.57.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F15B768CA99 for ; Fri, 27 Oct 2023 10:37:13 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1698392224; bh=knG3LvLx/tG5gxwVSuPTNdNSn5CPxqUrYivqW905j30=; h=From:To:Cc:Subject:Date; b=qBrvKuvdxKa8er1Vlrn5wcqYv3jHfpZAue0HeikkdAFPP3H2ZPY6xh3xPSX8qe1m4 0GLNiQ7Iem8eCSi3lDTphRqcVoo3YOBCs5AGVozO1zF+3gXDih/pnSdB+63jxZo5yL 6ioTXFXdoAcUz7HIinem4S3REalSbqiqAtXXOcr0= Received: from localhost.localdomain ([119.147.10.193]) by newxmesmtplogicsvrszc2-0.qq.com (NewEsmtp) with SMTP id 9430B28B; Fri, 27 Oct 2023 15:37:03 +0800 X-QQ-mid: xmsmtpt1698392223t32qqs9hw Message-ID: X-QQ-XMAILINFO: NkHKfw09D6j8aVvnMU3unEAHAFtFJDIxTyFQSlHH7Zd76WUEvlV/fHTQWI+JGd 3Uu725QeJtchTCMh0VgkgSkmDh7WlJQ+97J3M8YkNW7VOTScynOCDK5gpLSZKNpTLCGUO8F0h8jZ C9uamDKCZonngpCDo5SfIfGJzuA1OTNG+knT/Oq/reA6boa5RB0Anp0EMnJ2GqJiVmgenA12pu13 uGpLqOfPnq5l9VWiIybnTzQROzRiMvbN8uaaXJ3Qjvk57kDO4V8VylMvZ9ef6mh9IkR4Q2u5tWP9 bnBIyk4KjdLJ8B43vwh69QUu+NP8oH/H+K0zvj0UxKNnilsjCI1ZAjqH1fjTfPnFL+hX0QMkOHMu Hz06vwXjcy4NwTbxY1HatBpbTx/4LcY/q2uKekkavEksDjNiQTRMOn1iY0p6yPka4IxI9mF/ZcY0 ffzo2ptp5CHswNNCARzTN8Ge6iu0oSqOGKyCjkUTe35gITKjwPk1OQghmbB8xSlwMCUFOIv60UyA rDHMhIiABNfqoMFYsZ2UTWfZuCjOH5PJnKtkTI68jtFHTNSpVmsyL+vd3jZveEBjGS0iLwJ0/GZj 3mGtIiKUpgvjEuzDIiQNWGmqGBXaTogeytU7t2VKGf+x2bZjhTpilUjDTPUkDzTCzAlp40bc26Is I6cIiZqplWpNDrbPBsFj3EbB+Hf9EAS2rbnqS6N5EHSSTGrAdOi3nlL6jodsmmyY/VjNkNYoqA7V uNR90KelhwdOrX6plhrEY/NzkfGA0/PUXnEAsuNClGdSq6HBrMWi9C6SonTJpnhQSgE6sOOI/Ipc jUuREDclBpsq6TEL6NzWUTyOuiLkdeQYfqAcH8irXJnpiN1msiYQMgZJI90v9+HmYxhXh7ORiWts zi3wx9VMJ6Hl2/SAK+5J5PCimjNRK97B7O40jYX+cYqzoI03NJoVRDWyjyHeOGDhjzA1rXmAZL1d 9lBCtOt0PJA5PaXR3BcwA2mXwGbM6696SLsNN9Lp685nNhQfxzxnh97fl4oizT X-QQ-XMRINFO: M/715EihBoGSf6IYSX1iLFg= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Oct 2023 23:37:00 +0800 X-OQ-MSGID: <20231027153701.246497-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avutil/hwcontext_vulkan: cuda doesn't belong to valid_sw_formats 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gQVEr88HE+vA From: Zhao Zhili Move it to transfer_get_formats. --- libavutil/hwcontext_vulkan.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 8dd40cb66f..8481427b42 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -1664,11 +1664,6 @@ static int vulkan_frames_get_constraints(AVHWDeviceContext *ctx, NULL, NULL, NULL, NULL, 0, 0) >= 0; } -#if CONFIG_CUDA - if (p->dev_is_nvidia) - count++; -#endif - constraints->valid_sw_formats = av_malloc_array(count + 1, sizeof(enum AVPixelFormat)); if (!constraints->valid_sw_formats) @@ -1684,10 +1679,6 @@ static int vulkan_frames_get_constraints(AVHWDeviceContext *ctx, } } -#if CONFIG_CUDA - if (p->dev_is_nvidia) - constraints->valid_sw_formats[count++] = AV_PIX_FMT_CUDA; -#endif constraints->valid_sw_formats[count++] = AV_PIX_FMT_NONE; constraints->min_width = 1; @@ -2416,12 +2407,22 @@ static int vulkan_transfer_get_formats(AVHWFramesContext *hwfc, enum AVHWFrameTransferDirection dir, enum AVPixelFormat **formats) { - enum AVPixelFormat *fmts = av_malloc_array(2, sizeof(*fmts)); + enum AVPixelFormat *fmts; + int n = 2; + +#if CONFIG_CUDA + n++; +#endif + fmts = av_malloc_array(n, sizeof(*fmts)); if (!fmts) return AVERROR(ENOMEM); - fmts[0] = hwfc->sw_format; - fmts[1] = AV_PIX_FMT_NONE; + n = 0; + fmts[n++] = hwfc->sw_format; +#if CONFIG_CUDA + fmts[n++] = AV_PIX_FMT_CUDA; +#endif + fmts[n++] = AV_PIX_FMT_NONE; *formats = fmts; return 0;