From patchwork Wed Aug 22 23:44:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10066 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp1441296jap; Wed, 22 Aug 2018 16:46:43 -0700 (PDT) X-Google-Smtp-Source: ANB0Vda/mKib4r2AN1alCeoVn+k+SN3EL1V7O9sEbVO5kWTigQ7dN6aVNTDbNZzmdgg8muOk5irU X-Received: by 2002:adf:d189:: with SMTP id h9-v6mr16024810wri.138.1534981603480; Wed, 22 Aug 2018 16:46:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534981603; cv=none; d=google.com; s=arc-20160816; b=L/QSNN8aYGD6AzwlkGhCnxbmRiDBGAmOPZZptJ7foYDgCFBCJBLxRIdADpblXtE96K DbdHu/itWOgz9crCzZ9gMj5lO+nr92eFXfIHIZQds9V0bNFkC4ROljtpW91idyK+2Q5Z MYVyI0SFSXVV+yX/qA5N6ulD2c9cpy9bxZK6MQgYmxaOwouyqmNoPTHE7gxRtiHc5CPZ VPz4iNbak3s2ACTddUD/V+3EwLIiJ9MGZ8RBecyiMyqI+ilRO0wLK6T2AWtHXdBMXuQE JvcLCKKDfoPt2m2vNTPeez2co7xAjgWqiIZ6WxU0cwVmA7Udwz9yAuVy6ZT45BzKUNAH QJSA== 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=dIEsXDYPekCCb2h7Al8wqA029WPviEaYVXfytLNgIq4=; b=pM/8S6v8WdcBX8Fl1xB3UySACxTkyxXWIBuL6La8/B3m6b7OvdpiGrWAW8X7YZG74+ /4oexiOtDE6pDobpF8pNhgj8JDrY/CNDdqG46yrCo7pXNF/Kubus4wNS+CMN5Jq/Gfho ESEn6j8qOjfbTYLfVriPpm0gXmFPe8JKy9mqYFk4bhCCNdwyDI4NHmWFhi1k/9Q9/RbI xPRwVutu/buzud1g/2KTFjzpLtA56fqQwuZ1hfe8zizKxfggr5dYSgsURR/q6+TkOvjI Jx4eyNchYMTtCINZcl26P1OXP4+DGaoY+414eCBk2xsA7xABz5rb+dGHEwiRpjYDK/6R yAzA== 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=A9bZOrSH; 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 p3-v6si2394327wmp.134.2018.08.22.16.46.42; Wed, 22 Aug 2018 16:46:43 -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=A9bZOrSH; 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 D2A3C689D83; Thu, 23 Aug 2018 02:45:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 440E2689C8A for ; Thu, 23 Aug 2018 02:45:31 +0300 (EEST) Received: by mail-wm0-f42.google.com with SMTP id q8-v6so3868379wmq.4 for ; Wed, 22 Aug 2018 16:45:33 -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=A9bZOrSHtDwLSaLXLGT4pz9uqs6+RSPost+tdlowbnIGkHfJoBAe0gR13rRDdOLs+T w8JP8Qw8M5q0lYC7k9i/JKAcvUBo4QKz4FXDySy0mSjukCJPEKWOaZQ1jKM/h9B97UfD F+2n8ZrvqPFfpgi/jVFyPYoToqeraVyOtGNy+AuynvQuCuQSM/RKQanQ6Pfc6isT7B95 yjBb8KwDO8oJwmHe9znxy3CNUR6dBkxK7AC5bUQWs2wAIcPHw2VG7dP5Ef6Ft5LxMdHb PEUGM8hIg6KzTKzxY86YfpnOVoalAeovwB4NMvl8NvjZTOkHjmrbyOavu8nBrZo/TK8b cKuA== 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=Ky+ap2dlEnqqDRZb/CRp0WT0XKFo89OicHjit+BNyg2rnnHBA/xDh+5QBZxozpU+NS vs/QMmVXdWWtG5klLoB9QZxSl4+DcwXjM/AUlsVxNBTTS4lvZjpFs8bj2FKuhAr7kLNT AufOSH1MR90wlrxJyLz274eeoLPm+mAv6Z7a3k4IGk/yzrpvrmqYTVYR4Jzoyd0z/bKw FWnjekth2mgayxncnFR+UeaGFQ7m49+S/z1Yjoehyg5pg484Pl90lK5d7rE+z6lwT1Ro 9Y9AFSEPBZ6lcerORD9qlNkBFpd3Nh34UmHBfdiR+ew5KvOUApODHOARAVtP8QRrzHf5 IUjA== X-Gm-Message-State: APzg51B7efuSvUYYE/zL2PT70GrIjIWYRR/zKXgiXdlhOQypV22gxA47 VlwfUdlfO9YeRbkiOSWCtD/exLjbeoc= X-Received: by 2002:a1c:752:: with SMTP id 79-v6mr3833475wmh.59.1534981532658; Wed, 22 Aug 2018 16:45:32 -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.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Aug 2018 16:45:32 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Aug 2018 00:44:45 +0100 Message-Id: <20180822234514.10571-13-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 12/41] 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[]) {