From patchwork Sun Apr 22 15:29: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: 8567 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp2854144jad; Sun, 22 Apr 2018 08:31:13 -0700 (PDT) X-Google-Smtp-Source: AIpwx49os5x6QTLcp+hX8JsqUQCIRLju0VSz3D0UBkCOePQLQmC5HJM1vfmsO42dJZrvxz5my778 X-Received: by 10.28.182.86 with SMTP id g83mr6759641wmf.143.1524411073533; Sun, 22 Apr 2018 08:31:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524411073; cv=none; d=google.com; s=arc-20160816; b=xYfZ0pNDkXbtuE8gxj3kt9OrTR2E4r9UxhteZrNePT6wrKL+bHxaH3Wmv6hYVNdqml 1sugUTTJjUvmPaTT0Ve0/l9nK85cR6ospBve4tn6VWL8XRkkaU6d0nRtND3A3zajvIte CSK0M5E/bx4oiGOeq4FFf/0WZxO/NHBDkDx9m9meFUGvcUqB9uzDS1swyRvbrt2sQEv0 cp/PtYO5pxA97JUXMOPegfPa5Bl68dheviHIcPwbkOUXqAIEliTjCMU1UfA9hI3mRR52 35L0ssg1WYy2Gf7WJ9Z4opX6BoeJdOChuM4Y47ygSilQUkoYHj3Ow8WllKZg9G4b7Kqr utQg== 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=7PNVNWLZwa7AklwE293q476GNL2PCOFzrVUvOSQk7F0=; b=Mf/8prmU6X0Q2jqNr6daAdtj3ZMP8RtR66RWUQOPc8L5nD4xUctspt0odpptUluwoO xUInWIBW9hekZxgjZ2pq5T0ga+1Radf74Jg3VY6qIS3F1/W+UhsfHVAr1Ehdd/ocIK+8 1JKE8ncceE1p4NYs8hIVCQEz+Yhouy2IIaXOqhsrDCj/FCNoC9D4b/HU1jfzx/UrS4Kk oOTJASRFZqYr6QTwnqBkyBxa3M0owUlUSattapEfvAwrwRh+fX/oLPKU/8UiOaCA745y 5NAxm1xv4cb+qApqOVXfEVVfZoR3VvmrJxvtxM7JGFYNF+4PJzDCHX+ktK+pGxdVFX3n TXXg== 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=JpwdKrP5; 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 17si4304840wmq.175.2018.04.22.08.31.13; Sun, 22 Apr 2018 08:31:13 -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=JpwdKrP5; 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 5A37668A34F; Sun, 22 Apr 2018 18:29:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F02AE68A295 for ; Sun, 22 Apr 2018 18:29:12 +0300 (EEST) Received: by mail-wr0-f194.google.com with SMTP id p5-v6so6792394wre.12 for ; Sun, 22 Apr 2018 08:29:42 -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=CVrdufl0iIx8+m8TQyF+vqRo5EMgvcJpx18DHXDet9Q=; b=JpwdKrP5Yz/bFI7NIzIQc9pFUIIkH9HhjqsPk23ct4YCfXhuYTTp1EnzGbxKVPFdrH oHDVGUKQj9GcsqOfLldfFz96FUOOB2KsqwGggrOmfBxeiCQoEzyRkb5CMhg3LliB7NIz CsAWXnNTPmhJQqsWasMB0xc+NiBimXP0R/Nygy7hIOswVrh499BX3wIzOTNyoph7BJ8R zKRyDhq8m8ArfIyMcqUF8yrZdx9qwMd6QEx9a9DJj6LucPpQNPV0MgrXnxZoZtpCURPg 243rVbCXZDcZvs3S5bRJwoqJXEchaUt4/wvCeLjJS6i75oZtcDa1hkNHSMAtf/faxWem e/CA== 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=CVrdufl0iIx8+m8TQyF+vqRo5EMgvcJpx18DHXDet9Q=; b=P7mbpmN9Cfr52I5ZNvg2jhQRQ3bpa/TsZTIq50ZcwJB8qUDqZcAyigv5p+Btpj5Qwp gPPsbIxBtitxyQ0LRBDR7nGcBPUcVw8ZlUwELtvl7TBR0Fp291CA8KC3r0gJ5mfEC4BC a4Jy3gfxiG54GbPm8nr90jVx51tIt4VBD3JXNP4qMHlvWfQthOQiIfmiuFX+cIiLB55j soCRszwaloYBfuU21mD7oQGsEj2uYGux6gj7sTmFyqnQxVt0gZsDThdhdVXRSrufgQT+ Isi3GWCzGVPmJeQRMlj5fnOdREiaC7cap/IRM2FHYz56eXjzi1HDrk1Y+cMWKGfHPpwE YRew== X-Gm-Message-State: ALQs6tAVM50Pc2JzBQoVfYw282890g4qPpgFnbS4WQh2OzoNuUDuZfhN GbnpvSNDzmMN4oUTL9OwJ7EF/lWh X-Received: by 10.28.161.135 with SMTP id k129mr7230958wme.25.1524410981290; Sun, 22 Apr 2018 08:29:41 -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 32-v6sm7021498wrf.79.2018.04.22.08.29.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Apr 2018 08:29:40 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Apr 2018 16:29:07 +0100 Message-Id: <20180422152921.32510-13-sw@jkqxz.net> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180422152921.32510-1-sw@jkqxz.net> References: <20180422152921.32510-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 12/26] 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 b995a4b8b8..09c3663220 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 @@ -624,8 +636,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" }, @@ -636,6 +677,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)"), @@ -645,6 +693,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[]) {