From patchwork Thu Jun 7 23:43:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 9295 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp193400jad; Thu, 7 Jun 2018 16:45:26 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJgChh1RdAJaVLf6MqyDOvja7gT5DVi5Cytho70g7eWAjbRx20p0LW1oymBZZJ3CFjqZMAS X-Received: by 2002:adf:e94e:: with SMTP id m14-v6mr3214116wrn.126.1528415126683; Thu, 07 Jun 2018 16:45:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528415126; cv=none; d=google.com; s=arc-20160816; b=pOFF8IG3L+7NO3Wh2gOu5hcOAWh3PtGSlsE05bDsAM8ZzZhS5aRWUFlxuhgfvG88va +6+TzJXOUkFNb0xYGRPzr0Kc+TS+WNhsB1ICc3dxHE5obmguoU+DUbySmxp1TpjNrhyZ aLZso5oXvC4cAzllzTkm/zhrdFWlOiAtv1PGUqQ2rtutF6WK/1rBN7yIqHOewAv6/XZp Z19Coh2M2SdeEjfc/4FTojVS2ZQwc4pvY9w4Us2EwkUcceN1oqWDG0ZQQhbzGNDgZSoi PA1JLNqJE37mZLIS4OgkYr3/wXPN8UbxlLFVHNer9/TbrNG1g0QvZfWy4v1cWuUl37TP AGNA== 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=VhGk53fhbV0Y10vW4Wklb+5h7JGMuKB0rNlDcB5GcA0=; b=xHEAzKxvyaJCi1Q8t+jthV3dSqQ3rPPZBYK1vNXdnkOFJ57yd77JFdNnCUCahu+V9A Px5u6DYhJm+quZzMamWH1EZFTF0Z1Uel5mhGZjo4L6m9tbPnA6T9F9VltVdloRj61CDP 12sfkEFo5ZX/8zUw6PTLOLbZ9D4KvrjYgdlmx/8kcWwgzcH/tr6XSea+T//3nJy5qJM7 xfugiKrWIIasPHpKyZz5PByGI6rk/E0XRGhwfxWO8jevPKgomENhAfDJBXjVTj/tSLzv 6XLp4eZeb9G07IHIe7DRvpEVVp/WzHOvfVqKJejqpP9z8sqS49/qP3EdpIevvk9sNSqW NFXw== 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=NemxXnoT; 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 18-v6si24707734wry.292.2018.06.07.16.45.26; Thu, 07 Jun 2018 16:45:26 -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=NemxXnoT; 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 54CD368A7B9; Fri, 8 Jun 2018 02:43:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9EA2D68A6F9 for ; Fri, 8 Jun 2018 02:43:04 +0300 (EEST) Received: by mail-wr0-f193.google.com with SMTP id h10-v6so11511739wrq.8 for ; Thu, 07 Jun 2018 16:43:52 -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=HPcJ6zC5gFmW35h21mcNaqjjPdnLYqvuRcj9DsygSz8=; b=NemxXnoTEyy05m5IzukJ4S94XQJ3cyjofmcCossCZBaxVxlZalPAxdo9hvVfLirtol fRqTxSAxn8mSgqVaMncplu6OgMawFHGGhsAkufe84ZyCA7XoSS7M1FpLR8OZtDoG9eRW aH25PkDRZzorYrntpjrB02/Y7U8yzVhCWEEnXWgJHnPKkfWeEBvn/YjRKS68X6SzOC9j ytxYthg8tpkRe93BtQZVUeUuf2hPTakJz/rTXjJMOtvAaUhC3xVV6RqvlWktw3oBO3Zs F7VEDLNt+17JEsfO0zzB8RsV0nm7zIPnrrTnpV4vomiLc55CBLMt1lWBWkwuwC3wtQmg 5dzA== 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=HPcJ6zC5gFmW35h21mcNaqjjPdnLYqvuRcj9DsygSz8=; b=jABZxb3qZOAaoPn/tR8evIOu5NwoeeCfUhNRAY4G6WBrNm87+WZBqOCHbie2pjYyQo wwcns1QcjTt7UbGTAbDkMB4Im/Db+QrnWrsfvZmtyEHUH9JwK5YisI44YIitpJgIvXj0 tQbdMCglFfdR/EKtlw1XimRh5rlQwN3NqN8dwGAe+zxkty9Ca12Y3z0RGFMmEmkj/HEQ PEvN+bGv+QZR9J3uxYYjj4Af2dEb1KzCvvt9khdUK/9D1V3gDegSR5YHbrPkKNYVSnWN ucJRQ6q2Fqnf488kdlV6U5STc5kKSS3x+2g46jzr6+fEBWOCKVda1snmCBkoXV9LwZdU riGA== X-Gm-Message-State: APt69E3AFKJBhw3mr7pMLTXnc/zKhQrH3SzgXilwPJBwXcuJESLGiUFY 7URBiKsABPp5+HtvhwMxXcuTbrIn X-Received: by 2002:adf:8f70:: with SMTP id p103-v6mr3386952wrb.181.1528415031643; Thu, 07 Jun 2018 16:43:51 -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 r2-v6sm18640545wrq.55.2018.06.07.16.43.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jun 2018 16:43:50 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Jun 2018 00:43:07 +0100 Message-Id: <20180607234331.32139-13-sw@jkqxz.net> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180607234331.32139-1-sw@jkqxz.net> References: <20180607234331.32139-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH v2 12/36] 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 212ab6726d..b8f2ed6d21 100644 --- a/libavcodec/vaapi_encode.h +++ b/libavcodec/vaapi_encode.h @@ -302,4 +302,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 ab8bf13ef3..c72fb9f00a 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",