From patchwork Wed Jan 12 23:17:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Fabian 'Xaymar' Dirks X-Patchwork-Id: 33289 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5065457iog; Wed, 12 Jan 2022 15:18:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJx72wju+Z1uQJ3DLQbvY1iRsnata6Aw8smvaN5SPKKYGVBubPKLfvCTenIEgUjMYzXrSq7z X-Received: by 2002:a17:907:e93:: with SMTP id ho19mr1491650ejc.169.1642029525077; Wed, 12 Jan 2022 15:18:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642029525; cv=none; d=google.com; s=arc-20160816; b=NqFqQp3Jy3Y21DQBkarFcp5u4T2ACH9/46ZgT1j1CTIjyIr1FcE/IcJw7UDG0467gN 0WUBlgmTaLFyC3scfgqc7J7720qn3eB2AKQ7kod+l74zs5jwGqIYKTsAYEn6osoMriIx DNCk3p5MH7NdN3Jkao9fvVbrIQ0GXLuPOQiQ4XYUPN3RbWbw93zMSoZJiDeQZeU51SN8 JCGVBIi/MpI8jfDY4TPbHB8lNbkpCmKXBv7FJzSNtgqnXRhHvFHikRNSswvfTU+/sGTN K7mlwqrguGqGQ2uU3z7i3EXS+c32gPOADWmip/yndeWbLev1Dr1v2+82QQ+8S97YjrTO CBKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=3FfP6EPjihpGdk6fVlDph9xQUCCJJIaIw+0y7aZLaFE=; b=0ixvbBkvgWbEqWos4yCV0GHoA9Q4pMDBFzivFMVOwc61n1CXKtVr2DeOAsaq//BCfq lo7oRANGNP8uSsP/i7m/fBFkunzDUuKyX7Pe4xKViNxKF+trjtSl2mbwUlEPC7b+k/q7 I2BTjexonH/5HxiF69ZpIH4efxdbT3hc2j3Z+D/cPxn+0hL2srQ2wLQlmurpe6mQYo+b Bd4hODgPMBE4dcI/di9Wfe8MtECgg1a/Yb9/A/vwhfA02AvwsgKSPK0hYmzUT7/iLJnH G+bAQ3+2LjW2cDvU2U6xoHOn+1v/KXn2nEoMcWe8cf9OIc5o2oZ5qMcL7qJkUAHaYhpc EC4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@xaymar.com header.s=2021 header.b=Cjv5bLah; 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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=xaymar.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z30si670844edi.581.2022.01.12.15.18.44; Wed, 12 Jan 2022 15:18:45 -0800 (PST) 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=@xaymar.com header.s=2021 header.b=Cjv5bLah; 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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=xaymar.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 99F1E68AEF0; Thu, 13 Jan 2022 01:18:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.xaymar.com (xaymar.com [95.217.118.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2D12668AE46 for ; Thu, 13 Jan 2022 01:17:52 +0200 (EET) Received: from localhost.localdomain (unknown [IPv6:2a02:8106:c:6a00:ccbc:cf2c:5bb9:d3cf]) by mail.xaymar.com (Postfix) with ESMTPSA id 5FB436133E; Thu, 13 Jan 2022 00:17:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=xaymar.com; s=2021; t=1642029471; bh=+tTu36pm9h+PPFEiIHwdXKefHAGF5N8FwSsIfDCJtcc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cjv5bLahcRce2a8kAn4sGqZYsiAzani9uBGsXlBF1I6mpiprREBaG89RTbkvIgEDV W69jBKLcV0M5quLAsg1IqxpyV4kdqmmmtMwvGzuUysuW3IXTyLE3Ds+x6zTQJNM/+q ChOM1lefXAsixTWCZgHaKRL3l/v/6NzKMl/NeWe4RwPLt1QJgrhGZwJhbNbMyXiZZx PALaBTD5NZny1u94W/6lURF9Wy8gvzDq45NUgcc2I/OLi7h5HF2roL50oMDS7Abt5A Ko5E9pnS3V9toGo4nMW4qX9SfHs+/IA/4yk/HfnGjd6lZbRyeJcwKmIK5Cq3S4Tr7D qc2tvCRuNSq0s+wtTkBu6tX41eH44maTX0rQSKnmTyZQiBnqARNYQUGaZtPs19YLbU leLw/wC/5xVHipI6mzQ8vHSIfvM0SRMui27rN3TzGkpuxq2R8ueaGpZbL9t8UoimSr 2C1EawPBSnPrtdXbRCNWLLoS1BuzobEXPkiYtZxMbLRlekDnjNh/t85z47VRx4PNJJ 0AUEZI4vMsUUF8vtGtdr0Pe/+UhOrBD7DFoXenCxyH8vxP+Du8rKrXCEanuJRYYUuy +PPBkbMpX25J3HNgO3ErLZJjnaEKzQlvuz+SfzKfwazfaGR+Q5e5EMTkdlmId/dL4E WcWVji6WOGpLOZmqkkBk= From: Michael Fabian 'Xaymar' Dirks To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Jan 2022 00:17:24 +0100 Message-Id: X-Mailer: git-send-email 2.34.1.windows.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/amfenc: Add missing profiles X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Michael Fabian 'Xaymar' Dirks Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8DZ7kAPgkqEQ From: Michael Fabian 'Xaymar' Dirks Adds the missing profiles to the '-help encoder=xxx_amf' list, even if the user may never need these. --- libavcodec/amfenc_h264.c | 11 ++++++----- libavcodec/amfenc_hevc.c | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libavcodec/amfenc_h264.c b/libavcodec/amfenc_h264.c index 87a3bb6a73..ae21c60357 100644 --- a/libavcodec/amfenc_h264.c +++ b/libavcodec/amfenc_h264.c @@ -37,11 +37,12 @@ static const AVOption options[] = { { "lowlatency_highqquality", "", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_USAGE_LOW_LATENCY_HIGH_QUALITY }, 0, 0, VE, "usage" }, /// Profile, - { "profile", "Profile", OFFSET(profile),AV_OPT_TYPE_INT, { .i64 = AMF_VIDEO_ENCODER_PROFILE_MAIN }, AMF_VIDEO_ENCODER_PROFILE_BASELINE, AMF_VIDEO_ENCODER_PROFILE_CONSTRAINED_HIGH, VE, "profile" }, - { "main", "", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_PROFILE_MAIN }, 0, 0, VE, "profile" }, - { "high", "", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_PROFILE_HIGH }, 0, 0, VE, "profile" }, - { "constrained_baseline", "", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_PROFILE_CONSTRAINED_BASELINE }, 0, 0, VE, "profile" }, - { "constrained_high", "", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_PROFILE_CONSTRAINED_HIGH }, 0, 0, VE, "profile" }, + { "profile", "Profile", OFFSET(profile), AV_OPT_TYPE_INT, { .i64 = AMF_VIDEO_ENCODER_PROFILE_MAIN }, AMF_VIDEO_ENCODER_PROFILE_BASELINE, AMF_VIDEO_ENCODER_PROFILE_CONSTRAINED_HIGH, VE, "profile" }, + { "baseline", "", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_PROFILE_BASELINE }, 0, 0, VE, "profile" }, + { "main", "", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_PROFILE_MAIN }, 0, 0, VE, "profile" }, + { "high", "", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_PROFILE_HIGH }, 0, 0, VE, "profile" }, + { "constrained_baseline", "", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_PROFILE_CONSTRAINED_BASELINE }, 0, 0, VE, "profile" }, + { "constrained_high", "", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_PROFILE_CONSTRAINED_HIGH }, 0, 0, VE, "profile" }, /// Profile Level { "level", "Profile Level", OFFSET(level), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 62, VE, "level" }, diff --git a/libavcodec/amfenc_hevc.c b/libavcodec/amfenc_hevc.c index 565be9bad9..a69f37e7b1 100644 --- a/libavcodec/amfenc_hevc.c +++ b/libavcodec/amfenc_hevc.c @@ -34,6 +34,7 @@ static const AVOption options[] = { { "profile", "Set the profile (default main)", OFFSET(profile), AV_OPT_TYPE_INT,{ .i64 = AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN }, AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN, AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN, VE, "profile" }, { "main", "", 0, AV_OPT_TYPE_CONST,{ .i64 = AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN }, 0, 0, VE, "profile" }, + { "main10", "", 0, AV_OPT_TYPE_CONST,{ .i64 = AMF_VIDEO_ENCODER_HEVC_PROFILE_MAIN_10 }, 0, 0, VE, "profile" }, { "profile_tier", "Set the profile tier (default main)", OFFSET(tier), AV_OPT_TYPE_INT,{ .i64 = AMF_VIDEO_ENCODER_HEVC_TIER_MAIN }, AMF_VIDEO_ENCODER_HEVC_TIER_MAIN, AMF_VIDEO_ENCODER_HEVC_TIER_HIGH, VE, "tier" }, { "main", "", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_HEVC_TIER_MAIN }, 0, 0, VE, "tier" },