From patchwork Mon May 13 07:38:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Rosca X-Patchwork-Id: 48836 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp171390pzb; Mon, 13 May 2024 00:40:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW5iCnIfrYvpiEVRsJIqCE7VKK3Ewvgx3sIAzR+ygr0pH7dqLiqAaHiRqVHcVO/OL4chP8KkAG99IU+fPB+pQ5nOAzkh1B+6O6vCg== X-Google-Smtp-Source: AGHT+IF4t/yTOJr2HumXZXEo4GAWSkyFP563I5f7yCBu2poXOdipS94KIl9wwQ7o1zm8qHi/mhUZ X-Received: by 2002:a17:906:770f:b0:a58:ef89:d04c with SMTP id a640c23a62f3a-a5a2d5cebf9mr582153066b.46.1715586000769; Mon, 13 May 2024 00:40:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715586000; cv=none; d=google.com; s=arc-20160816; b=VAsuXstV5NcjKsCBj6BmPRTb6ifzYY4JBVcHl1InkecgZf8O2DW6U9L2dTVt/ZW/Ga DcqtBpnpLpcdiqKnS0YaT5yJOvlAKojTJazwiZdkqEgUSljf7W9jbbnP7NKS48h/qTDa wvc/FlTfYzQ7l+qOqerObNrP9LPotf1efcMtGhkMKz3YJzQhRrtzIIKufGeqm53O0VZh rAudaFrdc5vJe+gEs2flFCRRiq4zEW5lFqu1RANeiQDqg6xL4DiMLQIvLrdf3B1+goJy HjZrQCv3I7WzLjQXGRMTNDDmYKIyONity1Apn3S6o9Rr5+K337DqfQ47J+QBMuXUXI/s EO8A== 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=dSO/GvegVldsNQSBiRX0B4Fxe/sa9pXdXoaSvetNF3E=; fh=mbb85L8FZ404unHdLI+iF4ZFmTMGr6nZHIcfO/oKEvw=; b=wohzSfOyWTxnTF/8NxKcUKeq18TjRhBPPBOQxCgqTcCBR36kl+VfkHHQTdsaBxwWyr stOT2Lm/oy7clCW4BwBub4FG4rekEDvjSOuNMMkaVPVu2ItkypXR3Nsax7K8sNbogExn RXt1FnGx8kkkPKSD0egtyB6TrX0jFl4WC4a0piewSuFdntRpP6zszPN9LVqAbtWGG+4C +mj1oPbvk0G+CVUX2ghiPLV14olfGGC6xG/rSlDEPk8AKSaveFKqvOHA7/yujRomrIrj O+MZPIiEddpeTV5p3/xl8cltyqpI0xi8IfgeTUR3qZED3XP7Cf1P57IO/juOVULZqRBS 9WUA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=Meiz9K5W; 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 a640c23a62f3a-a5a17945fb8si453661566b.46.2024.05.13.00.40.00; Mon, 13 May 2024 00:40:00 -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=@gmail.com header.s=20230601 header.b=Meiz9K5W; 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 8F51868D539; Mon, 13 May 2024 10:39:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 47D7768D366 for ; Mon, 13 May 2024 10:39:50 +0300 (EEST) Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-a59cc765c29so16882066b.3 for ; Mon, 13 May 2024 00:39:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715585989; x=1716190789; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=xPzZtyG0HE5hsrZYXk+TykjjvFRk0kz17oN1+ItrVgk=; b=Meiz9K5W1jcly1aPIS16yalfHu4PvW3oyaAO2F0o36E9jdlGRIYJwuJ6kSVBXFcHFJ iy9RmFRtxCCWWocKS59LXhdvBHltstS+xK+n9Aye746tFm8qt4Gaaw+KgPNPm1hfhrtF wAoEqnZQJy1RuFnQEmmPIYyA64/CZtXvPSEjDe7JareoaFiZFFAkI1KQ2ZqJqf8wKjKn zYwyCXTP7h0opAtRGF3xvy4dX61THWHeOwL9tlVdFyDYhuU+IvwOWcg5NeKdvLOCUdiS i/rgYmYcq5g2kI72o6iIj9rAji88AkSNGzg/YBRQioZhj5UNCCii7SieNhbfXYtVFQT0 1b8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715585989; x=1716190789; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xPzZtyG0HE5hsrZYXk+TykjjvFRk0kz17oN1+ItrVgk=; b=AQCiRadxSNS9shZABfyfTgaKxq/QsSTdqn2881s0uaaN6+Hq7G5gM0OytmKYAXfwXV bF2zBPcrZ/eb3jCAONTolwurZbkKeCsKqDaQYlP3jeorPizgtX1yGdYCiXfVasuvlJjK T58pv/d514mGQP23eLqhkJTzvui9ZGuSzfYajm/ima70eBq9YhKu7nbh4hKuBkhqLe0Q 6N4RUcfMk36PqLTqRQ433aVJi60wUcLFjwvZb+Pi8oLhD3jFn3ElcBv8VC4RmmFblUA5 6kd5KGCjwXhTZCEXb2TZVxLG6mirl5Y+9R4ZiWeVDQ61vO1x4dG/H5JbjoT9gEOiEfNh 7I6g== X-Gm-Message-State: AOJu0Yy+sN5cvw13oBXvLLVrcEmmeU8OZeW1PGL/MEmt4lXYkHBq4IA7 k2xfKfvq/RUwvfvcOWUNtaCQXi+cG9hz/7onyREOnbyup0mv1v3F6tiP7A== X-Received: by 2002:a17:906:799:b0:a59:766b:d88 with SMTP id a640c23a62f3a-a5a2d5cca04mr572031966b.36.1715585988965; Mon, 13 May 2024 00:39:48 -0700 (PDT) Received: from mitsuki.. (ip-78-45-35-87.bb.vodafone.cz. [78.45.35.87]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a17b01598sm565486166b.178.2024.05.13.00.39.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 00:39:48 -0700 (PDT) From: David Rosca To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 May 2024 09:38:49 +0200 Message-ID: <20240513073859.26731-2-nowrep@gmail.com> X-Mailer: git-send-email 2.45.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] lavc/vaapi_decode: Reject decoding of frames with no slices 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: David Rosca Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: lt3TfbzPc8G+ Matches other hwaccels. --- v2: AVERROR libavcodec/vaapi_decode.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index 8e9f647c20..7c91d50f7b 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -157,6 +157,11 @@ int ff_vaapi_decode_issue(AVCodecContext *avctx, VAStatus vas; int err; + if (pic->nb_slices <= 0) { + err = AVERROR(EINVAL); + goto fail; + } + av_log(avctx, AV_LOG_DEBUG, "Decode to surface %#x.\n", pic->output_surface);