From patchwork Mon Nov 28 04:43:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 39521 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp7272556pzb; Sun, 27 Nov 2022 20:44:13 -0800 (PST) X-Google-Smtp-Source: AA0mqf4KmFIh4ua5QWCTRN3uMMsZAAVVXlyAUGBhA5D21OAysW6WtOBdlfBQNKZqTHNqSUtuPPeI X-Received: by 2002:a17:906:fa98:b0:7bc:c8d0:6410 with SMTP id lt24-20020a170906fa9800b007bcc8d06410mr11422559ejb.414.1669610652806; Sun, 27 Nov 2022 20:44:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669610652; cv=none; d=google.com; s=arc-20160816; b=IIErqCnZdSyEWAgn+Q9xyAiQOZLmG+KfNR9yXx7pLHUOx8IcMFgp8c14D4jy1gFKqm fUWXyL92eq3s23AkIXIK+V4IBMoGIfq3jrz8J2kh5FfRkS+cMGQ0nJGoXYsV1302Q1Yb GWSebMDa7AT0c7TVx1npbTPdNXo0WcQrRt/anZ/qG1CHJmfnwp2IoFv8Q/3qQ6BR2pFf h7ur6rcoj0Y8o89JkPCXC9bS5Y+3AEddqrQt8Wr/K3GdnoOijFRh4WVKitx1wG2sI766 LblwwC1GUXJNaUiryLMQKXEhSgU0T1d65GAuytLfvOCwlBI4OiADhXMrXRrQnbd9EFcv UbVw== 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=EVEyE2oodjE//JnlurdHqpRJN8enpxVEr4/n3aDDJgo8FiDAp8h8om24dTw2iU1cij R8aP1MfFaO5epE09ryVb/ZYK7jZBJ6A+G94XJuqP4UN/dFcfS13YZMqYtMDI2RDre7iD x4fcA3Tufy4caECEzx1uxWnEpa6O8GKaaVf3jnhDq3tXBCCtT7ZyCxscEV8dAxkwI9aT MAkkPUqdKwpO6ErkxHpshuwLLlfYPLchD2YcZ+xxW7XcqQDe/F8FWkt58iSk+XWLinG5 Xh4tft2gU6clRh4vKyd0xoUfK3hEwKBFqMvRJ5a/jmdmW3RkY8JkXH7yCZGY2lAH9f9C Rm7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=LTNiIoat; 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 p23-20020a170906a01700b00791a6455597si7914945ejy.955.2022.11.27.20.44.11; Sun, 27 Nov 2022 20:44:12 -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=LTNiIoat; 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 6827E68B3E7; Mon, 28 Nov 2022 06:44:08 +0200 (EET) 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 BD5D46806F5 for ; Mon, 28 Nov 2022 06:44:01 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669610647; x=1701146647; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=PLjVAp/u2Po6VIfXC5m+c9CKij2ALQyADJinprMGNYk=; b=LTNiIoatLPgBdx3GKoMx5lGpYvqh/SmFnIpZydpusBqDs6ecgLXE9eHn HcZD5Vg/IvqFppR6EIR/3irzwMxyeDo79CCdUosOMWcNED7XqTjOMiDCV BTpxFu/sQmUJVE4s78wHSSuH/p87aAk0JQFvCfg26qMWc5nF0gokwQ/CX AeHfnU7SpaKwCQU6C1ClFMHMDNPJ4ayroehkeuiMqBgncWhZRowPMJ163 Oh2yXfID5wiIluLB3XZDl1y+c++Xo+z0L7ThBFNFQXx0Wq+rkbDH1itWb o6nUSIHIVbCRPjuhl9ZX6BQCvPTO5dH49iCMnC2Wx0DC51nd9p157TtVk Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10544"; a="302321151" X-IronPort-AV: E=Sophos;i="5.96,199,1665471600"; d="scan'208";a="302321151" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2022 20:43:58 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10544"; a="888272542" X-IronPort-AV: E=Sophos;i="5.96,199,1665471600"; d="scan'208";a="888272542" Received: from xhh-tgl64.sh.intel.com ([10.238.2.19]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2022 20:43:57 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Nov 2022 12:43:18 +0800 Message-Id: <20221128044321.613550-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: fP7T+ZWTLkxy 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 Mon Nov 28 04:43:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 39522 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp7272603pzb; Sun, 27 Nov 2022 20:44:21 -0800 (PST) X-Google-Smtp-Source: AA0mqf5c6IE0i929ArFMUO1yvL0E74eq0QYIfEJRywg8xtm4QLOwjIOz4IL9QjpZLd4TH7xCrl+H X-Received: by 2002:a17:907:7666:b0:7bb:dc8a:519b with SMTP id kk6-20020a170907766600b007bbdc8a519bmr15161026ejc.209.1669610661706; Sun, 27 Nov 2022 20:44:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669610661; cv=none; d=google.com; s=arc-20160816; b=XHiWFmfwq32J4nvvu/We3+G3YaGNgaM/FWXC9zxrlDpGESIKVgsb2/G8igz2ERWA0W px9d4aUY6qCG68UwUKR3gBtMQO4HVjyzRAqCDk2e/u7fMEU3g2g4+qhzO0pqEsadbU0n hDw4UMQ0zWzk1YHtqTjhLEmtuuipcUJuZbcmuPwnzFAAEq5+tZVSd4ERaoS1UWzsju3P 8PYMHXeTOQ+dicM7VoVppDl78weJlzIBdVRpt3BZZ5dmKSm9vOzE1XFRZeOZ9VNvSCwc IANxrwWsrkpzXT9TpJKfLZuhW6IDTqFzyfmhsnlPRNf4wUbkSlde+S3+tfTyiwjs8u4J ZIJQ== 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=MJe74Ah8ebhqQcCWuhCq2xIwoccjWX/RmvI7PUJVP+8WFHAj2sS45OHk8dghcy7eNi RUigs6GMzeiZb9N24AnXdpZl+4jdPisyM4v2z8fnG7r8CZrkTjV1sSZbB6VcUHYJsl9w Aa+YKMDFAh0/O+FdSrYaw+JasIC1MMI5LrPQ1TTGQQ0v0+2BcHBZmwCoWX4CDM+akga8 x7XyTChvOziIt5IF39YGu9BqOADgHbwriQ80oD54nwrdGbX9Y6/hAcA3Z6unnkopBwaQ Wk23lY/X0p5YwEYsjrttFLdP3vVFeljjZP1GdOc3QV+ojdCDu+Kou8tvmxvxC8/LVnJ2 4GsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=BbvgfqXE; 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 xf9-20020a17090731c900b0078d459a1ce9si9698115ejb.693.2022.11.27.20.44.21; Sun, 27 Nov 2022 20:44:21 -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=BbvgfqXE; 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 A861D68B4C8; Mon, 28 Nov 2022 06:44:10 +0200 (EET) 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 DB13B68B3EA for ; Mon, 28 Nov 2022 06:44:03 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669610649; x=1701146649; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OAJWMXqNLlNpb6hrppdrlFX48zGsrVnNJDwARUWziSg=; b=BbvgfqXE+Dk8E6C4KKN/NaKVGhWUg+LpFkHbXz8TZ5Uh/CGDkn9LdgU9 ZTnH5eO4ZI+10Mcya98RFZ7IBfLRwJNAvBpNJYOy/NywnlbfIAPqxWmYP 4BCBxbAcGoYidPlXh4I1Q7ARYPRJGBAqh4xOORRGzlGT/hScLg2E9YI/v Yb2Od4DCi2Ixe1wkZWqRUALls0Q/H5tMsgiD4Gp4l1cBEQwWiFhSthBQq ExS1aaemb1MCPG8KOMLaj61W28hO5cPFfG9TAhL3uVy8yeRcnTnVFGzL9 A3TAn0U0t9ds/XAjSzIwZIwMDbmKbyXSJGiggiBylIjSowGZrdoIMHosv w==; X-IronPort-AV: E=McAfee;i="6500,9779,10544"; a="302321153" X-IronPort-AV: E=Sophos;i="5.96,199,1665471600"; d="scan'208";a="302321153" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2022 20:43:59 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10544"; a="888272545" X-IronPort-AV: E=Sophos;i="5.96,199,1665471600"; d="scan'208";a="888272545" Received: from xhh-tgl64.sh.intel.com ([10.238.2.19]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2022 20:43:58 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Nov 2022 12:43:19 +0800 Message-Id: <20221128044321.613550-2-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221128044321.613550-1-haihao.xiang@intel.com> References: <20221128044321.613550-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: awEHDinSSRr8 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 Mon Nov 28 04:43:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 39523 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp7272646pzb; Sun, 27 Nov 2022 20:44:29 -0800 (PST) X-Google-Smtp-Source: AA0mqf7HdkGyyM1mwRcQIUwr+TyE4aySEVXyEyLftxnx7siW8+WFlclhDZEynpgB0VM/alGgHbJq X-Received: by 2002:a05:6402:f01:b0:459:9dd3:2217 with SMTP id i1-20020a0564020f0100b004599dd32217mr36458622eda.163.1669610669465; Sun, 27 Nov 2022 20:44:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669610669; cv=none; d=google.com; s=arc-20160816; b=l1S4DIf859tGPs7UJ1tOHamiq81tE3Nvgk3bwXz5rYzcGxM+GOAmHksrs7wZRJE0Y0 xLtjaAylRBsxPmZHlj3puICWLyAYzlpFHv5Oy4KBUFPqTdb6lFVaOhfOQ6fpkAJWcC6E 9v77ID5Rcpp6Lrd7Tuzv5XOIOmUXqkXNb/HrD0wylAj84Nf8HufHjqW+8pVEOp9Vf03A f5QwfSUlcuNdR+ySZ/cePd/c2alDSq4FN7SlScNpzsLPJmAESBMWX6G+WfTkvZ31yG5l P/dfuwelKinB0baPVcbHBMqyThtEbfguPj5qM8wT9r2kfeUmQpoZAfiGC2fUlaz0mDy2 vaNg== 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=HEXT9M6cvNIzv3X0P14nVQcA14qmMG7Mak2jgu1C/MjpL8mKdNnRMJQffCz5jDA0F6 AiOB3ZjSvza6Uro64CB9nGQUZjzwyc2GhItfU+4EYrqwTukhenlfLfLesp/XdLHSSrMG 8TAuTu+Q3T9M6doiE2HzwqCm96O1juYs0Q+M/oqiQnDej5cHSGzDZxfelgPwo9jkMu/8 JSeI4J5anGHzUkmyrAZF+CSnhmpV9sU0sYO3xIZjs/IS0nNZn+ul5Re+eeYgepHKppx6 ZzZ9egTdUfztILXNsChJ/3SnjXS2TsIpKDacJ7BJ9xU0Xko1Bv+/Jvxkuazj8l3LPanj 0k7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Z4yO1UPs; 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 ds8-20020a170907724800b00780328a0868si9997141ejc.110.2022.11.27.20.44.29; Sun, 27 Nov 2022 20:44:29 -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=Z4yO1UPs; 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 B67CA6806F5; Mon, 28 Nov 2022 06:44:15 +0200 (EET) 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 A1DB46806F5 for ; Mon, 28 Nov 2022 06:44:07 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669610652; x=1701146652; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jhA2UlSisJGgwNUgRj5IQaadN4grtqgf0IhcE2SI8mw=; b=Z4yO1UPsOWIJspjRniak3rc3yLGXXt41hww4bd6GZMA/EXcktxFLM0BB wUA35j2Pv8vjzkCz7NiWa2JL+rk2y+saMkpz/jEao0Sxav1Rrb1dwjJT7 8pcbZOxWb8dqU4jitD+khOT5+odrI/pX/mFMdhhiFqLKA28CkruVpYecW oRVS4c/x3BVWHFhtEi4AFJOHwkbqHUcTUCweMOG9nfEGFikTN1S6PMC3F HCAkptgkps2opgJae0olxVCb5JiNFr2tWzcgcK3ukqBjgFe8RlVp8NgSX OyH0d79xktFLJyVCLYAzx4J1UCsmE3d2c4bBaLn64ZcYf1Y0EBs725HBn g==; X-IronPort-AV: E=McAfee;i="6500,9779,10544"; a="302321156" X-IronPort-AV: E=Sophos;i="5.96,199,1665471600"; d="scan'208";a="302321156" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2022 20:44:01 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10544"; a="888272548" X-IronPort-AV: E=Sophos;i="5.96,199,1665471600"; d="scan'208";a="888272548" Received: from xhh-tgl64.sh.intel.com ([10.238.2.19]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2022 20:44:00 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Nov 2022 12:43:20 +0800 Message-Id: <20221128044321.613550-3-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221128044321.613550-1-haihao.xiang@intel.com> References: <20221128044321.613550-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: r5Pz+zodzDtg 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 Mon Nov 28 04:43:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 39524 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp7272698pzb; Sun, 27 Nov 2022 20:44:37 -0800 (PST) X-Google-Smtp-Source: AA0mqf5O8eOludN4/0HsGqTtWqzV2t5tc5Vbu6lYZDThgA5iYkkavidHLiEQkkdozeBMcVrt6sjZ X-Received: by 2002:a17:906:d85:b0:7ae:3a88:9487 with SMTP id m5-20020a1709060d8500b007ae3a889487mr41222424eji.193.1669610677310; Sun, 27 Nov 2022 20:44:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669610677; cv=none; d=google.com; s=arc-20160816; b=0JQoR6wLNQPmdfUj4nVUTQ/nRMnmH1oMWfg3oQ2HvTQlG7lVCalGQ1dCWQwIlK1+71 qz9a72JJceYJoyonH1SOr56y7EmNJhpoDZ0kupMDOwKKHTH0g6HBCdZTU8Ygmph0WinK G/MlVafbtGOpOVvXRItJH7cZ+lawEOaUJ/6qUk+A6oxz9wcI0AVtNopW4QPFQ0U8BLfs o6Zg5mg6YkNpPe4FS/gHPafl/e+yZxGw3BSRTe4IwF9HZ1xJBMnpDS49DLgw2/9h9uRh dKxgKwLy5i8RyFrm/VjO0lisWZB+4F+8WHtJwCMdfSmqnQpkh3pGLNMIuehnLrHgeASD 9I7A== 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=Cj7egltYX4CKNJ8v7vG21BSj4SKFC+s7Gb++hR8oYeg=; b=RTk6wvauNKSLb6BRJbv7YJ1Kh7LPxd8vH9QtY7Wz6PAyUTB3y3golqB5WRjDn1zYsh wfjnEUiwenV5vSd1MgR/6qQYA869pWlUPkM7l+mQgaio2Nw/PQL0tuyZBKuWm/sv/J8e 5mz5mIl5E0jnPMYbnmBI9l8cquAytcG5svVLUmS2CtGQhh5CdZ/GMxoS608phDVmseDK mGcptYgqENcNxsfviecy79RS1DAQp6l2GNj66hTxCodbh1+YES+m+i5b/zagCoYnK/Nh gk/h71VfR3HD9qZOt+UQil+tth7tm8RGyTvMAxspEBMosIZMLAAHBlB3TyWL3spgh3tu omWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=NjKdwMSF; 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 hp22-20020a1709073e1600b007add8160fd9si9141019ejc.765.2022.11.27.20.44.36; Sun, 27 Nov 2022 20:44:37 -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=NjKdwMSF; 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 C04A068B6C8; Mon, 28 Nov 2022 06:44:16 +0200 (EET) 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 DE7726806F5 for ; Mon, 28 Nov 2022 06:44:08 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669610654; x=1701146654; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=u8EdciRrw6nsJWOLFYLuPpColwg4CjWghpki+50umKA=; b=NjKdwMSFzQ6GbKymjLBqOFHPTtGPiUCcOdUyb4levVkDLaOu19NTpi2c 7z42dunNN6RrZNtz81EdB7S1c7PtK7d2ljI3MCJmUNynXB6fdpaL3wHYD VL0qfO97+BUt5oDYzy+QKtJMrJrZJib0MD30IWZ95oaeHIAcSJ5RkEPer LrGK7nDpi4ajSw0hgFIA4szGv3Dp9+fEOAadui7mZTbiT6M93tG33EQ7u cCci5j5qhsUT49U1+RjtdzBqdHEuqSv6qxTxsYqLhz0vNIe3/HY4I6CgM aIUgNSfQvODcVRV5uyNmrcPS+NtB4r9AySHcM28PmXWk3RUmC7LC6NgZz A==; X-IronPort-AV: E=McAfee;i="6500,9779,10544"; a="302321159" X-IronPort-AV: E=Sophos;i="5.96,199,1665471600"; d="scan'208";a="302321159" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2022 20:44:02 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10544"; a="888272553" X-IronPort-AV: E=Sophos;i="5.96,199,1665471600"; d="scan'208";a="888272553" Received: from xhh-tgl64.sh.intel.com ([10.238.2.19]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2022 20:44:01 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Nov 2022 12:43:21 +0800 Message-Id: <20221128044321.613550-4-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221128044321.613550-1-haihao.xiang@intel.com> References: <20221128044321.613550-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/4] lavfi/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: B/0HltU8lYor From: Haihao Xiang Signed-off-by: Haihao Xiang --- libavfilter/vf_vpp_qsv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c index 4a053f9145..a14b3de7b5 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -133,7 +133,7 @@ static const AVOption options[] = { { "height", "Output video height", OFFSET(oh), AV_OPT_TYPE_STRING, { .str="w*ch/cw" }, 0, 255, .flags = FLAGS }, { "format", "Output pixel format", OFFSET(output_format_str), AV_OPT_TYPE_STRING, { .str = "same" }, .flags = FLAGS }, { "async_depth", "Internal parallelization depth, the higher the value the higher the latency.", OFFSET(async_depth), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, .flags = FLAGS }, - { "scale_mode", "scale mode: 0=auto, 1=low power, 2=high quality", OFFSET(scale_mode), AV_OPT_TYPE_INT, { .i64 = MFX_SCALING_MODE_DEFAULT }, MFX_SCALING_MODE_DEFAULT, MFX_SCALING_MODE_QUALITY, .flags = FLAGS, "scale mode" }, + { "scale_mode", "scale & format conversion mode: 0=auto, 1=low power, 2=high quality", OFFSET(scale_mode), AV_OPT_TYPE_INT, { .i64 = MFX_SCALING_MODE_DEFAULT }, MFX_SCALING_MODE_DEFAULT, MFX_SCALING_MODE_QUALITY, .flags = FLAGS, "scale mode" }, { NULL } }; @@ -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; @@ -501,8 +501,8 @@ static int config_output(AVFilterLink *outlink) param.ext_buf[param.num_ext_buf++] = (mfxExtBuffer*)&vpp->scale_conf; } else - av_log(ctx, AV_LOG_WARNING, "The QSV VPP Scale option is " - "not supported with this MSDK version.\n"); + av_log(ctx, AV_LOG_WARNING, "The QSV VPP Scale & format conversion " + "option is not supported with this MSDK version.\n"); } if (vpp->use_frc || vpp->use_crop || vpp->deinterlace || vpp->denoise ||