From patchwork Sun Jan 27 23:46:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 11890 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id B3E7D44DDD3 for ; Mon, 28 Jan 2019 01:47:21 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D892668B002; Mon, 28 Jan 2019 01:47:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1BDB468AFF2 for ; Mon, 28 Jan 2019 01:47:03 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id f7so16174399wrp.1 for ; Sun, 27 Jan 2019 15:47:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=0NyrFTlXIR19HBSWls9ekiPVGVhvTQX6RXgSyw/mTWI=; b=Lfj3AnybQPF5wgS8vKlfnhJ9mobCgmGyJ7xNqswIhd06ry7vP2WZ3fWmHA9E9gWxQm DkKMLvU8Z8+gBK8m0fFnf/2aaEAIRhFgxo5rpzNJzadt3IHzcha7yRu+sw9yp/IWeC39 RkxOriSm7SXdV9yu13Da8zk6rYpelgAHJR9fl/R7qSK3bYL7sypFL6XSgW1mcehS0CUC L5j7e6SNKQN30ZXmnPxYovffbFlwp8Z2IUSJeQGINW6hlIyMFypBZjDLwk8lN366YN8c WErTkWnb/3BjykbGWfPTpxkORMbXGTnsxEgmA+dU4y5uk0gmcppPwlmutDNCdwtm0lGH myaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0NyrFTlXIR19HBSWls9ekiPVGVhvTQX6RXgSyw/mTWI=; b=jzupWrcBzG7uGaRVvHVshv00zz0/RK8nlDy4Fk7i44XR1Hga3skOiRnVZMc2odx0Qh Gz8Qqnn1vn9d+X4bQSgMauO/aW/OiWi7Af4U7hl9dRYkFR8xuOzb2neV0EDUwFrvc1Up X77WR+RMCVlBtM/x92yYpN5AuQSfZNHiPnwKuPVPr/fLHGtrvspt1jdrLII+6a3Q3yK/ qtahTTMZOOUjax+M8rzcjD4soFT0tfIxcKIyGlv8gVIuz0Bc/jvZMYRNHWZ8+l85BGfT IIpKfm6kA0E1z4uFxEFd9jmb1k93KyfQfpTrp5mFivdHEbq2dbIObBHKDCpuPYnXKVcB 5Imw== X-Gm-Message-State: AJcUukdiO0Ofvbe+MHlnfRnv90mQy/Xfr3MqozBBQViqbElS29sa+rfc qoa2Jef2/Jt1hNv5CLC8CSaVMg6WWAo= X-Google-Smtp-Source: ALg8bN5OjuO3hZ0xKNLtwYAMgqGsuhl3XchQnnoiSxS4xznSgKWOOxqHvT6hdHKU40gkvr+4Imq+oQ== X-Received: by 2002:adf:9246:: with SMTP id 64mr20676079wrj.130.1548632842249; Sun, 27 Jan 2019 15:47:22 -0800 (PST) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id g21sm3642603wmd.0.2019.01.27.15.47.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Jan 2019 15:47:21 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 27 Jan 2019 23:46:58 +0000 Message-Id: <20190127234707.27689-2-sw@jkqxz.net> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190127234707.27689-1-sw@jkqxz.net> References: <20190127234707.27689-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 02/11] vaapi_encode_h264: Enable support for more RC modes 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Also fixes QP going out of range when modified by the quant factor/offset values. --- libavcodec/vaapi_encode_h264.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 4ea62d96f3..fb55eb7779 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -1071,33 +1071,34 @@ static av_cold int vaapi_encode_h264_configure(AVCodecContext *avctx) priv->mb_height = FFALIGN(avctx->height, 16) / 16; if (ctx->va_rc_mode == VA_RC_CQP) { - priv->fixed_qp_p = priv->qp; + priv->fixed_qp_p = av_clip(ctx->rc_quality, 1, 51); if (avctx->i_quant_factor > 0.0) - priv->fixed_qp_idr = (int)((priv->fixed_qp_p * avctx->i_quant_factor + - avctx->i_quant_offset) + 0.5); + priv->fixed_qp_idr = + av_clip((avctx->i_quant_factor * priv->fixed_qp_p + + avctx->i_quant_offset) + 0.5, 1, 51); else priv->fixed_qp_idr = priv->fixed_qp_p; if (avctx->b_quant_factor > 0.0) - priv->fixed_qp_b = (int)((priv->fixed_qp_p * avctx->b_quant_factor + - avctx->b_quant_offset) + 0.5); + priv->fixed_qp_b = + av_clip((avctx->b_quant_factor * priv->fixed_qp_p + + avctx->b_quant_offset) + 0.5, 1, 51); else priv->fixed_qp_b = priv->fixed_qp_p; - priv->sei &= ~SEI_TIMING; - av_log(avctx, AV_LOG_DEBUG, "Using fixed QP = " "%d / %d / %d for IDR- / P- / B-frames.\n", priv->fixed_qp_idr, priv->fixed_qp_p, priv->fixed_qp_b); - } else if (ctx->va_rc_mode == VA_RC_CBR || - ctx->va_rc_mode == VA_RC_VBR) { + } else { // These still need to be set for pic_init_qp/slice_qp_delta. priv->fixed_qp_idr = 26; priv->fixed_qp_p = 26; priv->fixed_qp_b = 26; + } - } else { - av_assert0(0 && "Invalid RC mode."); + if (!ctx->rc_mode->hrd) { + // Timing SEI requires a mode respecting HRD parameters. + priv->sei &= ~SEI_TIMING; } if (priv->sei & SEI_IDENTIFIER) { @@ -1147,6 +1148,8 @@ static const VAAPIEncodeType vaapi_encode_type_h264 = { FLAG_B_PICTURE_REFERENCES | FLAG_NON_IDR_KEY_PICTURES, + .default_quality = 20, + .configure = &vaapi_encode_h264_configure, .picture_priv_data_size = sizeof(VAAPIEncodeH264Picture), @@ -1226,6 +1229,9 @@ static av_cold int vaapi_encode_h264_init(AVCodecContext *avctx) ctx->slice_block_height = ctx->slice_block_width = 16; + if (priv->qp > 0) + ctx->explicit_qp = priv->qp; + return ff_vaapi_encode_init(avctx); } @@ -1243,9 +1249,10 @@ static av_cold int vaapi_encode_h264_close(AVCodecContext *avctx) #define FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM) static const AVOption vaapi_encode_h264_options[] = { VAAPI_ENCODE_COMMON_OPTIONS, + VAAPI_ENCODE_RC_OPTIONS, { "qp", "Constant QP (for P-frames; scaled by qfactor/qoffset for I/B)", - OFFSET(qp), AV_OPT_TYPE_INT, { .i64 = 20 }, 0, 52, FLAGS }, + OFFSET(qp), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 52, FLAGS }, { "quality", "Set encode quality (trades off against speed, higher is faster)", OFFSET(quality), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, FLAGS }, { "coder", "Entropy coder type",