From patchwork Fri May 24 05:20:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 49196 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp1495275vqf; Thu, 23 May 2024 22:21:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV24emIAzd3iLU6JEqflnerYbNWFpQ93kZMBNYrORDfnYSYGUj7MKVLsf5mGlKit23TVS0Tj9XjH7ZrNVV6xcfl8H5afO2X5bmHCw== X-Google-Smtp-Source: AGHT+IEZaqUE2r3AWTXJ/OJhZViPojLMidqA9AWEP+YOWO4EYbDDQ7vWbcDgGazaiYB+yykGb2VV X-Received: by 2002:a50:c31a:0:b0:575:954:6db with SMTP id 4fb4d7f45d1cf-5785194f0f7mr895367a12.12.1716528085225; Thu, 23 May 2024 22:21:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716528085; cv=none; d=google.com; s=arc-20160816; b=W6zP32t8IWMxJ9AwRewCdj+tygdlidq2vH+YRSCyZ16VJVMZ6ofoTMUr3GWm197TAy 0/nLGvk1bHIcXU8ZufLWcqMt4zq/NqVIkNQyuYtdDUmaMVy5F7m5XV1oUTCxpvTb5+7p T+BBJFW50LqZfuvBXUrDitAWZ53hTs4pBHQRnbkxT3HZfk3BF1pJsh1Hir1dHjSBADV8 9bJpL1fxSkEZ1F6GWKccQSLcikGkeilljbVjmBQjZAaqJ0NBoCj1lsudg2niQexHqT4n JWBgXjGF2rQV1E3pIjM3jTVdUUibyzA5YFE23KBbaE2cxpAcoY+g+9M+DeJES3xvyKz7 MVZA== 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=6HAUeZq1uo/K1oiUcf9dpv3vENA/MgDN2Z7TBA9D8gc=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=Ne/BLyiC1pYwL9a1L7U2tMHuVJ/ptBUurIhL+vikTIA57c7a+k9A+Cwcg9lcwQMM3u QvL1/Mr2ZB4am1oZI4zIGz5t6/qZYDmuXcZm7xw7RDyj/paezrEK+sYZ9iqP6nNOI81G niwU6fA5aSXPgO8famAFuUyMBtnbwGcZBucm/LVI/K58gs/DeDbDJYb4LqifsaZLE91T fN2vqWDFVsnJsOV9GnPWs5+3+6jxftFKqj0NcmybNBaaQ0VmYafWRximalrcQzikgn1d xPj8mibfJKVoAn3yHF3scs86yQlCF1IqB65ACJbNYDxMacS33xhHK5bYOpHm/6zINUHX wCXg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=SGZr0uvX; 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 4fb4d7f45d1cf-57852331a6asi477846a12.138.2024.05.23.22.21.24; Thu, 23 May 2024 22:21:25 -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; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=SGZr0uvX; 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 A067568D4C1; Fri, 24 May 2024 08:21:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AA6E868D3EC for ; Fri, 24 May 2024 08:21:13 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716528079; x=1748064079; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=JrWCFBJhy/zHcbWJlzeu6wTyOMY/Be4K/G9r0HsVSUY=; b=SGZr0uvXljbxvd83NTvhcFUbEmJ763iCiVCcn5o21A2fo3z/3qcwCH50 /3iwN3toct92DwpXvlOY00JOhos5zBre6j9oKPzb+Qe67qC74IzcFYrZo ryvPGO1A7ql5GFEJfbejeXYMI6lsu799Is6Xsbs6pVDEz/mlVeAjvM8oF GmGvEOW5rSbnP0GN34/trGukhDVEtXqk5m9taECHijyD6p9pIg7H/vAdO dMLJheiRaA9ppiKu1JJKSJ5Yjf9syYW5dIOcMh1AnDFKrb/WABHwFwgad Nlllde4yP3Byp4LxuPAM1SbXeYi5V69nml2bqt87eQVApqlpqmbbplzw4 g==; X-CSE-ConnectionGUID: Sr2+5EsLSR6g5Fq/p4BFvg== X-CSE-MsgGUID: KPRnSus1Q3G987+cYoeebQ== X-IronPort-AV: E=McAfee;i="6600,9927,11081"; a="38271392" X-IronPort-AV: E=Sophos;i="6.08,184,1712646000"; d="scan'208";a="38271392" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 May 2024 22:21:10 -0700 X-CSE-ConnectionGUID: Il4NT2+QQsK91bTwZcno5w== X-CSE-MsgGUID: ZHACiNv+R32omPUnkRWkrw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,184,1712646000"; d="scan'208";a="38348479" Received: from unknown (HELO xhh-dg264.sh.intel.com) ([10.238.2.76]) by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 May 2024 22:21:08 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 May 2024 13:20:57 +0800 Message-Id: <20240524052058.1671400-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] lavc/qsvdec: fix keyframes 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: uuwXf4FPxT8g From: Haihao Xiang MFX_FRAMETYPE_IDR is ORed to the frame type for AVC and HEVC keyframes, and MFX_FRAMETYPE_I is taken as keyframe flag for other codecs when getting the output surface from the SDK, hence we may mark the output frame as keyframe accordingly. Signed-off-by: Haihao Xiang --- libavcodec/qsvdec.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index df0d49bc10..6ffd498456 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -885,12 +885,18 @@ static int qsv_decode(AVCodecContext *avctx, QSVContext *q, frame->flags |= AV_FRAME_FLAG_INTERLACED * !(outsurf->Info.PicStruct & MFX_PICSTRUCT_PROGRESSIVE); frame->pict_type = ff_qsv_map_pictype(aframe.frame->dec_info.FrameType); - //Key frame is IDR frame is only suitable for H264. For HEVC, IRAPs are key frames. - if (avctx->codec_id == AV_CODEC_ID_H264) { + + if (avctx->codec_id == AV_CODEC_ID_H264 || + avctx->codec_id == AV_CODEC_ID_HEVC) { if (aframe.frame->dec_info.FrameType & MFX_FRAMETYPE_IDR) frame->flags |= AV_FRAME_FLAG_KEY; else frame->flags &= ~AV_FRAME_FLAG_KEY; + } else { + if (aframe.frame->dec_info.FrameType & MFX_FRAMETYPE_I) + frame->flags |= AV_FRAME_FLAG_KEY; + else + frame->flags &= ~AV_FRAME_FLAG_KEY; } /* update the surface properties */