From patchwork Wed Aug 22 23:44:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10099 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp1445816jap; Wed, 22 Aug 2018 16:53:31 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYy9pY2wikg3RW27GHFUMvCWv/q2dE4lDF+UWTzMurfwo8TSeVyrKpBiMxDYja5Y3uraZqS X-Received: by 2002:a5d:5450:: with SMTP id w16-v6mr3039285wrv.4.1534982011159; Wed, 22 Aug 2018 16:53:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534982011; cv=none; d=google.com; s=arc-20160816; b=wkU1a200Y84GqwW1VBUtlybvnlEHvbE0W55ym1AwI5QXY4Y8vVosoi0GbOLc0gZpdM aArEz/W5e+tk21jSJCAPqcpfZlcztHuRIiP/CC9iRD4uChBG7F+T/w6I/SuM2gzEHmj1 j7uJYCcmwzEJLjBRIYYhZyEzLXqBvdfIEp9pKND2kUflSsngxrhuVJX/KxKeKwjgkWbq rBcDc4l/C1okQLBis3jbYJmUOPYpjX5NTArDmn+VdW+aJ77fZ0h8Aa8/7gXwbGb/vJhI Z0EQUxzudJb5MLk4Lzi8dq68UlHZ2DrgXmtr4AbyfgOL6+DnKjNZDd4qWgIjTzkYIS4P d3vg== 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:arc-authentication-results; bh=bvuqvbs9bqLTlFeMscpx8SJmow5/UFzFSuGyBCGVY0o=; b=VuejkRDAL6qwGPpJZUHd+trG3Xt2BeuUb2Mf5iK+RtFdo0LBjobIsncP01q5pxwBgm SNmcgK4q8PRHJyu874uEcdz00UUaZ2MgxZHweTMlI1+sooNFTKxF7wblEm/vGw2WFUQr yv4y+EN+zOC4Jxzx9YJ4bQgfwTWTrBSp0zTUPzzI3Tx9RKu2iFxNxGVdYCV0XbJdsJlZ Cok3ssGP7pyGPRcsWxkgwRsXb72LZe40BC+ARVx9pGnY32RADQitjlXt2NvtckDVrM/y rptRm5zw9qwZITf0jrfYuJXOeYyp2/MPoHw8RWmXqyjiT9X60ocw8pfGvHmqY3tsjlPh CwMw== 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=wI+9q7V+; 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 o41-v6si2363859wrf.97.2018.08.22.16.53.30; Wed, 22 Aug 2018 16:53:31 -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=wI+9q7V+; 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 400FE68A0E0; Thu, 23 Aug 2018 02:53:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD09568A0B1 for ; Thu, 23 Aug 2018 02:53:21 +0300 (EEST) Received: by mail-wm0-f65.google.com with SMTP id y2-v6so3488657wma.1 for ; Wed, 22 Aug 2018 16:53:23 -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=8VTVWyJyI47ZwQmVoZyhU8pVM3NDkDQhjTb8AQdenVg=; b=wI+9q7V+oHK+/jBCsnxsnLU+WKAr+HOFHJTg3Y8x7RAk8QClWfBz8wsuUdW7QTrn9l h7kxn9eQ9OQrI0iJ7wmbTZAPMauRON49We9LbzKrvqYONqIcB0aUHKhnyhuqTrZM49gB xYaS6KMc4yxCYXhbW2b5FMxVvUe6B4kyxljDGcXU15zQ8EXouzfeyJsJG4lH/eCkMl1k lml1butk5PPWd/fRz/4+EISpHXVZ1I/cvyERL81ZbjpV+KY5YDgW3FbmTvtrsMsfUgUp lqnm9X9Kh3zM/ORsCos3ELVY/OnSJgoYBtJvSrpkAnXDAhVeXjN+9aA+/Dr6x2XxZ3Tw mW4Q== 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=8VTVWyJyI47ZwQmVoZyhU8pVM3NDkDQhjTb8AQdenVg=; b=J+OO8cRLiOXlsxhzI8SMutVYuY2ht9hUPQtz1qLXdyF88n+A7IWrPWLGDSaYZiNdHI KvU0FkxbE+/Ngm0AORlSs/ZpavpQx4Sfv2U/DMa9nXFhOE+7eCzGWLprtG6k8ojfbYSv McmGTHCcbpIkXcV0I3xW8LaWLetKNAOIEubgfgYocB51D1CFT8EYSMLTN/NVhKOL/2Q6 gVaV6V//XWgGpxFafuV7U7VlfzJTZ+9Vzrf2ahQ6Ce7QT5u9iV+2ZCE1AyBSdxcN39my 8jcD0vCL/XbOAAiVuS8u18yYqnfWgd77qI32HQ4ZrN1DE14abywJ/mKO4m2VgZ97KFq6 kmMg== X-Gm-Message-State: APzg51Cbowu/Rj71QGOtntaMDZn21ejFg4AMAG44JB6yHVzSpJ4ifhbb 8bD5+wTVlhUsRbr3c0+DasqRIzUE7AE= X-Received: by 2002:a1c:b684:: with SMTP id g126-v6mr3115988wmf.26.1534981531517; Wed, 22 Aug 2018 16:45:31 -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 x82-v6sm8184537wmd.11.2018.08.22.16.45.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Aug 2018 16:45:30 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Aug 2018 00:44:44 +0100 Message-Id: <20180822234514.10571-12-sw@jkqxz.net> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180822234514.10571-1-sw@jkqxz.net> References: <20180822234514.10571-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v3 11/41] 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 16be6359b3..62a1509a96 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",