From patchwork Thu Jul 11 12:18:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AdrianEddy X-Patchwork-Id: 50467 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:2298:b0:482:c625:d099 with SMTP id fp24csp136864vqb; Thu, 11 Jul 2024 05:18:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVMcXeWxsIGYoyk0vtYRUILQD56iLF14J+omOQDnPwFTGnIVAvqCT2KijcnqCYD1oK4AuCDkS3+8kPWUPQFxqwrsrKKiYbU3lx/UA== X-Google-Smtp-Source: AGHT+IFKs7M4zszTKTPUOwJweQoRJb5jS4EWlKDtcihCaIhhiNsgCEAAEfboLY6AKjtXBSBRtlxf X-Received: by 2002:a17:907:9492:b0:a77:dd1c:627a with SMTP id a640c23a62f3a-a780b68a25fmr750936366b.8.1720700313483; Thu, 11 Jul 2024 05:18:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720700313; cv=none; d=google.com; s=arc-20160816; b=yraFtqtycnpNAPJlpNeIVsT6L4H14mVW+UTdyPwfOoStEqOTxI2Kt2TE8cDcNbtsWP UPYg6+cfu+0tFC9bumgEcH9yYJcfolhHuekDsqigLYKUziP1eoKehdP/yvMoIfzdxIBj N/I4KK1yPBpkpV+UGuN3zkU2JU13lGz18cD/aLD5Sx0BRt6vXlvYWlzUP2oFgO469Joe ee6PD82DaO5Om7x2UJh4rwgFVNBUlJYTOUsScdl/Fj9mY4NNOy3LuJxSorL32UNCF4MM VLL+c6zqlDGuIZQXXIWVAnuKHFtV2Mpga0SfrRHUuSVDzoq6QFaJVSLACbBVUbrjxj7R Aekw== 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=rJ/OJqj0m9KjO/llVAieSoT1kqGpjilgA/Unnk7bFI4=; fh=8TfeH1lx0mVLXnKE2aPBT0Hozrqx9k4uZabL0vxyxCk=; b=AmWxR3cTjFcEztOpWZ1TozTpJ3G7U4J+fNI1AmiT4iclSbUvTxOWIyLTAATqkavYb4 qJ0B2fpKb0896PQHDZaMKcYAwzpRQw/tgaz5e6qSX2cs+TdxvI6Pz8y6+EwklS4T9ui2 NH3aOYDTCo0DAIw04Xcc6NlD2vtgdT0ychsjOcKdhYRCU0V5SDa2cKzA+tjPORcLiLmO 45qM2KSo2VOHTUFtllLFngQWl39h3AuyXdJyUsnFgwVo8f85VrZYolhAOpZ3TD9pFvxY 6OYdrAJDnzDqlhqb8IxD78S6WP5mKDdv7E9CblLOnk1fZaWLaJ0guqKxaqDpED956lCs sLDQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=dCR+TdWx; 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 a640c23a62f3a-a780ab2c71bsi308842466b.736.2024.07.11.05.18.32; Thu, 11 Jul 2024 05:18:33 -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=20230601 header.b=dCR+TdWx; 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 D22B168D911; Thu, 11 Jul 2024 15:18:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8AE7068AE97 for ; Thu, 11 Jul 2024 15:18:21 +0300 (EEST) Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-a77cb7c106dso109609866b.1 for ; Thu, 11 Jul 2024 05:18:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720700300; x=1721305100; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Vbz81IMJ+qf34CIqNfBQDNcQ0kTKwp7AkR+V5eMq2yM=; b=dCR+TdWxgkrLaRk9OjAalNtdkNBZ4+3Atyfjap81ulMtDTzi95p+9PVJ9waDz8hxlw dgyKohiv7O5sIf+AJtJN8DMuzWtuizXEsB79TM/bzCES5yNX3m8EJ2m1WCSeKScjj8aM YNsvhXpMHLtoiQAvmLk3GFuWoZ/D7K0UjLLi1E65n8rrGqa6f4TKMproYgdLdiYt7xrL 6aM/s8deXT3W+KOVcILnO2DAhDVUCWYpFU1ylB0ZQ5WL7MhEkT1zPYbsz6ZWrk1CWAqT w+Qhf2hFZqCVTWwj+OV2Nf7ofjJ5RFCbL38lKvj6hIIMONNu5fTGV8kmdB6Lw7s03xSA oTNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720700300; x=1721305100; 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=Vbz81IMJ+qf34CIqNfBQDNcQ0kTKwp7AkR+V5eMq2yM=; b=cUSHRSaYyFLBEBgKdZzNzbr3LJPkuTO4MXhQCdTOY25rnyCdsKM0pQ+mBsJMuntrHr UeTqSLzzVvKf/u+IQavJ5dlKC4QLI0KIMWufPrCqwpK5C5GBku/HJqeH73cr+sPHNKTp yqK2PvulEA06zrDdh2RjG7V6/K694PKZmuh5g32UkjRTO2FWOptNUgzXVmlMkJvqaCOs dRS01Xi1suyh56Ye532koyP76KSTbTV17TU5nwhJOY2iUu+AcOhl9h6lotnhOGzZPap0 mMJ7q1hM/m8xX4UyzLHJ/xccKICT3cT1+xEZd2leE69UaD8HSgrH/yE/a1dVUwF7gEOS X3aQ== X-Gm-Message-State: AOJu0YxrtCHXglzXObzuFhsdQPDxirc2ylvUq03EKOtjO2JcHw+AM0vD H4w0bv4VCIWvanJk6+Rur8wkenSr/j36KujIw52GUIBn03Gf8x8iWsVsTQ== X-Received: by 2002:a17:907:94d1:b0:a77:b516:3023 with SMTP id a640c23a62f3a-a780b68a2abmr777132266b.4.1720700300100; Thu, 11 Jul 2024 05:18:20 -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 a640c23a62f3a-a780a6bc8c3sm250861166b.20.2024.07.11.05.18.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jul 2024 05:18:19 -0700 (PDT) From: AdrianEddy To: ffmpeg-devel@ffmpeg.org Date: Thu, 11 Jul 2024 14:18:06 +0200 Message-Id: <20240711121806.16442-1-adrian.eddy@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/videotoolboxenc: 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: nFaCTrzJc9bh --- libavcodec/defs.h | 1 + libavcodec/videotoolboxenc.c | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/libavcodec/defs.h b/libavcodec/defs.h index 7ddfdcad0b..d7bf5aa00f 100644 --- a/libavcodec/defs.h +++ b/libavcodec/defs.h @@ -160,6 +160,7 @@ #define AV_PROFILE_HEVC_MAIN_10 2 #define AV_PROFILE_HEVC_MAIN_STILL_PICTURE 3 #define AV_PROFILE_HEVC_REXT 4 +#define AV_PROFILE_HEVC_MAIN_10_422 5 #define AV_PROFILE_HEVC_SCC 9 #define AV_PROFILE_VVC_MAIN_10 1 diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index bc505abee4..8e2a66ee4a 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -115,6 +115,7 @@ static struct{ CFStringRef kVTProfileLevel_HEVC_Main_AutoLevel; CFStringRef kVTProfileLevel_HEVC_Main10_AutoLevel; + CFStringRef kVTProfileLevel_HEVC_Main42210_AutoLevel; CFStringRef kVTCompressionPropertyKey_RealTime; CFStringRef kVTCompressionPropertyKey_TargetQualityForAlpha; @@ -184,8 +185,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, @@ -966,6 +968,15 @@ static bool get_vt_hevc_profile_level(AVCodecContext *avctx, *profile_level_val = compat_keys.kVTProfileLevel_HEVC_Main10_AutoLevel; break; + case AV_PROFILE_HEVC_MAIN_10_422: + if (bit_depth > 0 && bit_depth != 10) { + av_log(avctx, AV_LOG_ERROR, + "Invalid main42210 profile with %d bit input\n", bit_depth); + return false; + } + *profile_level_val = + compat_keys.kVTProfileLevel_HEVC_Main42210_AutoLevel; + break; } if (!*profile_level_val) { @@ -2940,6 +2951,7 @@ static const AVOption hevc_options[] = { { "profile", "Profile", OFFSET(profile), AV_OPT_TYPE_INT, { .i64 = AV_PROFILE_UNKNOWN }, AV_PROFILE_UNKNOWN, INT_MAX, VE, .unit = "profile" }, { "main", "Main Profile", 0, AV_OPT_TYPE_CONST, { .i64 = AV_PROFILE_HEVC_MAIN }, INT_MIN, INT_MAX, VE, .unit = "profile" }, { "main10", "Main10 Profile", 0, AV_OPT_TYPE_CONST, { .i64 = AV_PROFILE_HEVC_MAIN_10 }, INT_MIN, INT_MAX, VE, .unit = "profile" }, + { "main42210", "Main42210 Profile", 0, AV_OPT_TYPE_CONST, { .i64 = AV_PROFILE_HEVC_MAIN_10_422 }, INT_MIN, INT_MAX, VE, .unit = "profile" }, { "alpha_quality", "Compression quality for the alpha channel", OFFSET(alpha_quality), AV_OPT_TYPE_DOUBLE, { .dbl = 0.0 }, 0.0, 1.0, VE },