From patchwork Sat Mar 9 12:21:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter F X-Patchwork-Id: 12273 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 2052E4485A0 for ; Sat, 9 Mar 2019 14:21:55 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EFA076809DF; Sat, 9 Mar 2019 14:21:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it1-f177.google.com (mail-it1-f177.google.com [209.85.166.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1B0BB68090B for ; Sat, 9 Mar 2019 14:21:49 +0200 (EET) Received: by mail-it1-f177.google.com with SMTP id l139so393143ita.5 for ; Sat, 09 Mar 2019 04:21:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :content-transfer-encoding; bh=nE13Q1wvbS1jS20DF4NuT8T8ao/MCw+gkplI3CYOgCw=; b=myVqLHlwAZCRPbzAHhenZYHOynTMHQ4SUDbhlQUaXb0Lup8mw/CZo5qkjU6r1EcrXN OuAG7nmGQJPxlOYWWXkz1VW7Dd6CZ/83o61NKN35VxNOTA3Ova4k3m+9IM2bWxa3TPFf 6hERdFYzS8HkHEpMuOtXq5GvMLX5JpaI57v/qKjGgL481hroecIDun1/L0lyWjvQILcJ xIU6M9mmaWYfERWeArR5nesAGIY6Y8zu6fye5IrrqfiybMhgeTuW6ySATXIxGQ5Trqv/ pCeEIp6NIA2wUu/FSte/5pryjxNOx1zHJ3gumjTdbc/8+rvRmjnsZojxmI73mMP4/gi0 WslA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:content-transfer-encoding; bh=nE13Q1wvbS1jS20DF4NuT8T8ao/MCw+gkplI3CYOgCw=; b=BsW0hoScBfrS81Pzs/IFjq1jov0zOgmDf8uMKFiJ7eHo3ACX1w9hVCiEm/4DXVLbwB rhp+bJ8fNuPjsCqx/xy3++LiBTANqtnuuJ1acTwDwGX5fDi/zBq79iV1UFt3ckg5btgY QHutWpdT+fClvR1gWeuyPztqgyPmg+i6F/l++KUw9D3Z4rJ17LDLjgoqzEr+5wdg8DMQ aygRFmgmnK5Hh2hRHt5aNlsVSh4HnDS9LHJCSINuFLjbsQk9gbJlmsIPrhbZ21OCvrT/ IHIagrF1Fjvp8rz016Q+IKuj2KPmDLAjDqWCuz2tyG/LiYfeJJBK/Ep2wh4G676k6jXu kv9A== X-Gm-Message-State: APjAAAU4RDNDsvwsgdyCaG6fpoZB2j/X3sgV/jPE5hMjrZq9rjcP/GBH s3GqnAXaQNA+pzc5KzFXB/tgg87s6u0j+/F9veQt/sRk X-Google-Smtp-Source: APXvYqwOLsk9r4GVd2V+S3I8pgf+W/QKJrelagVuVXTs4y9X9AhCUTUCL7W8Ls8IeivZK5JoSKs2LIQlRjAPoeDHpu0= X-Received: by 2002:a02:5145:: with SMTP id s66mr12420054jaa.109.1552134106925; Sat, 09 Mar 2019 04:21:46 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Peter F Date: Sat, 9 Mar 2019 13:21:33 +0100 Message-ID: To: ffmpeg-devel@ffmpeg.org Subject: Re: [FFmpeg-devel] avcodec/vaapi_h264: skip decode if pic has no slices 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From 816e9156235a5d7d895b09c0235c9f8f1f7703e7 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 26 Jan 2019 19:48:35 +0100 Subject: [PATCH] avcodec/vaapi_h264: skip decode if pic has no slices --- libavcodec/vaapi_h264.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c index 5854587a25..81a46fa747 100644 --- a/libavcodec/vaapi_h264.c +++ b/libavcodec/vaapi_h264.c @@ -317,6 +317,11 @@ static int vaapi_h264_end_frame(AVCodecContext *avctx) H264SliceContext *sl = &h->slice_ctx[0]; int ret; + if (pic->nb_slices == 0) { + ret = -1; + goto finish; + } + ret = ff_vaapi_decode_issue(avctx, pic); if (ret < 0) goto finish;