From patchwork Mon Nov 28 04:43:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 39522 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp7272603pzb; Sun, 27 Nov 2022 20:44:21 -0800 (PST) X-Google-Smtp-Source: AA0mqf5c6IE0i929ArFMUO1yvL0E74eq0QYIfEJRywg8xtm4QLOwjIOz4IL9QjpZLd4TH7xCrl+H X-Received: by 2002:a17:907:7666:b0:7bb:dc8a:519b with SMTP id kk6-20020a170907766600b007bbdc8a519bmr15161026ejc.209.1669610661706; Sun, 27 Nov 2022 20:44:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669610661; cv=none; d=google.com; s=arc-20160816; b=XHiWFmfwq32J4nvvu/We3+G3YaGNgaM/FWXC9zxrlDpGESIKVgsb2/G8igz2ERWA0W px9d4aUY6qCG68UwUKR3gBtMQO4HVjyzRAqCDk2e/u7fMEU3g2g4+qhzO0pqEsadbU0n hDw4UMQ0zWzk1YHtqTjhLEmtuuipcUJuZbcmuPwnzFAAEq5+tZVSd4ERaoS1UWzsju3P 8PYMHXeTOQ+dicM7VoVppDl78weJlzIBdVRpt3BZZ5dmKSm9vOzE1XFRZeOZ9VNvSCwc IANxrwWsrkpzXT9TpJKfLZuhW6IDTqFzyfmhsnlPRNf4wUbkSlde+S3+tfTyiwjs8u4J ZIJQ== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=hL3C0X/+aTAJFn/jv6V3y/N8ShmHWg344jYwujw/uFg=; b=MJe74Ah8ebhqQcCWuhCq2xIwoccjWX/RmvI7PUJVP+8WFHAj2sS45OHk8dghcy7eNi RUigs6GMzeiZb9N24AnXdpZl+4jdPisyM4v2z8fnG7r8CZrkTjV1sSZbB6VcUHYJsl9w Aa+YKMDFAh0/O+FdSrYaw+JasIC1MMI5LrPQ1TTGQQ0v0+2BcHBZmwCoWX4CDM+akga8 x7XyTChvOziIt5IF39YGu9BqOADgHbwriQ80oD54nwrdGbX9Y6/hAcA3Z6unnkopBwaQ Wk23lY/X0p5YwEYsjrttFLdP3vVFeljjZP1GdOc3QV+ojdCDu+Kou8tvmxvxC8/LVnJ2 4GsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=BbvgfqXE; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id xf9-20020a17090731c900b0078d459a1ce9si9698115ejb.693.2022.11.27.20.44.21; Sun, 27 Nov 2022 20:44:21 -0800 (PST) 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=@intel.com header.s=Intel header.b=BbvgfqXE; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A861D68B4C8; Mon, 28 Nov 2022 06:44:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB13B68B3EA for ; Mon, 28 Nov 2022 06:44:03 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669610649; x=1701146649; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OAJWMXqNLlNpb6hrppdrlFX48zGsrVnNJDwARUWziSg=; b=BbvgfqXE+Dk8E6C4KKN/NaKVGhWUg+LpFkHbXz8TZ5Uh/CGDkn9LdgU9 ZTnH5eO4ZI+10Mcya98RFZ7IBfLRwJNAvBpNJYOy/NywnlbfIAPqxWmYP 4BCBxbAcGoYidPlXh4I1Q7ARYPRJGBAqh4xOORRGzlGT/hScLg2E9YI/v Yb2Od4DCi2Ixe1wkZWqRUALls0Q/H5tMsgiD4Gp4l1cBEQwWiFhSthBQq ExS1aaemb1MCPG8KOMLaj61W28hO5cPFfG9TAhL3uVy8yeRcnTnVFGzL9 A3TAn0U0t9ds/XAjSzIwZIwMDbmKbyXSJGiggiBylIjSowGZrdoIMHosv w==; X-IronPort-AV: E=McAfee;i="6500,9779,10544"; a="302321153" X-IronPort-AV: E=Sophos;i="5.96,199,1665471600"; d="scan'208";a="302321153" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2022 20:43:59 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10544"; a="888272545" X-IronPort-AV: E=Sophos;i="5.96,199,1665471600"; d="scan'208";a="888272545" Received: from xhh-tgl64.sh.intel.com ([10.238.2.19]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2022 20:43:58 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Nov 2022 12:43:19 +0800 Message-Id: <20221128044321.613550-2-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221128044321.613550-1-haihao.xiang@intel.com> References: <20221128044321.613550-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/4] lavfi/qsvvpp: avoid overriding the returned value 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: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: awEHDinSSRr8 From: Haihao Xiang It means more than one output is ready when MFXVideoVPP_RunFrameVPPAsync() returns MFX_ERR_MORE_SURFACE [1]. Currently the returned value from MFXVideoVPP_RunFrameVPPAsync() might be overridden, so the check of 'ret == MFX_ERR_MORE_SURFACE' is always false when MFX_ERR_MORE_SURFACE is returned from MFXVideoVPP_RunFrameVPPAsync() [1] https://github.com/Intel-Media-SDK/MediaSDK/blob/master/doc/mediasdk-man.md#video-processing-procedures Signed-off-by: Haihao Xiang --- libavfilter/qsvvpp.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c index bf719b2a29..a088f6b61f 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -833,7 +833,7 @@ int ff_qsvvpp_filter_frame(QSVVPPContext *s, AVFilterLink *inlink, AVFrame *picr QSVAsyncFrame aframe; mfxSyncPoint sync; QSVFrame *in_frame, *out_frame; - int ret, filter_ret; + int ret, ret1, filter_ret; while (s->eof && av_fifo_read(s->async_fifo, &aframe, 1) >= 0) { if (MFXVideoCORE_SyncOperation(s->session, aframe.sync, 1000) < 0) @@ -890,8 +890,13 @@ int ff_qsvvpp_filter_frame(QSVVPPContext *s, AVFilterLink *inlink, AVFrame *picr av_fifo_read(s->async_fifo, &aframe, 1); do { - ret = MFXVideoCORE_SyncOperation(s->session, aframe.sync, 1000); - } while (ret == MFX_WRN_IN_EXECUTION); + ret1 = MFXVideoCORE_SyncOperation(s->session, aframe.sync, 1000); + } while (ret1 == MFX_WRN_IN_EXECUTION); + + if (ret1 < 0) { + ret = ret1; + break; + } filter_ret = s->filter_frame(outlink, aframe.frame->frame); if (filter_ret < 0) {