From patchwork Tue Sep 18 22:30:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10361 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp11293jap; Tue, 18 Sep 2018 15:32:10 -0700 (PDT) X-Google-Smtp-Source: ANB0Vda48lV9urCBcyZs5wSDVMRWM8W6d9b9nhEYDbZPXCZJ8/LPBXPAcFup/6kLWkMczKTKENi5 X-Received: by 2002:adf:ac6a:: with SMTP id v97-v6mr23458899wrc.7.1537309930873; Tue, 18 Sep 2018 15:32:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537309930; cv=none; d=google.com; s=arc-20160816; b=OaWrvgFa6aPQo+3W2odOdHVLJYXM53G3tT2lOOI2/dT4GjmgAFq7Np9uj4n7rQ6VYI k4YInFXm7ram2tgh3qQ4b3MnOnLKAAjmq3Szrs9IZO18KCC8oGWy86r80Orb8S/NLuSi I4YkFHJNJrH0g7ref3dq7UKW/bsl+X6goICyj1Cp0p+SyTZ1uHGt+2dUfD4v85OP0tjB 5et5cp+ExcG15HzKaB4P4xBdYr7wagvdiKlqqPpLsN0WP4qdAN/mGJx5BdwpyiAnVBlu hqYfxPIA7coAzZ8Lde2bUPU+QKHlcN1byzSqUSrdkjjjBL7P5cjTbk3LTgr0euBSrwWV TUPA== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=mI5VB0S4E1aMTnGPjnEha5oGoOznLbBGY3/Lb5qe2XA=; b=a7O6zTmcixu8Fje/9Icw4DIWQWdi9u9si/1pN3gZiQj/f3OtWYkHMZmT3l+xw4Dvjn j0vMKR4QRqez8GcHokILDXOVZcX7oTuTxKrrzIMwwIMxa2jxHDKPCubSBXX0VdtoOk8B qX79PJDkAOOLtoo+5TC+AOfRXjOz9ThSEavSWk6ojF+kEdKtJs3KqWJGp6VxNMTYSpMo p2Lj/EJEQBTc8VJoSD9YvwC9yS9vWR4eFuSZVNv/JbnNmkvGKuc9alBrmaDaLOcBaJ8P DIRwTsRc+g//GaAKl4n6J23PXnmWLW+5gYEskUawcN4vMtqkFia2jVq2hVjYTUzcp5GL FpRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=1X79x6UR; 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 t17-v6si13002858wru.207.2018.09.18.15.32.01; Tue, 18 Sep 2018 15:32:10 -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; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=1X79x6UR; 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 7686168A0E2; Wed, 19 Sep 2018 01:31:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0563D689F29 for ; Wed, 19 Sep 2018 01:31:12 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id q8-v6so4627246wmq.4 for ; Tue, 18 Sep 2018 15:31:25 -0700 (PDT) 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; bh=Q6IR8c9ZN8uULDzktmxCcK1gig01UlvNaSG4AzhMsuE=; b=1X79x6URI3BM05JKh0WAEEmF7IVi5EAE/aiVTeXxlZyrWhht1Ai5XZMmJfwA+vxlTu QS7LgLLI/Yg9msQPQhEj6Y6vgTClbZrXvd67byQ5FIxzqeVfh9orNtY7PDgQFygi8XW9 BpsKHd4LYhcMMvntwz8pk92hCa8kIHR2RGzsHIPVnGz2EVntBWRjalHmCSVG184+2W1j lANBVEs9+cJ0FDOY8FhtJuJclZVC+RQ4dndne6fexUay/2Ph3+AGO8l+yoh13rST0WJK GI5pCBKH7lIjgQxW7MK97UZI2PKCH0jXD9vrLp08uaLYB9FwfoNjNIL/r3Q6NX8gMjWS OLfg== 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; bh=Q6IR8c9ZN8uULDzktmxCcK1gig01UlvNaSG4AzhMsuE=; b=lk6peEl9BhKcBQby6ppxw9Z/+RGCdzG0PE0cT4NNWMPwygYLsQaGqHxfHTfnDMlV8L kSgoJaZfpKnREfK48vd4Zbin3upe2hzsDHPWKSGn1BpFW9Sutg+qvojoIO0MQwmnidgB zbPUAS4aaZghNzWptlcCaXFYyN9QUMdZX2BKTLGAQ2RdDbrzzVZBSdkFCzkhJ2yo563v sPr+Qn1789r1p43ZU91tS7jjg+MxEjDNDE5v7FF57sQo0TaasoaUTkxbShhrHH4HXPcS ai37Zw78C/x7YXd81TaXLTp8peq6/D8YS+7fibQBDZqaPMeOPIjlnAriMGCkmGNs3i/O l7pw== X-Gm-Message-State: APzg51DCpcqDwKIMmV2P9+VY4jAqlPqX9plfOYgIWkmrOB5JoflYXIH8 BKmJ9rWmrsKewwFBjaj1rTgHzk1D/hY= X-Received: by 2002:a1c:ee97:: with SMTP id j23-v6mr17939336wmi.66.1537309884058; Tue, 18 Sep 2018 15:31:24 -0700 (PDT) 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 e141-v6sm4863826wmd.32.2018.09.18.15.31.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Sep 2018 15:31:23 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Sep 2018 23:30:41 +0100 Message-Id: <20180918223116.14322-4-sw@jkqxz.net> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180918223116.14322-1-sw@jkqxz.net> References: <20180918223116.14322-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v4 03/38] vaapi_encode: Add common options between all encoders 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The only common option here is low_power - it was previously supported for H.264 only, that specific option is removed. --- doc/encoders.texi | 14 ++++++++++++-- libavcodec/vaapi_encode.h | 9 +++++++++ libavcodec/vaapi_encode_h264.c | 8 ++------ libavcodec/vaapi_encode_h265.c | 2 ++ libavcodec/vaapi_encode_vp8.c | 1 + libavcodec/vaapi_encode_vp9.c | 1 + 6 files changed, 27 insertions(+), 8 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index fe6c6ae124..9bf0b04028 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -2599,6 +2599,18 @@ Size / quality tradeoff: higher values are smaller / worse quality. @option{b_qoffset} / @option{b_quant_offset} @end itemize +All encoders support the following options: +@itemize +@item +@option{low_power} + +Some drivers/platforms offer a second encoder for some codecs intended to use +less power than the default encoder; setting this option will attempt to use +that encoder. Note that it may support a reduced feature set, so some other +options may not be available in this mode. +@end itemize + +Each encoder also has its own specific options: @table @option @item h264_vaapi @@ -2606,8 +2618,6 @@ Size / quality tradeoff: higher values are smaller / worse quality. @option{level} sets the value of @emph{level_idc}. @table @option -@item low_power -Use low-power encoding mode. @item coder Set entropy encoder (default is @emph{cabac}). Possible values: diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h index 0da8e356f0..30c3f7fbec 100644 --- a/libavcodec/vaapi_encode.h +++ b/libavcodec/vaapi_encode.h @@ -298,4 +298,13 @@ int ff_vaapi_encode2(AVCodecContext *avctx, AVPacket *pkt, int ff_vaapi_encode_init(AVCodecContext *avctx); int ff_vaapi_encode_close(AVCodecContext *avctx); + +#define VAAPI_ENCODE_COMMON_OPTIONS \ + { "low_power", \ + "Use low-power encoding mode (only available on some platforms; " \ + "may not support all encoding features)", \ + OFFSET(common.low_power), AV_OPT_TYPE_BOOL, \ + { .i64 = 0 }, 0, 1, FLAGS } + + #endif /* AVCODEC_VAAPI_ENCODE_H */ diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 456806032b..5ef72b222d 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -52,7 +52,6 @@ typedef struct VAAPIEncodeH264Context { // User options. int qp; int quality; - int low_power; int coder; int aud; int sei; @@ -936,8 +935,6 @@ static av_cold int vaapi_encode_h264_init(AVCodecContext *avctx) return AVERROR_PATCHWELCOME; } - ctx->low_power = priv->low_power; - if (avctx->bit_rate > 0) { if (avctx->rc_max_rate == avctx->bit_rate) ctx->va_rc_mode = VA_RC_CBR; @@ -970,13 +967,12 @@ static av_cold int vaapi_encode_h264_close(AVCodecContext *avctx) #define OFFSET(x) offsetof(VAAPIEncodeH264Context, x) #define FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM) static const AVOption vaapi_encode_h264_options[] = { + VAAPI_ENCODE_COMMON_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 }, { "quality", "Set encode quality (trades off against speed, higher is faster)", OFFSET(quality), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 8, FLAGS }, - { "low_power", "Use low-power encoding mode (experimental: only supported " - "on some platforms, does not support all features)", - OFFSET(low_power), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, FLAGS }, { "coder", "Entropy coder type", OFFSET(coder), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, FLAGS, "coder" }, { "cavlc", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, FLAGS, "coder" }, diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index 9fa16593d0..b8b66b87cb 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -1099,6 +1099,8 @@ static av_cold int vaapi_encode_h265_close(AVCodecContext *avctx) #define OFFSET(x) offsetof(VAAPIEncodeH265Context, x) #define FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM) static const AVOption vaapi_encode_h265_options[] = { + VAAPI_ENCODE_COMMON_OPTIONS, + { "qp", "Constant QP (for P-frames; scaled by qfactor/qoffset for I/B)", OFFSET(qp), AV_OPT_TYPE_INT, { .i64 = 25 }, 0, 52, FLAGS }, diff --git a/libavcodec/vaapi_encode_vp8.c b/libavcodec/vaapi_encode_vp8.c index a502df7885..9588826bfb 100644 --- a/libavcodec/vaapi_encode_vp8.c +++ b/libavcodec/vaapi_encode_vp8.c @@ -228,6 +228,7 @@ static av_cold int vaapi_encode_vp8_init(AVCodecContext *avctx) #define OFFSET(x) offsetof(VAAPIEncodeVP8Context, x) #define FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM) static const AVOption vaapi_encode_vp8_options[] = { + VAAPI_ENCODE_COMMON_OPTIONS, { "loop_filter_level", "Loop filter level", OFFSET(loop_filter_level), AV_OPT_TYPE_INT, { .i64 = 16 }, 0, 63, FLAGS }, { "loop_filter_sharpness", "Loop filter sharpness", diff --git a/libavcodec/vaapi_encode_vp9.c b/libavcodec/vaapi_encode_vp9.c index 88c0ce3b0a..4d7cec0520 100644 --- a/libavcodec/vaapi_encode_vp9.c +++ b/libavcodec/vaapi_encode_vp9.c @@ -251,6 +251,7 @@ static av_cold int vaapi_encode_vp9_init(AVCodecContext *avctx) #define OFFSET(x) offsetof(VAAPIEncodeVP9Context, x) #define FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM) static const AVOption vaapi_encode_vp9_options[] = { + VAAPI_ENCODE_COMMON_OPTIONS, { "loop_filter_level", "Loop filter level", OFFSET(loop_filter_level), AV_OPT_TYPE_INT, { .i64 = 16 }, 0, 63, FLAGS }, { "loop_filter_sharpness", "Loop filter sharpness",