From patchwork Tue Sep 18 22:30:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10364 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp11309jap; Tue, 18 Sep 2018 15:32:11 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbkWtwXGffKTQy81K3iulvxLSZ50UU+TssQxPLYYe2+YzQx6KZxao76koWkBsmIHS1UKIfk X-Received: by 2002:adf:c64e:: with SMTP id u14-v6mr6397589wrg.177.1537309931780; Tue, 18 Sep 2018 15:32:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537309931; cv=none; d=google.com; s=arc-20160816; b=DkdBQvLxuFdqWZ9a0UWEupFj9dJMT4+0cmUTn6CpXBOl4M9QGMJ6QF3yG81vxfLwhp +HW61acRe7NQf7bwAhwl+lLAe0H3yGl7yP7GdVU44CGlB6j8LbRJqqL5XOchTlTmLa2L tB6hb/vO9Z8zHxm9JC6MrJomtzNmlS4OTo5mXwIqBTEGlVZ18ELH8TPB3cDVG9n9asfv DtdMGJIeCBRO8eTQZKbCzoWVUzvwqFeaiBshv6SpOAYZMsPwyDB8+Pv0UwN6nwbY8Elv 0GTi6ODZNHYwdUDeB0ozuKMutzI1WTFNpQHOcRpU2PanzlBUOf9LgQx+YnFsKZ5Un5ct gaWQ== 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=dIEsXDYPekCCb2h7Al8wqA029WPviEaYVXfytLNgIq4=; b=0sddqgafc8LKup5Px9zOVlWdvZn4WdULU8si1D9npaQf8HH4xcM8H0uCzvFOkVSE5q HQGUScn2klKGjQWaSDlT25HLN0+wJSos5S2Er+bxtrZX3wP+LaWuIE9gGOcJvbcATZiq CUVPJ2JhCMYsdu4M8TMgLAF5bKX/CpWdJAWy8JpR0I3kwUJL7MNC2LgCns/uXbwqxTv1 6Tah1QLMTJ9KacTlB31lGneuJDQglBmWeSzyrBJFxgdaQyW7md31oGJWZnd/2JkpRifA SwqrhsyVExdQHgkP58mQZaj920LGEJ6LZ++ipfr3SELDle4lTnOmGW6Tw7PFdYcoeCsR 8LLQ== 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="seRa/viS"; 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 v130-v6si12233662wmd.151.2018.09.18.15.32.11; Tue, 18 Sep 2018 15:32: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; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b="seRa/viS"; 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 470F168A24C; Wed, 19 Sep 2018 01:31:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8DDC968A0A2 for ; Wed, 19 Sep 2018 01:31:12 +0300 (EEST) Received: by mail-wr1-f51.google.com with SMTP id z96-v6so3733934wrb.8 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=jqw1BDNPtVgJbGh8o/Asjfle99my12arc+PdW77KjdE=; b=seRa/viSi4fkslVPGbIGDjL6Abmjoc/RBZ9uvm6r2J+1cAeAhDSPU7Yuvm/8mqq6nJ zNj7d9KqU1fDIxWfcK7o3EybrmiuE++qPl1n/6ojsafa+PnHLLj6VRnAX6DmM9BjNyhr r0hiCWGeOURoXnvrpiIzPXS8SY0zUjlvDs3fykB5M87QtbqgVhLXwMffNGGdn216NjHW 3rUPnEBqrVNCyU+V2We86kf9WteOvkg0/s7fE8rShPdrFf/5QgikBZY1IAvtGzwTjYbI 8Z4ocCnxHKx2kEEM1QyzLBysnGuI1gJMdPjR8tzAX8SB+p6lsf3ooWhRKyaPJJEalS7x snkg== 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=jqw1BDNPtVgJbGh8o/Asjfle99my12arc+PdW77KjdE=; b=DRL+WQCMHCGj3gp/if9IBweB8K5IJftHcdSGL/NNZLN3a8Wub4YqR5naBG8iIXYihq CitNAmW3gpeKlzPjOiAoFzmd6AQoRemaqgquA+IguIue+XCwBs41ts+ndiQUtW9H+7cq 0KK4KIpOEKAz5elnQZxUAbVJwoOs4YWblu8LgXkO5G9G5+3pVk84JEQDMUcgPAk4y3bB joNJakAXFbf/rOttzB2MzBeC0jKirKyk8AtwV+r2sDeTs4uXTXZfbht1SrEz4Z51EwT/ 0qpxhSFLdSbg7fa6aliIdDHF1xWTdNqMd7CXHCUyln1yJ6JVFPWqQDKVfFtGkRHPqmqb BtHg== X-Gm-Message-State: APzg51DJXwG3f3eI2h/OC43UTwKycpFrOq00Q25EAsp2cg1Ic6iUxFZH P+whs8m7GgYXIUN/sJy9o0Fhz9v4qwE= X-Received: by 2002:adf:f30b:: with SMTP id i11-v6mr5219987wro.161.1537309884952; 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.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Sep 2018 15:31:24 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Sep 2018 23:30:42 +0100 Message-Id: <20180918223116.14322-5-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 04/38] vaapi_encode_mpeg2: Add options 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" Include the common options, and also named options for setting the profile and level. --- libavcodec/vaapi_encode_mpeg2.c | 53 +++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/libavcodec/vaapi_encode_mpeg2.c b/libavcodec/vaapi_encode_mpeg2.c index 7f6c7833da..db79d72115 100644 --- a/libavcodec/vaapi_encode_mpeg2.c +++ b/libavcodec/vaapi_encode_mpeg2.c @@ -30,6 +30,10 @@ typedef struct VAAPIEncodeMPEG2Context { VAAPIEncodeContext common; + // User options. + int profile; + int level; + // Derived settings. int mb_width; int mb_height; @@ -581,10 +585,18 @@ static const VAAPIEncodeType vaapi_encode_type_mpeg2 = { static av_cold int vaapi_encode_mpeg2_init(AVCodecContext *avctx) { - VAAPIEncodeContext *ctx = avctx->priv_data; + VAAPIEncodeContext *ctx = avctx->priv_data; + VAAPIEncodeMPEG2Context *priv = avctx->priv_data; ctx->codec = &vaapi_encode_type_mpeg2; + if (avctx->profile == FF_PROFILE_UNKNOWN) + avctx->profile = priv->profile; + if (avctx->level == FF_LEVEL_UNKNOWN) + avctx->level = priv->level; + + // Reject unknown levels (these are required to set f_code for + // motion vector encoding). switch (avctx->level) { case 4: // High case 6: // High 1440 @@ -623,8 +635,37 @@ static av_cold int vaapi_encode_mpeg2_close(AVCodecContext *avctx) return ff_vaapi_encode_close(avctx); } +#define OFFSET(x) offsetof(VAAPIEncodeMPEG2Context, x) +#define FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM) +static const AVOption vaapi_encode_mpeg2_options[] = { + VAAPI_ENCODE_COMMON_OPTIONS, + + { "profile", "Set profile (in profile_and_level_indication)", + OFFSET(profile), AV_OPT_TYPE_INT, + { .i64 = FF_PROFILE_UNKNOWN }, FF_PROFILE_UNKNOWN, 7, FLAGS, "profile" }, + +#define PROFILE(name, value) name, NULL, 0, AV_OPT_TYPE_CONST, \ + { .i64 = value }, 0, 0, FLAGS, "profile" + { PROFILE("simple", FF_PROFILE_MPEG2_SIMPLE) }, + { PROFILE("main", FF_PROFILE_MPEG2_MAIN) }, +#undef PROFILE + + { "level", "Set level (in profile_and_level_indication)", + OFFSET(level), AV_OPT_TYPE_INT, + { .i64 = 4 }, 0, 15, FLAGS, "level" }, + +#define LEVEL(name, value) name, NULL, 0, AV_OPT_TYPE_CONST, \ + { .i64 = value }, 0, 0, FLAGS, "level" + { LEVEL("low", 10) }, + { LEVEL("main", 8) }, + { LEVEL("high_1440", 6) }, + { LEVEL("high", 4) }, +#undef LEVEL + + { NULL }, +}; + static const AVCodecDefault vaapi_encode_mpeg2_defaults[] = { - { "level", "4" }, { "bf", "1" }, { "g", "120" }, { "i_qfactor", "1" }, @@ -635,6 +676,13 @@ static const AVCodecDefault vaapi_encode_mpeg2_defaults[] = { { NULL }, }; +static const AVClass vaapi_encode_mpeg2_class = { + .class_name = "mpeg2_vaapi", + .item_name = av_default_item_name, + .option = vaapi_encode_mpeg2_options, + .version = LIBAVUTIL_VERSION_INT, +}; + AVCodec ff_mpeg2_vaapi_encoder = { .name = "mpeg2_vaapi", .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 (VAAPI)"), @@ -644,6 +692,7 @@ AVCodec ff_mpeg2_vaapi_encoder = { .init = &vaapi_encode_mpeg2_init, .encode2 = &ff_vaapi_encode2, .close = &vaapi_encode_mpeg2_close, + .priv_class = &vaapi_encode_mpeg2_class, .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE, .defaults = vaapi_encode_mpeg2_defaults, .pix_fmts = (const enum AVPixelFormat[]) {