From patchwork Wed Nov 16 02:13:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 39294 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp127529pzb; Tue, 15 Nov 2022 18:13:59 -0800 (PST) X-Google-Smtp-Source: AA0mqf7nXoTPm/4/3LemzZ+ywPmHkNJOcCK4raW/5TGrHp4DHVevgmyykpPau7t26u1G3oWeRKv3 X-Received: by 2002:a05:6402:298a:b0:461:4c59:12d6 with SMTP id eq10-20020a056402298a00b004614c5912d6mr17565237edb.250.1668564839158; Tue, 15 Nov 2022 18:13:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668564839; cv=none; d=google.com; s=arc-20160816; b=ElzvuOyd4sG0U6qXQyp/KIz+qpZI+eyVwhRX4LIUfWjya7oTveAmA18cuXET3v3is6 UsZfVXWbRKvu3uxErWqqE8q71ad5ekuvV64bK127Crepm3kWkxVDH8IXp3cURRyn/U+6 oSKBh6ekrNI6xl65uo1/brWraqVu7zBDArjKdwvectNeTlyQhQw1Bi29og5mZ9IVqG/i FjLJte4D+QFKaCWEo6NOX79UDx9N8iZwWRpiphG78KEfTXgTmQucUR1QIZ0EORpRFbyM mnZG3K9L0x8OE0BD8bUyDTLlkxWLb6oSGytucFTVW52kNacWf2WBWrFNR/adhVWw0cyb v4NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=Scqi2Tis/s8JN68Tim7Yng2xv3oqqJVUdvysxpMNg9I=; b=Esca15keI+MDcSvPG4YrjTzYnh5Hi+d88N90Q9liP/i4FVgOT1mWDtgjmgWKH8vtv3 qpHKe4m47BCBRa3WygXxE5gQt1p66tQjpeJVSNpe48td7DQXhiDA5h8+JsQ7TLPKfd0O kOxf61uBJhXHHPaMVLakfsFFRVIYhhd40IbQc8jqupBvvWBKjjSXyC0bT4bonn2PajAE vhgp3N88PJZubI2z9eQL09K3WvPOkoiOoB+RmQdXay+btxEeLk4Tvf8zmVVQ3tzLGN0Z pBKwXrQua6PwjHefsLoCG/JmHnMjhbNi8xL84Sj6xy9x6jkSPMMu3RZ8V0v4h0dmpAUc RMHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=lARj2YU6; 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 qk35-20020a1709077fa300b00783698dd8b4si13254834ejc.722.2022.11.15.18.13.51; Tue, 15 Nov 2022 18:13:59 -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=lARj2YU6; 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 AAE8268BD07; Wed, 16 Nov 2022 04:13:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 406B468B73D for ; Wed, 16 Nov 2022 04:13:42 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668564827; x=1700100827; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=GS8244vz5VqjWqWRkgbjoeCdyCAPVk7+8Kn5Gw3aQ+I=; b=lARj2YU6wDU+z+F/UncS7tMcLl6z6RI09kuOL2WswnygV/+AcmDhXcgF RKaeOz6CIg6kOF1LjzRod2TJz8vVNj4Mm2pi1ZqW6niIpDCnHHcMDSBEl 66BcXmZQguLxCbIXMo1haAvKdvMrAsN3Ng6NFbpemOoYEHdjGkcZMQ9h1 yRa/oZFV1mJz815pHjWxCE4UoVSdv/2xsdSkyHhxAVCQuHxfINJtDucaT t3jx4Wo5TC+I68ItP0Gxn/S+rOE+CsIgMW9x8Bzn/FdXIt2IL2kch4CuW dch76WWZiFOsY54rHzYNT3TC2SotSASxawHlEal/364EkfBLE/0HaRy89 A==; X-IronPort-AV: E=McAfee;i="6500,9779,10532"; a="310051830" X-IronPort-AV: E=Sophos;i="5.96,167,1665471600"; d="scan'208";a="310051830" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Nov 2022 18:13:39 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10532"; a="744850637" X-IronPort-AV: E=Sophos;i="5.96,167,1665471600"; d="scan'208";a="744850637" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.4]) by fmsmga002.fm.intel.com with ESMTP; 15 Nov 2022 18:13:39 -0800 From: wenbin.chen-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Wed, 16 Nov 2022 10:13:38 +0800 Message-Id: <20221116021338.502587-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavcodec/qsvenc.c: Disable MFX_GOP_STRICT when encode adpative gop 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0tWj4wNEmiMU From: Wenbin Chen b_strategy, p_strategy, adaptive_i and adaptive_b cannot work with MFX_GOP_STRICT, so disable MFX_GOP_STRICT when these features are used. Signed-off-by: Wenbin Chen --- libavcodec/qsvenc.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index d5e9f2d420..6777a6fb5f 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -644,6 +644,13 @@ static int check_enc_param(AVCodecContext *avctx, QSVEncContext *q) return 1; } +static int is_adaptive_gop(QSVEncContext *q) { + if (q->adaptive_b > 0 || q->adaptive_i > 0 || + q->b_strategy > 0 || q->p_strategy > 0) + return 1; + return 0; +} + static int init_video_param_jpeg(AVCodecContext *avctx, QSVEncContext *q) { enum AVPixelFormat sw_format = avctx->pix_fmt == AV_PIX_FMT_QSV ? @@ -755,7 +762,8 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) q->old_gop_size = avctx->gop_size; q->param.mfx.GopRefDist = FFMAX(-1, avctx->max_b_frames) + 1; q->param.mfx.GopOptFlag = avctx->flags & AV_CODEC_FLAG_CLOSED_GOP ? - MFX_GOP_CLOSED : MFX_GOP_STRICT; + MFX_GOP_CLOSED : is_adaptive_gop(q) ? + 0 : MFX_GOP_STRICT; q->param.mfx.IdrInterval = q->idr_interval; q->param.mfx.NumSlice = avctx->slices; q->param.mfx.NumRefFrame = FFMAX(0, avctx->refs);