From patchwork Thu Jul 29 05:25:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 29108 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp5500345ios; Wed, 28 Jul 2021 22:26:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJfRWvWaO84pFEqXskzXz3cCfEU7IIetb9aIvwKJQ3KhfJoY2P+uTo/H6bW2BeunXxJeDq X-Received: by 2002:a05:6402:d67:: with SMTP id ec39mr3939455edb.117.1627536401256; Wed, 28 Jul 2021 22:26:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627536401; cv=none; d=google.com; s=arc-20160816; b=C+PKJ7Cn0n0jc8IqCbDb7EpqOC7HrunLIaKokscLzxJUWbEPGRzlKcVWm/kzW+TWB1 TflOVQIvZolS6/n/I8L5Dmlh0ARDdB6KuBmyGX4B6eybNB+gKA72P2NzzwvYC86wY7MZ f6uV+RHDFaSj8JLnzMhxHhwT8zfX5rbskgZ8DTx276SdgWgJubg+SBNQ06QRW+mEqiHw FJ9gIXSyBOi6CB6qPKSNd7/ZRWa7cZk5N3Ff8ZfTaZUESlda0L6XVnM1DcdIcv9aMeKR thEkkSCq3qu5iH0LASc33MRbZmbnDTFThQuvmY0AuwXWjPnsdRerqW4aSF3X+3rXLlaI kB+Q== 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=Da6vFR8nkJkyCjnGEo31L2xzAfq2YbTycRAdYjmUcD87wJWRiQnfhDrf7O6bwluFsB FZVlKc47VnmizN/hy5T2E1e+Oa9qW5x4bR0piJkto8bzeipIpryKlbSfrD7x5JqPQkx9 8XiP7QS6/lGmk+MYV2hxVCflpWYLQIHbEdldMeiD2Gykg3V77IlJ3gdxOezQ4l2MUD1D thJCsAcqLyar/FUI3yLRtLC4GpWDu4xTI754DS8sUSWPZPP4iy5LulqCD4JMClSpweUS Ia4F4r1hWG6rF+ka1M+qQAMNpNcqqEwFjqK22GmXNRJXNy5e8UVD00PEuyeS9CPBj0dI 94Fw== 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 f3si1778922eje.693.2021.07.28.22.26.40; Wed, 28 Jul 2021 22:26: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 7EB4668A3AF; Thu, 29 Jul 2021 08:26:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2AB97689CFE for ; Thu, 29 Jul 2021 08:26:05 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10059"; a="210922205" X-IronPort-AV: E=Sophos;i="5.84,278,1620716400"; d="scan'208";a="210922205" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jul 2021 22:26:03 -0700 X-IronPort-AV: E=Sophos;i="5.84,278,1620716400"; d="scan'208";a="456730162" Received: from xhh-dg164.sh.intel.com ([10.239.159.167]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jul 2021 22:26:01 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Jul 2021 13:25:02 +0800 Message-Id: <20210729052509.30992-15-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210729052509.30992-1-haihao.xiang@intel.com> References: <20210729052509.30992-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v4 14/21] 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: hq5LGMIv/hi6 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) {