From patchwork Thu Aug 5 08:19:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 29282 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp191653ioh; Thu, 5 Aug 2021 01:23:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJycxFEs5No4AmBbFT185NgMReUO7uw+0lHmL4ofw/3hHHX1MnDle6cxZdFAxXtO67OISD2q X-Received: by 2002:a17:906:260e:: with SMTP id h14mr3613333ejc.258.1628151836764; Thu, 05 Aug 2021 01:23:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628151836; cv=none; d=google.com; s=arc-20160816; b=Tf8jbfuIA7b3qFupdICTdrq/mgBhurirxkDY0vseujgCz5IUo0SUBg1K4fDFiIYsMo oSRbJxzMnGJ1crKArlVyVT2TOuh+HSXU5LbYnWcDJ01TAWwdAaKwHFA6FxFg+bZEqrzl mufSsiqCv8cuawa6nWDNfXKrlLhRt1Jz1uFQ+Snw+KfVaxZdz8W9hYp5ncNEpRyqLLTS Hs166tVb47xz5SLHBl8AsmtAaU6hDvedwuu4CB6VFCV/sKxySgNJemir6wi3lds7aXf+ G6HFT1/GHRUpzsQLh8O2GTOpRtSNeVgienYLWPx18aZusuJw8XszivYsdBbJvg9mUvSZ N2JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=sxQmYALpxW1nN2YfJX3cW6fYgAxOB1vq9s0iMUWOSDY=; b=gzEi/ZyyPwyuxM05sts4nS0pVqPa9T3HlhfS77r0079+7fFolt78h2WrSOy2ufYbPE ZcgR+4r8zACpvA2uzpB+lMNbHD0RrHRj6KT3pGM4Ls3KXVpZpmnvANBtUmBqSIMBqv8f Y7/FtXAcPtv0GTfYkLbE6tgFUUfHX/NPE+s0D/9q7CKwTbKDtg15XULnM0wmiRj1dxsL +o5An5/ms+Uk5HDmmjxgKXUD4BPH8yuY3oCIb4I66/Rb2OLfQOp3uiT+tX+hEA14uGtl P3nZPI0NVAG8s0mkArVw5/gI5AzeJ6IoF0j2ttuZ3Ap4ClIMuBWZKXky+DT2rG8qeiE3 L92w== ARC-Authentication-Results: i=1; mx.google.com; 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=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v11si5179870edx.190.2021.08.05.01.23.56; Thu, 05 Aug 2021 01:23:56 -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; 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=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A600668A58D; Thu, 5 Aug 2021 11:21:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB2A068A4A3 for ; Thu, 5 Aug 2021 11:21:30 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10066"; a="236062056" X-IronPort-AV: E=Sophos;i="5.84,296,1620716400"; d="scan'208";a="236062056" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Aug 2021 01:19:54 -0700 X-IronPort-AV: E=Sophos;i="5.84,296,1620716400"; d="scan'208";a="522442423" Received: from xhh-dg164.sh.intel.com ([10.239.159.167]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Aug 2021 01:19:53 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Aug 2021 16:19:04 +0800 Message-Id: <20210805081910.9386-15-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210805081910.9386-1-haihao.xiang@intel.com> References: <20210805081910.9386-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v5 14/20] 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0ye+pd7E9jFF Currently the returned value from MFXVideoVPP_RunFrameVPPAsync() is overridden, so the check of 'ret == MFX_ERR_MORE_SURFACE' is always false when MFX_ERR_MORE_SURFACE is returned from MFXVideoVPP_RunFrameVPPAsync() --- libavfilter/qsvvpp.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c index 5b0b30e23c..82a8e29387 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -787,7 +787,7 @@ int ff_qsvvpp_filter_frame(QSVVPPContext *s, AVFilterLink *inlink, AVFrame *picr AVFilterLink *outlink = ctx->outputs[0]; mfxSyncPoint sync; QSVFrame *in_frame, *out_frame, *tmp; - int ret, filter_ret; + int ret, ret1, filter_ret; while (s->eof && qsv_fifo_size(s->async_fifo)) { av_fifo_generic_read(s->async_fifo, &tmp, sizeof(tmp), NULL); @@ -849,8 +849,13 @@ int ff_qsvvpp_filter_frame(QSVVPPContext *s, AVFilterLink *inlink, AVFrame *picr av_fifo_generic_read(s->async_fifo, &sync, sizeof(sync), NULL); do { - ret = MFXVideoCORE_SyncOperation(s->session, sync, 1000); - } while (ret == MFX_WRN_IN_EXECUTION); + ret1 = MFXVideoCORE_SyncOperation(s->session, sync, 1000); + } while (ret1 == MFX_WRN_IN_EXECUTION); + + if (ret1 < 0) { + ret = ret1; + break; + } filter_ret = s->filter_frame(outlink, tmp->frame); if (filter_ret < 0) {