From patchwork Mon May 17 03:24:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 27800 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2458086iof; Sun, 16 May 2021 20:30:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZ/Miio6y0lynnzFY0dcDMU/CwJb9BzFixydMgEDvcXBKA0nnmtZBR1vzGMr7qo9E5uKbi X-Received: by 2002:a17:907:3e06:: with SMTP id hp6mr59480014ejc.273.1621222241197; Sun, 16 May 2021 20:30:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621222241; cv=none; d=google.com; s=arc-20160816; b=NcH/+U4nD5TzVyWzs8m4ovLEtPD0aowlCHH06cppNi1tSwF8g7elG6EZYe28I8XPYn ckVIYJkP/lZFkokYEXh1RxeqdWJJscs+91ha7Fz8r5db/EPoOuFRHY74GLT0ziFJz3kV VokuSdp790IK/p1nk87imz9sgjGs7r+1b26Bn3tki2Dz9V2ZwzS7BGkoJrhg5w/37oZT sNERbnd8LPDG0tskZBiHnUMpJp2XS7sH50XSZ8shnDJMpwC4nPfTBP1mrpKXbBICEdTu pBbeJNObYjJ/h9shlZn7+XJb/Vwu1YlfAImLvWVt2fb837jgbvQ00yLe9DdIFGYpc5ds bAsw== 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:ironport-sdr:ironport-sdr:delivered-to; bh=ybami8k8WVidrbGitr1/6i0kygZ64D9llK71Q5+HfRU=; b=Sg3wbgdWBhTtCdH5zjK2CZ1uAp8WljZIFZtPXWvuB+UPsfvuBjgTnWzoIoZrVrEa6L 8AxphLWbS19HXp2qE08tbSbWddnxQ/rNBmwz4jZyfY1TEzLHP7mKBwMMpdm42GAESbgV 4JCXH2Ku0Xso6x81TNp8n2wlMMiKD6WIHtzgDMpsZAHQv4rtD9zqB5DQSNDIDNc3COOj VxL9zcQElj6IVjDedurLKVF3m36jb+xmV9KRbjVT/ThMUTL+N88MfWisHJY+0mvsR9+I SveEgNV9fIUPhm9dNQpfywX2N6gKqJ5GTr7DJFIbFjZa3+6DCW7RXYdA/5l75exvvxuG zhUA== 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 u11si13552000edq.89.2021.05.16.20.30.40; Sun, 16 May 2021 20:30:41 -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 A37DF689966; Mon, 17 May 2021 06:28:37 +0300 (EEST) 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 08105689905 for ; Mon, 17 May 2021 06:28:30 +0300 (EEST) IronPort-SDR: nHlba2ISUntel5Fczk4hMjaploUSDWXF75dBjqgjZ0eOwIwdDrdEpHFAgwfFkiVvAAny6c4EE1 /ubtDyHZwUgA== X-IronPort-AV: E=McAfee;i="6200,9189,9986"; a="187498247" X-IronPort-AV: E=Sophos;i="5.82,306,1613462400"; d="scan'208";a="187498247" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2021 20:28:18 -0700 IronPort-SDR: JhhXxP1EC6+0SzuCHUlAEaiICOjSFhIv4D0DbMaqvkxoCdi0vipocZyz+mwoxGTsAxkb7LNM9X eaiq1NzK1GBw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,306,1613462400"; d="scan'208";a="626277689" Received: from xhh-tgl64.sh.intel.com ([10.239.159.130]) by fmsmga006.fm.intel.com with ESMTP; 16 May 2021 20:28:17 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 May 2021 11:24:19 +0800 Message-Id: <20210517032426.3376661-16-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210517032426.3376661-1-haihao.xiang@intel.com> References: <20210517032426.3376661-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 15/22] 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: 6zSPzwmVm//J 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) {