From patchwork Thu Jun 7 23:43:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 9298 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp193511jad; Thu, 7 Jun 2018 16:45:40 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIBGEGldugI13tZyjXsYHkLZxJMFJ8innYfSB8cWeYj4ZbUr82jV/cVVpo8mjb+aNmvA7G7 X-Received: by 2002:a1c:9788:: with SMTP id z130-v6mr3061739wmd.88.1528415140348; Thu, 07 Jun 2018 16:45:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528415140; cv=none; d=google.com; s=arc-20160816; b=NzHy3YDm7zsMDSfi1amJlQTp4+7hHtjIrwNhqHngnNNuLUkCm7RylGHExbcAGbwcjG hfSVXEY/IsPbvxo6DQI6yFAvvqWHN1zV8G2Pjrc7QL2jGuBlh4GVgSSnzrsQZqpuX4Ly a7NWCiPRuCKgmaRWGusNJVCw+0B6laXqGM1sAf7L5YqeNsW+gH5m3kHJTx6ZiczIc7uG EdfIPQ6QnWtTfi/VgRBI/MhA4QnClgBboyAdFk3jDSNRKk9p33dQnNPr9HIjqWArVRcD cUjDf5/lEWuXLL14wLF3+v8p6DAgZA9gIC67WrhVSUdjZ+Zkd3KrcmPDhDGG4SSdvSmu o1oA== 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=bdLxbY0SDeLao0PFBUe8kT7ltYd7d0s9ZGtH7IX08i0=; b=MwCDpqcELe0Jw6r79qYuPN1xtzlSgpxTVvAR3skICPUmHB0I0oR1IIPufKjbXPzqtH PCq+NEMUn+8jyZMQu0apIDJajW+bKx2b1BRqbIUTVqlvFJAFhvB5i3+bKXceEfl83vZb EFCq2McrocZ7dtXa6UlVfKfSsNkutClspfn0HWFhRBzkz/Vu3q5dW4irovarkXZ+IK8x uNCQPqlvR+gPbWRFolO8PO1R1DtAFLTu4G5zz3W+xVSgRr0Hrt7rHhfQgpj7ur+aH1/1 2dP7LCNflkL4IKKKOBoWuMiKvVh2nJyUGnVBbnMcWDmhBmHEx9caZbpJJI0lso6XZbXh OJ1A== 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=08tOlvRJ; 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 e24-v6si23829322wra.326.2018.06.07.16.45.39; Thu, 07 Jun 2018 16:45:40 -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=08tOlvRJ; 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 5C40E68A793; Fri, 8 Jun 2018 02:43:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f182.google.com (mail-wr0-f182.google.com [209.85.128.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C7DE668A786 for ; Fri, 8 Jun 2018 02:43:05 +0300 (EEST) Received: by mail-wr0-f182.google.com with SMTP id v13-v6so11519391wrp.13 for ; Thu, 07 Jun 2018 16:43:53 -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=dzi/P840qPgb35A7sNjIMrYjrMFqyXcenWi3ncpDFKA=; b=08tOlvRJV6p0IBuuDds0w9pgQagE3xUq4Vwzniv025eLGQM6uCastS1jQwVnwJ3Ogt LzsuGoGgX2D4eH06jKCX+L7rUKOT1ML79yNqlU8aCt2rXlv1V9p5y/i66mO6h7zMtWF7 F5QN6dtQ53fbzGUIa12z4MgxLiIuIeyvfCHpCCT5CnMtU9D+jxx0uLGFC1wiKOPs22gC J4jOE/VaFlZvhKU6gp/qha/ggWtpHIJJIqmiT4audYioQ/YMAlOYVqyRS+vpMiPnMqY6 a1evBMNR/tyc+UE/1sngbpblGaBtJaxdNUxHAXGyWI0HgIbwflI9fLuBdX6gk6ZnYxAQ e0og== 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=dzi/P840qPgb35A7sNjIMrYjrMFqyXcenWi3ncpDFKA=; b=XhZZh5orVq6el3Zmo0DUvIRbhoFHoueocTQ1Vh1JOdTpvB6mm67DCzWrpz1kIwP211 vHFfoB/fdlrLV6LdneGHPkYU82/tJ06PK6zrdQPZzb2KQIZEJacvg87FMfudHcber+pb 2YuWDBo21u8fvVJJZ0PWx5pSHY5QLj5OI6nmoCU/z+gbjQqdsR4ScvAC28obGmIVO1Ld pXtnmEYCkW4RVJLPb03LKtLO5MFXhsBgZLLZFLe2+swnYpT2axaHYPEMo84liMFaM3/T MmfAOLRIzNGR414DABfrwfUX3Zm6fGayu60iCqqGqlit/eKtVDkl1BXCTDSkRgIKW7yn LRlA== X-Gm-Message-State: APt69E1DdBtslVhG2AJuklbHtXFqQw96z6uLMwr1Nj0hOzrAs3eTk71S fsckq6NOxFcjUAK1NP80qtBRLJmD X-Received: by 2002:adf:b691:: with SMTP id j17-v6mr3315896wre.10.1528415032846; Thu, 07 Jun 2018 16:43:52 -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.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jun 2018 16:43:51 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Jun 2018 00:43:08 +0100 Message-Id: <20180607234331.32139-14-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 13/36] 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[]) {