From patchwork Thu May 24 08:41:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhong Li X-Patchwork-Id: 9070 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp1813374jad; Thu, 24 May 2018 01:41:11 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoxqxmEs72P5ZxquF6+cqcooFsg0JsHq1uxWi+Wb2apNIK1Wn1Vhb4P8UU6f8RlOK49prV6 X-Received: by 2002:adf:91c1:: with SMTP id 59-v6mr5301056wri.124.1527151271671; Thu, 24 May 2018 01:41:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527151271; cv=none; d=google.com; s=arc-20160816; b=NJLbQQ1pXAGnSA+iP+Hw+ZQb7RrZ7YqLSCnNwem3m0jxn6tguJlmk5Bsmf8+owi2gd UT31wMec++t2ChsyRgYCJ0CfkVhlfBu892pgb+uQ5njCPw1HFqRffuoe3MjLFljLEYW+ +wNkfmA4Etj0w1QCR9O7lbs1JYvAhksBwuKUuqCUlnnN2bZgzoMBw8UDpwazMLtMETJ/ UdMMzKubinfCa5cKqF91p5OKEDFZll4u7VCPxKT8EaYfzvyS7a0rkPNn4S+/4tU6UfMj 5j/nmDWCMX0zgY61x19DBn+o4C0Nx69Qq9irPeh4UIwbmMCWPAg7hVtjG3lM0DWXzuNv htzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=meIczDsRNOxeF0yVAJ56fcRV2CkojkI90+KGTSuR5XQ=; b=EuYWiGSfpgZVi0kovX15fWOEiInP2HrGY9/OudpvrsnMrvg8BN2OrXhT1P4cgCvNks 9lQYhc2gE5oxB0UK2ld5gBKfZCDNGoZot5hLS8AjxvzPQa3pnnc/e/hM2brpNyRs8ENH /C7roivfhgK248rYCQ/NsntzD03CV4ebREPs7OQPnDrimq/Xzyw5vavZP1Icn6mNFJ94 fMQ2YHQoV+jq6fvCPogTh3x/FxmY6RNET23TFuiif5XZvg0ibpmsrh1tCS+Oz5XhYFwz 6Mu7bzfuusehiu4rK3Hmbicu0vRbywu0DSyhoUfDjT/On9YU4+LSg8dVCEWUOkNNMCdr lF8g== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b25-v6si6981827wrc.171.2018.05.24.01.41.11; Thu, 24 May 2018 01:41:11 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DACDF68A316; Thu, 24 May 2018 11:40:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C3D70680B87 for ; Thu, 24 May 2018 11:40:20 +0300 (EEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 May 2018 01:41:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,436,1520924400"; d="scan'208";a="231245846" Received: from media_ffmpeg_skl_e3.sh.intel.com ([10.239.156.42]) by fmsmga005.fm.intel.com with ESMTP; 24 May 2018 01:41:00 -0700 From: Zhong Li To: ffmpeg-devel@ffmpeg.org Date: Thu, 24 May 2018 16:41:21 +0800 Message-Id: <1527151281-3721-1-git-send-email-zhong.li@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH] lavc/qsvenc: allow to set qp range for h264 BRC X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Zhong Li MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zhong Li --- libavcodec/qsvenc.c | 14 ++++++++++++++ libavcodec/qsvenc_h264.c | 2 ++ 2 files changed, 16 insertions(+) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 3ce5ffe..7200b88 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -649,6 +649,20 @@ FF_ENABLE_DEPRECATION_WARNINGS q->extco2.AdaptiveB = q->adaptive_b ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; #endif +#if QSV_VERSION_ATLEAST(1, 9) + if (avctx->qmin >= 0 && avctx->qmax >= 0 && avctx->qmin > avctx->qmax) { + av_log(avctx, AV_LOG_ERROR, "qmin and or qmax are set but invalid, please make sure min <= max\n"); + return AVERROR(EINVAL); + } + if (avctx->qmin >= 0) { + q->extco2.MinQPI = avctx->qmin > 51 ? 51 : avctx->qmin; + q->extco2.MinQPP = q->extco2.MinQPB = q->extco2.MinQPI; + } + if (avctx->qmax >= 0) { + q->extco2.MaxQPI = avctx->qmax > 51 ? 51 : avctx->qmax; + q->extco2.MaxQPP = q->extco2.MaxQPB = q->extco2.MaxQPI; + } +#endif q->extparam_internal[q->nb_extparam_internal++] = (mfxExtBuffer *)&q->extco2; } #endif diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index b107b87..242fa73 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -167,6 +167,8 @@ static const AVCodecDefault qsv_enc_defaults[] = { // same as the x264 default { "g", "250" }, { "bf", "3" }, + { "qmin", "-1" }, + { "qmax", "-1" }, #if FF_API_CODER_TYPE { "coder", "-1" }, #endif