From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 03BA744F6A for ; Mon, 12 Jun 2023 08:16:34 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5BF4F68C3D2; Mon, 12 Jun 2023 11:15:56 +0300 (EEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A552068C39F for ; Mon, 12 Jun 2023 11:15:51 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686557751; x=1718093751; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sldhKo6sxOE1E5Ljf0MX2NWENMvJTD1MIgLbZjXHVT4=; b=CC/p+NZ/1fFDsU1j+G2geqMGM8cSxLLweEpWOWbgX63jCvNvMHKQedTp NC3MzxTm1MkJCKtFgDNSSn+lKSFyk95omUKgi1zo8tUAAt30lkEpQwjWs TuvRJBt2+8rFrvrezPhL2AbOOElSB86vdAXia6EsUwJ5aPzRt5QYnuLML OEsvhe+2L+2Z1iyuM46gfNQvERW82ydU7/35OcLduu0zO/fXfAN86Wlo3 gsV18ZPuwOM9zrTyah1wIu94FZNRxB+h9o2einiJBRrVuCIQYCbpLQr/D 4I3Crm1neaBw0exSeRcRPcc2WAW1sW36P1TrKHeMdHutuW5jRbOCdZU1k g==; X-IronPort-AV: E=McAfee;i="6600,9927,10738"; a="386360248" X-IronPort-AV: E=Sophos;i="6.00,236,1681196400"; d="scan'208";a="386360248" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jun 2023 01:15:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10738"; a="711111626" X-IronPort-AV: E=Sophos;i="6.00,236,1681196400"; d="scan'208";a="711111626" Received: from xhh-tgl64.sh.intel.com ([10.238.2.19]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jun 2023 01:15:46 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Jun 2023 16:14:48 +0800 Message-Id: <20230612081448.936570-6-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230612081448.936570-1-haihao.xiang@intel.com> References: <20230612081448.936570-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/6] lavfi/qsvvpp: use the right picture struct for vpp initilaization 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Haihao Xiang Signed-off-by: Haihao Xiang --- libavfilter/qsvvpp.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c index f2e8e5fd73..a03de05d9c 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -536,6 +536,20 @@ static QSVFrame *query_frame(QSVVPPContext *s, AVFilterLink *outlink, const AVFr out_frame->frame->height = outlink->h; out_frame->surface.Info = s->vpp_param.vpp.Out; + for (int i = 0; i < s->vpp_param.NumExtParam; i++) { + mfxExtBuffer *extbuf = s->vpp_param.ExtParam[i]; + + if (extbuf->BufferId == MFX_EXTBUFF_VPP_DEINTERLACING) { + out_frame->frame->interlaced_frame = 0; + break; + } + } + + out_frame->surface.Info.PicStruct = + !out_frame->frame->interlaced_frame ? MFX_PICSTRUCT_PROGRESSIVE : + (out_frame->frame->top_field_first ? MFX_PICSTRUCT_FIELD_TFF : + MFX_PICSTRUCT_FIELD_BFF); + return out_frame; } @@ -851,13 +865,16 @@ failed: return ret; } -static int qsvvpp_init_vpp_session(AVFilterContext *avctx, QSVVPPContext *s) +static int qsvvpp_init_vpp_session(AVFilterContext *avctx, QSVVPPContext *s, const QSVFrame *in, QSVFrame *out) { int ret; if (s->vpp_initted) return 0; + s->vpp_param.vpp.In.PicStruct = in->surface.Info.PicStruct; + s->vpp_param.vpp.Out.PicStruct = out->surface.Info.PicStruct; + /* Query VPP params again, including params for frame */ ret = MFXVideoVPP_Query(s->session, &s->vpp_param, &s->vpp_param); if (ret < 0) @@ -940,7 +957,7 @@ int ff_qsvvpp_filter_frame(QSVVPPContext *s, AVFilterLink *inlink, AVFrame *picr return AVERROR(ENOMEM); } - ret = qsvvpp_init_vpp_session(ctx, s); + ret = qsvvpp_init_vpp_session(ctx, s, in_frame, out_frame); if (ret) return ret; -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".