From patchwork Thu Nov 24 09:19:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 39403 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4408121pzb; Thu, 24 Nov 2022 01:20:21 -0800 (PST) X-Google-Smtp-Source: AA0mqf5TsgoKS666Eo64k66p9x4MQVqpJXn88mbssdkBsNJCi15UcTwvItBhfdT884vigszeEZ7x X-Received: by 2002:a17:906:b04e:b0:7ad:d7f9:1f88 with SMTP id bj14-20020a170906b04e00b007add7f91f88mr17793514ejb.217.1669281620942; Thu, 24 Nov 2022 01:20:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669281620; cv=none; d=google.com; s=arc-20160816; b=IlUxbOIXaRTTKMp1GP+jsetX1KgaBdZCYhg9W8z+v2AZgA4zVmekHmCT4clyJj3nuJ 1yKkMkU+97780RpuoksezWwnaR5Ytv5LQmOXXg8EjRKX+zdZRxIklYELSlFLFwa1rHvx rxgOHIz0BbSSJUEd4+zbCcwZqg/BlAFjO2zdT68hAhPgFXma42Ow2nH/fGzmRKmZM2mV 9L13IO/JQZPYsWaQNeWS8JQw5p6Zt1dKPRAGGKaJHVoV9MbN3AtFdMIvqIZ8NYc76eMF Up1ppRVrdZtR07XTbT0UYhWRBfs7upG+NAWwPFcEitOFkYf+PLpc5XkQH15lr30zdOqL WhIg== 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=NioTX7ZcF5wp2I2wx8NKf6UCs4v0L1O9kCV+TXcEqe3A4qp7XDUYHB7RtrrsL7m28Q TKax9xZRxsZmy7y69x03kro0L4JQR7uvYy59JnlQ6XgKA+wprJzY4Z0HY4BejKY0me1d oPbygtyKmPsqjYaqawP90OLLmPdqzEieYMcpIU2ky82/4TPcBOy1jp96474B4ctCVw6x pnPCCrsZvJGjLRiF+BXXw0s/TeX+EMMfBtxbmKHwPwvWXSbFO00RpFpYZyBj01Xorg5H 2VLGWBhMXAuQ2wBDrPT8IqwCoBl7dpdRIsz8pWoHnt+8agaSGmJ7WUU1DSSNJ4zvTEWi 9VaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=lBEsOnbf; 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 sa24-20020a1709076d1800b0073866c0672asi550947ejc.73.2022.11.24.01.20.20; Thu, 24 Nov 2022 01:20:20 -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=lBEsOnbf; 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 2234A68A55A; Thu, 24 Nov 2022 11:20:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C17568A55A for ; Thu, 24 Nov 2022 11:20:00 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669281606; x=1700817606; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OAJWMXqNLlNpb6hrppdrlFX48zGsrVnNJDwARUWziSg=; b=lBEsOnbf9wzIi69ow1653xETHl0HJ4AE7Mawj15Ay8HjDDcxnAYVB2ok RUkJaDoRsyRj+55Dbz8DsZPSXqIz6r7DwEUFzdcnu2T1oO7SVO+h7QKx0 Gdv3kyTodt755uJ8oIfL/HU6L3Qk7E+7LO0bwaReYh8H9Um4Xr7SOjZxl Kd1EcmkIzd6N08XuzwOXTTXe+LS/TAnVHNRKWjF7YM+YIG8xcrz6zlBd+ mZWJGNlcKESDBDzv6/hm66vUGkGQno/qqP1R0l03GS9fYdOy62xxWdYNw /SRRWGUArCXMK9VeYPA8tLyxdMsV1Xm1ezdvagiVpnCKmby6L/PF8SlvH Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10540"; a="297619606" X-IronPort-AV: E=Sophos;i="5.96,190,1665471600"; d="scan'208";a="297619606" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2022 01:19:58 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10540"; a="731078358" X-IronPort-AV: E=Sophos;i="5.96,190,1665471600"; d="scan'208";a="731078358" Received: from xhh-tgl64.sh.intel.com ([10.238.2.19]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2022 01:19:56 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Thu, 24 Nov 2022 17:19:28 +0800 Message-Id: <20221124091930.558046-2-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221124091930.558046-1-haihao.xiang@intel.com> References: <20221124091930.558046-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: Mx50Q2hFqerj 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) {