From patchwork Thu Nov 24 02:47:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 39400 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp4233334pzb; Wed, 23 Nov 2022 18:47:53 -0800 (PST) X-Google-Smtp-Source: AA0mqf4gIGVZe04wAjcdSFeEyOb4kGjCfWRraRRIDZPR9M3tPELq5/ljGT0T2p6XOVBgHQ/ryafM X-Received: by 2002:a17:906:c40b:b0:7ae:1e53:95b2 with SMTP id u11-20020a170906c40b00b007ae1e5395b2mr25633532ejz.333.1669258073539; Wed, 23 Nov 2022 18:47:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669258073; cv=none; d=google.com; s=arc-20160816; b=ed1GqhPbTfFUMjkNZM2xFV92aBUwBLhsJ8RFrkzvPD4CJj3CbtxtuezPl1HvAo45zh DVXt3oax9TokJ8HO28uQizX4SGOzd0gfZoFyJv/WBCDemTSy5mheZoOcjh8VHV0XeY42 HLMCMyy7AC1JplQxXwusU6l2JpUujusBObfGA/b9SVlASGciJm16bRVNx2wJFR/UP2r7 7Dd3kk0e5DXQ0s4ZTco0XC1A5keibe0+kXp6C3BGauB7DOWvllSlwEzrT5EQ20uFHanH FfcBibf5fI88Cleid2ohPxqS40NtKJea8VKNvN3lqQ7zJvU+RFKh61YrRAt07tFJYk58 072g== 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=Jtv1TBpZewncAYAcY2U5ow07/3W1E0lVz2mWpLDVlVc=; b=Jv7nMAgu67UFSyYbgdRmGa/8bsgJML0FvYs3XfvBNyYb69ULNgVi5rKa9Df5JlMUM+ DyS4k3Gp0q4D41uG9ouuFmk05eht0I09PMziHuBIv/1BGIr6zwP+wOLrJmxfDonHWmV1 spsL5o0p2uA/HxNw4l0/SPc53VpIwqncQCLJzi0uN4rrA9vlaIghVoWAP+9Ztpp0bDhs hXCoN3tw7YKSCa6JdoFvkOUGGF/r6Yqb7YI4lQHP4yoUckq9lA0EKjQ5F45MNuen8w9p I2jAWyGi6KHa9XVMi0rKswpHWEuqWrJatA/g06YDcTGycFV5/TwqN1OPSqtF0nOhzO+i g44w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="W1XA5qV/"; 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 di13-20020a170906730d00b007af039d0bd0si1240887ejc.404.2022.11.23.18.47.52; Wed, 23 Nov 2022 18:47: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="W1XA5qV/"; 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 389D068A985; Thu, 24 Nov 2022 04:47:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ABF8E68B125 for ; Thu, 24 Nov 2022 04:47:41 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669258066; x=1700794066; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=j6J2tnE5yTUKP+orZ8Wqj0YKm9PHV6eLDCe4D4DYF1U=; b=W1XA5qV/84yEsu8HIC73xFQANEUHK6B82boh//ZoeDsbDdFya70/bp3q fnfTPiAnwBTN4krb8Y5PvEtZjPMXtXOHXsrAPjw6ElUzwEeAIlb5JU3VZ 5KuCrByWhQ8qc6Aq7/+tTPN6oRGiYu4rn3X8GqY8Z05LaChDbLeoSo7NV oacbAZitr48e9+X4U07JxRX8oHwNb1V6P42St+itPhcBUF4ST4aUw2zAX GYx6A3BXpw8dykYCaySv5II08oJK6h5Ku/jbqAQlnRSESCa/SNZHhj7cE SM53zWC0ZNankM6s+1oVuDsqMBkN5BaE5YSENuxOCNCAOqJFZGvq9wR1T Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10540"; a="314236611" X-IronPort-AV: E=Sophos;i="5.96,189,1665471600"; d="scan'208";a="314236611" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2022 18:47:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10540"; a="784462454" X-IronPort-AV: E=Sophos;i="5.96,189,1665471600"; d="scan'208";a="784462454" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.4]) by fmsmga001.fm.intel.com with ESMTP; 23 Nov 2022 18:47:31 -0800 From: wenbin.chen-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Thu, 24 Nov 2022 10:47:29 +0800 Message-Id: <20221124024729.881574-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] libavcodec/qsvenc.c: Enable MFX_GOP_STRICT when adpative gop is disabled 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: jdBc90u19n1c From: Wenbin Chen adaptive_i and adaptive_b cannot work with MFX_GOP_STRICT, so only enable MFX_GOP_STRICT when these features are disabled. Signed-off-by: Wenbin Chen --- libavcodec/qsvenc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index d5e9f2d420..514a1e8148 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -644,6 +644,12 @@ static int check_enc_param(AVCodecContext *avctx, QSVEncContext *q) return 1; } +static int is_strict_gop(QSVEncContext *q) { + if (q->adaptive_b == 0 && q->adaptive_i == 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 +761,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_strict_gop(q) ? + MFX_GOP_STRICT : 0; q->param.mfx.IdrInterval = q->idr_interval; q->param.mfx.NumSlice = avctx->slices; q->param.mfx.NumRefFrame = FFMAX(0, avctx->refs);