From patchwork Wed Jan 12 22:49: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: 33284 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5047437iog; Wed, 12 Jan 2022 14:50:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJyLB8VtwJ5VggRBpCgW/WpT6kPtm71qOT21TbeZtR26JWjGUoe8KkuZHO0Z0fj8O4/tMJf7 X-Received: by 2002:a05:6402:41a:: with SMTP id q26mr1641356edv.387.1642027834806; Wed, 12 Jan 2022 14:50:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642027834; cv=none; d=google.com; s=arc-20160816; b=GLFPk9LcrHxRVZZrsSHPf7mbZto3fmQK1xk1hdJ6teUcQ46UBN5jqeRsH5gWQh/yyq YielenZrj9kU6NQ8rAYaJGDS7Af8c+PZ8nWiFtGxjOasnAB59BAgpncg8VT12C9qkWsa bUMq6OrcnvHZ/Q2eGW198Yf19QrA9j0XsHonI/2difYKuHI2HMvb9+ES7is+Ig9nODmN rQcPjYFsPEVUpyo/UT89p35+rm+zf1sbnHVVKv+oAiRreoT6/x04eXt6+js8QxeFl3Jw 1/X1ZoBB+Q51tyv9oIqpT/MegGmcKq5y+ULiqo9DX+lKRATpDmXRuMAOzPl6zMmeKySO Y1Xw== 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=GkQNhiqjOM20ZKm/zEKMwOhq9CGstYG35pjFRK7M5rA=; b=GSerY9qUM48ny+uTyYo1Cdlm3BsERWMLelvKSTEHFZRvQmQT3RDqA5mlVj94opR3Tj qoZp4DaLrCAQGxK4njR4obF0HK1G4hy+ON3WRLTaL0fdw9ZPBa6crQAWUwertmJpOFjD gnkmxMhCRykm4OX+znNXWzQ/gJzs0QOCXlh1v37PcjRS4hO+AtQ/SZqFQxE87S/ozVAi lwAe++MWSQJaKC3a3MrOTuRnUjT1BFGvh9CJ/9oDt9le0h/oKl5ZhHtSul0hSZBITRcT NJld201vAIJxmDUoDPsc9HIVHjZ/j625rGQ2cKxLcD/6vD90L+Y5N8WmNwxQJUh1M7Ou rfxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@xaymar.com header.s=2021 header.b=FGmV1IqL; 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 b9si696865ede.104.2022.01.12.14.50.34; Wed, 12 Jan 2022 14:50:34 -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=FGmV1IqL; 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 D5E5868AEBF; Thu, 13 Jan 2022 00:49:54 +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 6648A68A744 for ; Thu, 13 Jan 2022 00:49:45 +0200 (EET) Received: from localhost.localdomain (unknown [IPv6:2a02:8106:c:6a00:ccbc:cf2c:5bb9:d3cf]) by mail.xaymar.com (Postfix) with ESMTPSA id A5AFA61362; Wed, 12 Jan 2022 23:49:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=xaymar.com; s=2021; t=1642027784; bh=vpnCay5zaQG2EdvYec/Hhyuw6WOs/VBg1u0TlvwzzZg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FGmV1IqLZvCuZV0ScH9vWy3ZLa1wylA+WMO7SOiOhndc9Kl95CGNLvCnorL1eFBkf a46L8BL7k4mbnupGJ0Wq8OJBRdlQzfrtr9O6G156OloxXRs4VezNc+LPvp0w+TPwiR h04ArCb4QDdgRh/w1L1qg2xLRMROJmuoZ5L3cW7g9U61NtBuzSFfxEFh+VVU/cYNC7 2hxtKWS+xvBnjBqqLR+6yN3r2tEHpdyksSQyd0VIbWv5XpF0d9ywwYIFT4Qc/kjb3x 3Ks4g4oPtsHMKwsjGXrcX19SpLgW4eSaGIdC3ouYwZSOERhhu1zVokjIRufm2BxFeB uVhXWuvUV5VEIzkq2XmkXs8QXobQOYJDTRVx3ihLqxZRtXMwQSjx7DSD+qnK85ZTdM ED4CIspNkVTto0ic1fNR0KypD3DXQ0nU7oWmyQ9hEdiWjHKIco58jDAl11a6U8UoZJ fnbfZws3dtUSSXR3N02esXpmiggErPVT7C3Kb7vCU+aOmfFc5iu2rbNEbmEB3+m11T S3L1sQ/+YQk9m1lkF1tbZ1aIFFSTyv4puUNIxlcfAOzENVg5dxmTcFQxdPDgIFruRO zfmwwL0SMsIKoUxhcyGjc83NDOL+IAMq8ziHEUkUsAa9KO2qg30IuInvlOXOIl9t/L Dv9GvBhSRn8ANW/njte4= From: Michael Fabian 'Xaymar' Dirks To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:49:24 +0100 Message-Id: <20bf6e347e33a39c8685335750b6e83002129124.1642027745.git.michael.dirks@xaymar.com> X-Mailer: git-send-email 2.34.1.windows.1 In-Reply-To: <96117e46dbb4032a02d92c178ea4cc979203a0d3.1642027745.git.michael.dirks@xaymar.com> References: <96117e46dbb4032a02d92c178ea4cc979203a0d3.1642027745.git.michael.dirks@xaymar.com> 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: ha8I72mpWcwP 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" },