From patchwork Thu Nov 24 09:19:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 39402 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4408058pzb; Thu, 24 Nov 2022 01:20:11 -0800 (PST) X-Google-Smtp-Source: AA0mqf4KSvGS64M4TQZ10xBdEN+KFkWQU2Z5ZIGwdHp/lJj4sHlfJl4ewFCo2n5ExcpPlKI706dQ X-Received: by 2002:a17:907:10d3:b0:76f:ab3:c641 with SMTP id rv19-20020a17090710d300b0076f0ab3c641mr17584301ejb.51.1669281611224; Thu, 24 Nov 2022 01:20:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669281611; cv=none; d=google.com; s=arc-20160816; b=WBE8Jgy42GyHXZl4R1XMvzIivAdns5o9nw5gHxbwPuD0Mtu77rl/hUhfeyAHsFgLbT drCRUWUqQ4fG7STRW1PBa/Om5oSRw1jEcYPxTAkMwXRk8K86XG2bYRATvFpRO7WuuFOL ix+pg2bQYJw9r6DyDQHzaZ1XNyxbHp6RqjCntDP7p7+xSvDg174hDj8kUMwplDb28of8 UHnqzCNyH0W8ZQS26QHxIE6Wtm+nUmtCk+lh0Q1K1d2xpsL4TP6lFOWX7Ikx/J67i0cK tdh/uWtxBr7djWrk8gW/0NfHfeCzae8xT/qaQXqOqhw+v49kIx1+v0p6HiNK0b74hrGj IpDg== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=wzewmewzXwN1fYWI+iHFMI/t/Ab2/2djcUhUPNF5yIg=; b=EogYS27tPfsKJmczHQ8x2JgAuk7SLUHwQKE3Sv7yxGlTA0oT+sCjDsQWM+KGfsfC4l /VaCniPYtXS2IsKZ9JcX90EkmANa12K4DayCjOBcUJ1EfuQ23Yie/m+FmiR8blx1b0Bl a/oyVBDpqf09H1JJ5ac4JC3nP8cYOCagVHQhLvB/LgP0F1ffAXvT73Vu3tbTx5+IE2md gFzZ1w9pkORqRKNzz0c4BMkc/jM1R+e+keJnb8jcGuMvU759MnVpfselX8g+1AqDd9NC LVc0ySNgcyd9CzgE7mXIKvsib8fTlfwlmcBoDdvvAJcw4A6LCXEF9sKbkfRyLLUjbU6L LmrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=RSV3dkfk; 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 js15-20020a17090797cf00b007adcc8fb7a0si529314ejc.399.2022.11.24.01.20.10; Thu, 24 Nov 2022 01:20:11 -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=RSV3dkfk; 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 0144F68B42D; Thu, 24 Nov 2022 11:20:07 +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 BD7E868054F for ; Thu, 24 Nov 2022 11:19:59 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669281605; x=1700817605; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=PLjVAp/u2Po6VIfXC5m+c9CKij2ALQyADJinprMGNYk=; b=RSV3dkfkHgfQxBN98fhcKQP+fdRVNM9lVSEZmv9/ROpQNbOYjK1OJP7x g1MPP83pV+u3Q9L/UxyvXZLoG6kPigcmS3089Gi7DzNJ3dq2CWQS1Zj5J M7+muOYtE5jVx1AWghv6Mr7QeuxQ7ubd7HRY4EYtvA3hwlie3ATIxaw44 HwdkCJLptS0pTx5st+wygH+PO3lFT33nyvcifvjlFf4iHpXxcJgDd06+r eAQych5HpCZqoz1A0AxgX6H/CXj2eSxRGeqJh0H8afV1tQ5pqWgR2esL+ iK6Gv+N5jKM7S8ZgcwQYoS3NbxZk10D4U0p2XiLM5R2mASzgj+RUKvfnZ g==; X-IronPort-AV: E=McAfee;i="6500,9779,10540"; a="297619601" X-IronPort-AV: E=Sophos;i="5.96,190,1665471600"; d="scan'208";a="297619601" 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:57 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10540"; a="731078343" X-IronPort-AV: E=Sophos;i="5.96,190,1665471600"; d="scan'208";a="731078343" 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:55 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Thu, 24 Nov 2022 17:19:27 +0800 Message-Id: <20221124091930.558046-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] lavfi/qsvvpp: change the output frame's width and height 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: "Chen,Wenbin" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3YrBTH9kQffE From: "Chen,Wenbin" Make sure the size of the output frame always matches the agreed upon image size. Signed-off-by: Wenbin Chen --- libavfilter/qsvvpp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c index 8428ee89ab..bf719b2a29 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -487,15 +487,14 @@ static QSVFrame *query_frame(QSVVPPContext *s, AVFilterLink *outlink) if (!out_frame->frame) return NULL; - out_frame->frame->width = outlink->w; - out_frame->frame->height = outlink->h; - ret = map_frame_to_surface(out_frame->frame, &out_frame->surface); if (ret < 0) return NULL; } + out_frame->frame->width = outlink->w; + out_frame->frame->height = outlink->h; out_frame->surface.Info = s->vpp_param.vpp.Out; return out_frame; 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) { From patchwork Thu Nov 24 09:19:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 39404 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4408203pzb; Thu, 24 Nov 2022 01:20:30 -0800 (PST) X-Google-Smtp-Source: AA0mqf6VwWBwLDz62pzVBtIPRVH5+2mhsXNqHPH/XNIj7oPPuztkdvfZ39SWtOdx/BHhBBjeRY4g X-Received: by 2002:a17:906:3145:b0:7b5:665a:fca5 with SMTP id e5-20020a170906314500b007b5665afca5mr11559789eje.10.1669281630111; Thu, 24 Nov 2022 01:20:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669281630; cv=none; d=google.com; s=arc-20160816; b=y274j6agaIoNdEW8GZLh1QrdwVskc1NMveB8vIYfjbWEbFypii5e3ZmrTYebZYuEha W2NpTsEHMcCV4kb7TjZ8msoF7Wi9G3v1UuFWsPG46NZh6PdWZVGUzsphhnFVt0YQG+7i 2kUtyXIv+OyOthPz0YW8omLHA/1Dfp/ZBaMUnKHlDHGpWHTwOG1D8VYVkE/XX6d6MlVa z0glQ7b00O7KPIJIPjlcExrd7nIeCEYsM3GVNe4nyZ61r17dUlaLQn08Lp0BAwYv24FH p/uNInnaL0OFgCcBpYQmFxfbHAoITSlsk3Fkgg7S2+bSKlYGZhtN0rRA0qXciWO0GUmD hkTg== 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=bLBOUCyzOHl2X4m4Kx8a4lrkIAFGRtpehl+RCumQ+9k=; b=da0A+GxtimYoyG/j3xVVyuyyGmbTPoktYOs8OMU60xi/IFGapo18TEf+QPw0zYImXo RktdtDESap8dHcxBDxGB7+kJ7VXb5ShkF+/BLZQN4stvtfj3dqT/uyny1TVMolN0BiId hxlH0PtLVKD+GkFSKJC/xD1PlBCFw1Ov7hynITLpDkf5aD8KWwmDJ6ZJVgEBvBeSLWg0 LWG2SXfJ22Ysh1j7AOOMIJxeWaN0GvnNqdrZlo3HIFok9fZMI5JFVAxNvXcCcWzQTaa1 OjFzbDhm88Cg6gV3sjoP0//WEL7r15w90B/wtI+G6As7GNgPiWL6ygEY6Ra4mOrppA3h vSwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=SXitG3I+; 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 wt7-20020a170906ee8700b007ae0ea7fbb8si420591ejb.825.2022.11.24.01.20.29; Thu, 24 Nov 2022 01:20:30 -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=SXitG3I+; 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 37A8768B7E9; Thu, 24 Nov 2022 11:20:10 +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 58F3468A55A for ; Thu, 24 Nov 2022 11:20:02 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669281607; x=1700817607; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jhA2UlSisJGgwNUgRj5IQaadN4grtqgf0IhcE2SI8mw=; b=SXitG3I+0Uy65vYxDaup3REwbODQ1J3o0W0Oeus+hUZRS9NeXMCDkd0R ZoIV5dezazxzbJcFLznLo4n2sobKAzLLfOHkvjzFduTKJctiKhXJyWxJi OE4C9q6wdXGe3Px71nZFmOH95V4aQZm3/D4INJP77vGga4/ygZKZGS9Pi xdUiw1uKfxSYcxXjAwQTtLGtTSnLPhDop2dLuG2pOKWKz9KuAL3s4hP8l j4K1fqXmWiaAZv6KfVa3O2/Ij5DdbKP0VqMd3EtNBMsoGhLmFvmkAPSCP RDa5/ARhVMmv/w0OAImmV7NDdNHVJ7c6/s3/QtRSnc/1leXi6ZWRgA8Dc w==; X-IronPort-AV: E=McAfee;i="6500,9779,10540"; a="297619609" X-IronPort-AV: E=Sophos;i="5.96,190,1665471600"; d="scan'208";a="297619609" 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:59 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10540"; a="731078368" X-IronPort-AV: E=Sophos;i="5.96,190,1665471600"; d="scan'208";a="731078368" 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:58 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Thu, 24 Nov 2022 17:19:29 +0800 Message-Id: <20221124091930.558046-3-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 3/4] lavfi/qsvvpp: provide a default framerate if needed 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: H3623IK13bI3 From: Haihao Xiang VPP in the SDK requires the frame rate to be set to a valid value, otherwise init will fail, so always set a default framerate when the input link doesn't have a valid framerate. Signed-off-by: Haihao Xiang --- libavfilter/qsvvpp.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c index a088f6b61f..a588a37610 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -324,6 +324,14 @@ static int fill_frameinfo_by_link(mfxFrameInfo *frameinfo, AVFilterLink *link) frameinfo->CropH = link->h; frameinfo->FrameRateExtN = link->frame_rate.num; frameinfo->FrameRateExtD = link->frame_rate.den; + + /* Apparently VPP in the SDK requires the frame rate to be set to some value, otherwise + * init will fail */ + if (frameinfo->FrameRateExtD == 0 || frameinfo->FrameRateExtN == 0) { + frameinfo->FrameRateExtN = 25; + frameinfo->FrameRateExtD = 1; + } + frameinfo->AspectRatioW = link->sample_aspect_ratio.num ? link->sample_aspect_ratio.num : 1; frameinfo->AspectRatioH = link->sample_aspect_ratio.den ? link->sample_aspect_ratio.den : 1; From patchwork Thu Nov 24 09:19:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 39405 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4408269pzb; Thu, 24 Nov 2022 01:20:39 -0800 (PST) X-Google-Smtp-Source: AA0mqf6xAopcoAqyK2xJLjTllFozU0RXIxnfZrqSFwJrT+o/fqxPXfHeSkWoVRTYQf3/nS99qdHI X-Received: by 2002:a17:906:4d8c:b0:7ae:ea7:2139 with SMTP id s12-20020a1709064d8c00b007ae0ea72139mr13221181eju.319.1669281639143; Thu, 24 Nov 2022 01:20:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669281639; cv=none; d=google.com; s=arc-20160816; b=Kf2eSGcuj7xOfZcluUa+3ujpsQeGX6b25J/ctrI8szD5NT6dVR35gdUDnCuxSV/74O poFuWcf8tHgxQQtCjMq6Y1Rlg3msVYf6hNcgoARvB1NXtVaTwz9rcrlu80zBpeqqYRay rrOLhr11FGxnT0ts9+f6SO5mtH0K7itbb/OPvTb/fYp1QNhymMAunA/+N+SxDyI3InDN sS2nKJ9SdVp+jrtDdVGqPwvc3g+INUc9VhxeUrEBd4NBxv4qCZ9b2MQECRKqkQ82hexS RlSg35cKg2AjcQFSmielEGwH+MySzy/6SJcRZC4immAI0QMNXCQfb3tIYhGyIogJ1J3W 46ug== 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=jtZd1ZB7PS78wOMZuQzsrlHmOe/ZYj7BFXEv4M+HiBU=; b=pM/rTayPVXgIzr86A48x/Hbqqs7Qgwe77dVFzjdRqJxJFWHLnjDRj3L3x4IscCv5IT xnB6iANNOOnP+7161SbFIF+9Zwm3zosZ/Kv3M0KWMWSNVGFELAZKLcC8zYMjLpnDLOlK +TyWT3Nh/ielBCJzL7TCUfHe1IExmwepUXXlq+eldtY9gfChxeCPgtW3Rl6lgeV+fSib 6ttR7sHV6jOcb4wiuxZLf/wgwEAKr/nBIuT9Ier50YPSF4v//3pO1Tjjczv1al6O4JUA Hq0OLgIqaoqInV+6j/jwaOlCLImnN3objj5mmH754rowy65/7WFtjoMn2gfoNHNDoNw/ ye/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=hcP7a7YQ; 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 nc37-20020a1709071c2500b007a1084820f6si547145ejc.230.2022.11.24.01.20.38; Thu, 24 Nov 2022 01:20:39 -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=hcP7a7YQ; 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 3DE6068B6A0; Thu, 24 Nov 2022 11:20:13 +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 AB95268B49D for ; Thu, 24 Nov 2022 11:20:05 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669281610; x=1700817610; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ePA+s03Hd9WRjbuf6Jn1Xx7hcxqre5o33YcoES26uPY=; b=hcP7a7YQB8o0OnTgBOncKhej9ZfsSCuAbGcpucbq9kgaj1aMe7utE9sY iEG0/IzHuc7LHi9/nRdPvuWm0iY7vsW3bRMepSx7L5u/RTBUzKjAY0W1l 6K/2xhp2KAt6zdi9AGMURWGRY5w4hcjDq6OYz0Hk/4jg29RTWCpOpij9M M6hBChuGhAiAd5cpR16BSHi4w9KTd15Cy1VIqeA7Gsm5XjUS8t75MGCuw yrAQa3NBIQzK/5+N87qXQwnYfbvgYM+0i/pJCaiRUXOWi3hkOitoilGOO GT1vzKB1zZxLJc/SkLChEfCtFCt299yMkygVm2LsNIiz40padJn6aJEPh A==; X-IronPort-AV: E=McAfee;i="6500,9779,10540"; a="297619614" X-IronPort-AV: E=Sophos;i="5.96,190,1665471600"; d="scan'208";a="297619614" 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:20:00 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10540"; a="731078375" X-IronPort-AV: E=Sophos;i="5.96,190,1665471600"; d="scan'208";a="731078375" 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:59 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Thu, 24 Nov 2022 17:19:30 +0800 Message-Id: <20221124091930.558046-4-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 4/4] lavf/vf_vpp_qsv: scale_mode can be applied to color conversion 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: 3/58vkGz8zI4 From: Haihao Xiang Signed-off-by: Haihao Xiang --- libavfilter/vf_vpp_qsv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c index 4a053f9145..17f2989245 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -492,7 +492,7 @@ static int config_output(AVFilterLink *outlink) } } - if (inlink->w != outlink->w || inlink->h != outlink->h) { + if (inlink->w != outlink->w || inlink->h != outlink->h || in_format != vpp->out_format) { if (QSV_RUNTIME_VERSION_ATLEAST(mfx_version, 1, 19)) { memset(&vpp->scale_conf, 0, sizeof(mfxExtVPPScaling)); vpp->scale_conf.Header.BufferId = MFX_EXTBUFF_VPP_SCALING;