From patchwork Tue Jun 15 06:13:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 28305 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp3527612iol; Mon, 14 Jun 2021 23:17:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9QQmFN/5ijb3Y/oHLcnXo+ijjnk/fwOLkJmJ2EOOls/KHHgTpzfEDG7vbVrPOc1UoaBDe X-Received: by 2002:a17:907:2895:: with SMTP id em21mr18506499ejc.164.1623737833528; Mon, 14 Jun 2021 23:17:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623737833; cv=none; d=google.com; s=arc-20160816; b=e2T4meshhWX7GiwqPVlxJcrRPnZUOwJ+EXws6TVQmS/Bh2ebPIeKvihIVMIO1cy6Mc NBm/WDxbvYmd/g1/+cNdDL9UXA46A+/euYRvrn/Xvn+QlUpZU4tZfHkX/jZmCPtU5RxN s1t/yQ4cH3Qulnbt2X7KJCseEdWIFWL0rgYSaZsHjdRAw9auVioZRqsCOSZfW0f79IX2 ENr0e/SKxfxmGIYcOIVBtpraSY+2NTlEkqYWS6B3Eeqk5XzwdzeowCIX22YbUb0hxB4d rQtBP+fu2SWdxUXRalPadAbEqXxHMNIXaEOh/TKNhwA5cBK+6OiWxo5f0mBGdguG8156 ygaA== 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=F8/MDQ97V2reyeJkPmvjFEi6G+10RC7JZu20t11OO+bzC+HQfuqmyzxX463Aa/P6Ab /FPHiPmPUX0znS0hB+PuhiPL6ihvu9VuysSnXzEfOKVeHmbD7iE4OTDVAijjgT3I+EfC t8lMwQcqv8bb3qkYvMivB9qk3fjTX5/8JEbEtbkDTaCs6qSMW7OuJmiml32au3wMGuwv YiI+EX6ntkmP+Mp9tCyhHxZqHfI2dNB/RyuObr88GC5wOWf0aU+7b/3tR/bIdC/bw4Nh RaJFKOZwOFwiXLuBNNUC6OKv0zOy8ixqoGEl7WbvtlptJLzGP+ribmj74ukDh0xh/ukP eqiQ== 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 rn4si16175374ejb.88.2021.06.14.23.17.13; Mon, 14 Jun 2021 23:17:13 -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 61E8168834B; Tue, 15 Jun 2021 09:15:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A50F5688040 for ; Tue, 15 Jun 2021 09:15:44 +0300 (EEST) IronPort-SDR: 9FwJsScFOb1WkXN/fQY6+bMh7npUvLdwWWYoaKz0jPM5nYxEwYdiWDcnklgZMmKqjIc10KM1OE iua7Wi6UM9+w== X-IronPort-AV: E=McAfee;i="6200,9189,10015"; a="291564256" X-IronPort-AV: E=Sophos;i="5.83,275,1616482800"; d="scan'208";a="291564256" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2021 23:15:42 -0700 IronPort-SDR: jPNZbSuSZCj17x7f6E3Ka/x+4alJU134zp6PjxuS2QNpBWbZoO0DXdc7y3WHM7CEKNH/0J1GSk LKJlh9KDoFbg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,275,1616482800"; d="scan'208";a="451857205" Received: from xhh-tgl64.sh.intel.com ([10.239.159.53]) by fmsmga008.fm.intel.com with ESMTP; 14 Jun 2021 23:15:41 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Jun 2021 14:13:56 +0800 Message-Id: <20210615061403.1576282-16-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210615061403.1576282-1-haihao.xiang@intel.com> References: <20210615061403.1576282-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: ZKSJXoRfkl96 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) {