From patchwork Fri Aug 18 17:26:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AdrianEddy X-Patchwork-Id: 43266 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4c9d:b0:130:ccc6:6c4b with SMTP id fq29csp2827043pzb; Fri, 18 Aug 2023 10:26:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IELy8vx4DMs2Ls6maZrIqM4R0V9a8NYHd5aHZfmPtgiBf251ZqYZEZgu0fgO55Qn4NOasiJ X-Received: by 2002:a17:906:e:b0:9a0:9558:829e with SMTP id 14-20020a170906000e00b009a09558829emr1658061eja.52.1692379578115; Fri, 18 Aug 2023 10:26:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692379578; cv=none; d=google.com; s=arc-20160816; b=K6t9pav5Kkyz0GeEubivNWwoHqM27nqCtEGTDxp/ZTo5FnNgF41yw9ZTf782Tfr/xJ 5hCOzg5w7U6VbMyUJRilLIwdKnJaT0kMiU7fnacJnkwqt6SWVZvdh9RJ+7N0GXAMn2n3 tuhRptouBKPoXO9r85uRBbdDBYbt2ICFJ7W2eywo31VE6KPzmg0FZlLHSjEmn9zjGkdk fadcNYLL5IL8ENrnEBIwLaVcsSSUcAFHchcTjTxxujINZGzuxTaxb4klh14o+r9/nDqF jgQSklj3wesWtjPtB+wCkahrUWXL+1yvZrlx/8tIwuaoxBe/f5XjlyhET0GBkGHXFjqI rIBA== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=PwW7pPL0aGDBAtxeosX6SOq7Yayoyz1yABL6PmUAxE4=; fh=VHmMdbApRbrAEUBoJC9mgnrMx4bzx3Bw1eJQz62mI8M=; b=b5LCJhE5THkKQkDl1YJFNSyDiGyHzfVWSXadesfkflcfOJtipw6SYozM+kiQZM/vsM oaBXIyVX119vCAM56Wtl2u7uEH+I4sK3D9twkttX00TkW61fuaFreM3ojCe569rfqv9n Hk+k/RYn+yqc1iNNV9jqqiDLEjkgL1xJJxHymBVJYxB4KpznK+Hp82QTI1YrPVd66QKv BFYXkpqao6BE9ps4rlIBmsAtY3bGqMViEWi64RCBJT1WA6+B6EaU1KF9OsZBossRaa+t Q3yBFqBaHbZn1RPLCInLsO6TdSN3TCU9NhMhgmkavESi6uv4EBY/PlTYDl8nOEyRVnmy WEyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b="o/UZd7eO"; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i12-20020a170906850c00b0099331b3e6f2si1681711ejx.663.2023.08.18.10.26.15; Fri, 18 Aug 2023 10:26:18 -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=@gmail.com header.s=20221208 header.b="o/UZd7eO"; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 75A1068BDA3; Fri, 18 Aug 2023 20:26:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ABF4668BDA3 for ; Fri, 18 Aug 2023 20:26:05 +0300 (EEST) Received: by mail-ed1-f54.google.com with SMTP id 4fb4d7f45d1cf-51bece5d935so1437552a12.1 for ; Fri, 18 Aug 2023 10:26:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692379564; x=1692984364; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=nwIQqkKCwaoKsvh6MFH78bmib+oobhlP+Imat31HiN0=; b=o/UZd7eOgqkaFsTzi5wnjZA1lkNiQz9ZfdDgNHhJVZOlIAYY16IajTF/uT7bd5nvEw hWxM9/dK2UddyUTevxXY3OXHqDMmZRXF60AMQnXxO5WJJDyeJCz44k9SsYJS421r4rDZ 16KjLSg4pX+TikCG/k0y/rxKjFVqVCqLSeGbH8V9BEsxF/i8SAMPqlU2Xe/8MiMWp/Th TWbSuuT6UJtko3BUAHDxTKhet1rmlFiiOFChJb9MednfH0ngpx+r4l86vejofbGW8laK Xr6IjjlvIvpsSaS5eUmV7Vh/468XOA5KD2Uk5vlkZ6w0oLlZpVIMLdRylHGYQ/E9rz/Q 9u2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692379564; x=1692984364; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=nwIQqkKCwaoKsvh6MFH78bmib+oobhlP+Imat31HiN0=; b=gCoBorD9kd/dGzqEGZWS+FvAqZL+Kju4sEx0hcgPEIh63h9MfV9J02pwQvGdgrKz9X jxQPnEJedUWVjZhTEdo+12xhqAqwNjJJROgq7RYHZcZgKUyNozv26HdbC1ZPIBXdhz7a 1BMOBz/ZOeVGr6KSv26nm+rbDvuo/MEITW97mxFZ6ZzBJiIco1c4EnaXG/920PksiMMt YmnYDwjNtkKyCwqvV3AcQD6Tx6A86LP/VCef4poWqCFca4knIdUTw1pG560rY49boAhJ jKQgOc63OQzxwtSiOu72kB9D2hpTjRlfcEzh+dBNdrwhplNZvt4x1ac7xw2zp0ECT1Ei SVTQ== X-Gm-Message-State: AOJu0YygFX/Qs0reChYpH4ZzTelA8wcaB5Z74/WHI7TqlBueXYvAuEur RpSd+bGh7TjS0NNJEImm5G6bGfWhR8LXgR0v X-Received: by 2002:a17:906:2255:b0:99a:e756:57bf with SMTP id 21-20020a170906225500b0099ae75657bfmr3018315ejr.7.1692379564484; Fri, 18 Aug 2023 10:26:04 -0700 (PDT) Received: from Eddy-Desktop.localdomain (91.218.63.235.ip.neotrix.pl. [91.218.63.235]) by smtp.gmail.com with ESMTPSA id k19-20020a1709061c1300b00992025654c1sm1437964ejg.179.2023.08.18.10.26.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 10:26:04 -0700 (PDT) From: AdrianEddy To: ffmpeg-devel@ffmpeg.org Date: Fri, 18 Aug 2023 19:26:20 +0200 Message-Id: <20230818172620.628-1-adrian.eddy@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] [VideoToolbox] Add HEVC 4:2:2 10-bit encoding profile 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: AdrianEddy Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: P4SZRin/8cdT --- libavcodec/avcodec.h | 1 + libavcodec/videotoolboxenc.c | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 649411ac79..fdcf3905de 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1687,6 +1687,7 @@ typedef struct AVCodecContext { #define FF_PROFILE_HEVC_MAIN_10 2 #define FF_PROFILE_HEVC_MAIN_STILL_PICTURE 3 #define FF_PROFILE_HEVC_REXT 4 +#define FF_PROFILE_HEVC_MAIN_10_422 5 #define FF_PROFILE_HEVC_SCC 9 #define FF_PROFILE_VVC_MAIN_10 1 diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index 8e493c4f7a..710d6c2227 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -113,6 +113,7 @@ static struct{ CFStringRef kVTProfileLevel_HEVC_Main_AutoLevel; CFStringRef kVTProfileLevel_HEVC_Main10_AutoLevel; + CFStringRef kVTProfileLevel_HEVC_Main42210_AutoLevel; CFStringRef kVTCompressionPropertyKey_RealTime; CFStringRef kVTCompressionPropertyKey_TargetQualityForAlpha; @@ -181,8 +182,9 @@ static void loadVTEncSymbols(void){ GET_SYM(kVTProfileLevel_H264_ConstrainedBaseline_AutoLevel, "H264_ConstrainedBaseline_AutoLevel"); GET_SYM(kVTProfileLevel_H264_ConstrainedHigh_AutoLevel, "H264_ConstrainedHigh_AutoLevel"); - GET_SYM(kVTProfileLevel_HEVC_Main_AutoLevel, "HEVC_Main_AutoLevel"); - GET_SYM(kVTProfileLevel_HEVC_Main10_AutoLevel, "HEVC_Main10_AutoLevel"); + GET_SYM(kVTProfileLevel_HEVC_Main_AutoLevel, "HEVC_Main_AutoLevel"); + GET_SYM(kVTProfileLevel_HEVC_Main10_AutoLevel, "HEVC_Main10_AutoLevel"); + GET_SYM(kVTProfileLevel_HEVC_Main42210_AutoLevel, "HEVC_Main42210_AutoLevel"); GET_SYM(kVTCompressionPropertyKey_RealTime, "RealTime"); GET_SYM(kVTCompressionPropertyKey_TargetQualityForAlpha, @@ -878,6 +880,10 @@ static bool get_vt_hevc_profile_level(AVCodecContext *avctx, *profile_level_val = compat_keys.kVTProfileLevel_HEVC_Main10_AutoLevel; break; + case FF_PROFILE_HEVC_MAIN_10_422: + *profile_level_val = + compat_keys.kVTProfileLevel_HEVC_Main42210_AutoLevel; + break; } if (!*profile_level_val) { @@ -2836,8 +2842,9 @@ const FFCodec ff_h264_videotoolbox_encoder = { static const AVOption hevc_options[] = { { "profile", "Profile", OFFSET(profile), AV_OPT_TYPE_INT, { .i64 = FF_PROFILE_UNKNOWN }, FF_PROFILE_UNKNOWN, INT_MAX, VE, "profile" }, - { "main", "Main Profile", 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_HEVC_MAIN }, INT_MIN, INT_MAX, VE, "profile" }, - { "main10", "Main10 Profile", 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_HEVC_MAIN_10 }, INT_MIN, INT_MAX, VE, "profile" }, + { "main", "Main Profile", 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_HEVC_MAIN }, INT_MIN, INT_MAX, VE, "profile" }, + { "main10", "Main10 Profile", 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_HEVC_MAIN_10 }, INT_MIN, INT_MAX, VE, "profile" }, + { "main42210", "Main42210 Profile", 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_HEVC_MAIN_10_422 }, INT_MIN, INT_MAX, VE, "profile" }, { "alpha_quality", "Compression quality for the alpha channel", OFFSET(alpha_quality), AV_OPT_TYPE_DOUBLE, { .dbl = 0.0 }, 0.0, 1.0, VE },