From patchwork Fri Jan 26 04:28:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 45838 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1b0f:b0:199:de12:6fa6 with SMTP id ch15csp77523pzb; Thu, 25 Jan 2024 20:28:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IHjW5jk1h/kGLB5MzRwiiHQL3AhMLE+n/qRNoVJMr3VoQqszrDzzBsczpdzRrnmMUYMi7+I X-Received: by 2002:a17:906:dcf:b0:a31:83a5:2a99 with SMTP id p15-20020a1709060dcf00b00a3183a52a99mr747414eji.47.1706243333849; Thu, 25 Jan 2024 20:28:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706243333; cv=none; d=google.com; s=arc-20160816; b=UIc4JBsSulJ/2zN0JXABYbzFc0Lc8Nz0rntqDGUcolOsHpsgfqbi7ZENQ3lIyz/CwH 41xYY46Jcq/mY6mG4Wd6oT0ONQ1bldvPewt3MIhn8NWsRJDvck613q+5MNoDkglml2bm hIitMEimr1tktZ3t6gwWKtmK39h2nmmqPwi/9juSOnqLL18pEXgqhCym5gqa3E4AK7np 3AMWDUa9y+pVPf24ceKiUcoP456BsdtqOPa5L/k0Pl7spJzVkCxpp+R2Y1d9+Dowv/Sd ihS11ZVB/O8UeBtyCdG0V0VDjInnbws3XNa+Zck4AyPjylEKs0MliBIgv5czFdRDeWOa ThYg== 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=BmURJ1EiwiwZ+TSgy130Bt60TqSuxu85D8feDVNF5M4=; fh=1kpmTRI1sW42eNCnNMby7VLIISQBX6KJuVYxOEG0t2A=; b=xRWGCf5tkN34G5bb6gsSeHnrDyO+qlfT9DyJBVlDVWBuTdxSQVNur62HOSMLB/75AD vjXKTrAUZGYGncTzEyyyCxMSzCW1DZNvCqzGEREAU/1FB/GaCafuiL+LHKsTufvuGx0c uWQEkVvXahw6R2WitcZIunviIPNC2g/PZejWek8Yo7DF/6UzCGqFq82zs844w3x7gzCm oOyhc42heg50vL7rk57Qs2qkXWnEhFLq740OMpzL5EK0cnpQac05Q/pxSYUqVOe3YMjO 054cu0JDBZjML9woZteqpxqIDSQlMIdQlAgpzXtoet2e9+wIoeNsL0k9ah1kt4vxdsPT T5ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=M73N7cU6; 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 l12-20020a1709066b8c00b00a27c7422162si187866ejr.237.2024.01.25.20.28.53; Thu, 25 Jan 2024 20:28:53 -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=M73N7cU6; 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 72B4768D0D9; Fri, 26 Jan 2024 06:28:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3F6A68CE20 for ; Fri, 26 Jan 2024 06:28:43 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1706243329; x=1737779329; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=duNJcCdtlPPcNVaoK0YrjBVMVa+DHGVi4/l8dI+BN7Q=; b=M73N7cU6REd+XKZL8kx+kD7zmTjttysPGMGXFTuAManQaSqYFQJOsoeS VqCTKgOFzWWjaBnSsEevJlFa1nI2qsJSmlYurBFMEx1nW4RRxpHFApPda 9fGyi4fk+cGeJUK/2QfAgbA4lYUe75b5RaCVXN6h9Lu2Xlk0XESWpQpPj sk8HmzuW120c2p9f4C51nJ1P8v0kvdkfh3qAVuGbIVwX74nnMVftRV6HW BiDBHLZRdr/v9cv9571BtAAdZtS7DD6FKHO2JUCZwdHOF0o+ETDtCDcvc SmHdIdUAzirkBhjhZgxbFBm0n6FzYS3h6tgypUTrSCb159EhuCq8fspfG A==; X-IronPort-AV: E=McAfee;i="6600,9927,10964"; a="9137414" X-IronPort-AV: E=Sophos;i="6.05,216,1701158400"; d="scan'208";a="9137414" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jan 2024 20:28:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10964"; a="786999999" X-IronPort-AV: E=Sophos;i="6.05,216,1701158400"; d="scan'208";a="786999999" Received: from xhh-dg264.sh.intel.com ([10.238.2.76]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jan 2024 20:28:40 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Fri, 26 Jan 2024 12:28:22 +0800 Message-Id: <20240126042822.111719-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/qsvenc: Add workaround for VP9 keyframe 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: qxkEZJNju3f1 From: Haihao Xiang The runtime doesn't set the frame type to MFX_FRAMETYPE_IDR on the returned mfx bitstream for a keyframe, it set the frame type to MFX_FRAMETYPE_I only. This patch added workaround for VP9 keyframe to make the coded stream seekable. Signed-off-by: Haihao Xiang --- libavcodec/qsvenc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index a0144b0760..c63b72e384 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -2578,9 +2578,11 @@ int ff_qsv_encode(AVCodecContext *avctx, QSVEncContext *q, if (qpkt.bs->FrameType & MFX_FRAMETYPE_IDR || qpkt.bs->FrameType & MFX_FRAMETYPE_xIDR) { qpkt.pkt.flags |= AV_PKT_FLAG_KEY; pict_type = AV_PICTURE_TYPE_I; - } else if (qpkt.bs->FrameType & MFX_FRAMETYPE_I || qpkt.bs->FrameType & MFX_FRAMETYPE_xI) + } else if (qpkt.bs->FrameType & MFX_FRAMETYPE_I || qpkt.bs->FrameType & MFX_FRAMETYPE_xI) { + if (avctx->codec_id == AV_CODEC_ID_VP9) + qpkt.pkt.flags |= AV_PKT_FLAG_KEY; pict_type = AV_PICTURE_TYPE_I; - else if (qpkt.bs->FrameType & MFX_FRAMETYPE_P || qpkt.bs->FrameType & MFX_FRAMETYPE_xP) + } else if (qpkt.bs->FrameType & MFX_FRAMETYPE_P || qpkt.bs->FrameType & MFX_FRAMETYPE_xP) pict_type = AV_PICTURE_TYPE_P; else if (qpkt.bs->FrameType & MFX_FRAMETYPE_B || qpkt.bs->FrameType & MFX_FRAMETYPE_xB) pict_type = AV_PICTURE_TYPE_B;