From patchwork Mon Sep 11 16:00:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AdrianEddy X-Patchwork-Id: 43699 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp2231361pzb; Mon, 11 Sep 2023 09:01:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGFtUm87gnpAmpX9kfpqmy1vWREJkxzLLHhNEFiN710Z9tmkhtE9nj/pPsWkvOWnKXkUWv7 X-Received: by 2002:a05:6402:5162:b0:522:2aba:bc3b with SMTP id d2-20020a056402516200b005222ababc3bmr8625244ede.28.1694448098431; Mon, 11 Sep 2023 09:01:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694448098; cv=none; d=google.com; s=arc-20160816; b=eHdXgzPZFd+u7aqIPtc7a/EGW1pQmz8yufsAjOURe/W7xhNfx2giLui4nF8SAD8crj 1Nnp8jpSzraPXDS6lIq59I/NAlqdJQDvlSBgYp/4evKs78yw06pc1N5LJBI6+ZwwI7Ty +L69jueufnlY1DYJMs+hHaXUlYRafl3wetH0ek8dAqO0l6sTdiP0bdRYQc0FnHp9mlca bwdqKkUS1NK4PpaSdm9taPmz8DgFpQC5M0BJv+A7Nf9TO5TCmb61rnPUYAGHIa88Q6Bk YrjnGNLHJCpzKB7IzAh8tK/skt21NLJ/LB12S0eXf0YQ94LidQC2YXCJTTbTJEgfARIO 1xGg== 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=EVekX5F9fXScN9rSzPOOh66ArSJZWdFbC/mIGT6YIf0=; fh=8TfeH1lx0mVLXnKE2aPBT0Hozrqx9k4uZabL0vxyxCk=; b=FKVM7gaADyWhoM6foLWyWbx1h3M4Y+9NzgO0cL67UmrpdM3xguc156DaKGbnzNrMU3 FcjF8iENGlmHFZaBmkrWTBy4tyaGMsoJM71yB2JMmPouc4klH9GV4+ru6D3a69N/Fd4F l6wNZoRPPyJ0Qmc+iHBwj/oWGV7HlXXUFHybTJ8UugyHCZSbj8f8gzdExwq+B2zkhql1 sleQ8Ru4SMENRxkMLqo6aCuB/QUOsZ3uYUGiJKTMIU75W4Da0eP/b8p+zKDTP6BHBHxZ d0s/i3gZOMMyiy3H3JZjL6ZDujmASyE7NVsRBz1Gv1YFc0QLh68BfYMUtJ9SYf5C2uXq tLQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=G0Op7zK6; 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 c10-20020a056402120a00b00523384b2e83si6924684edw.56.2023.09.11.09.01.35; Mon, 11 Sep 2023 09:01:38 -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=G0Op7zK6; 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 514A068C948; Mon, 11 Sep 2023 19:01:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AAE6468C772 for ; Mon, 11 Sep 2023 19:01:24 +0300 (EEST) Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-31aeedbb264so4882492f8f.0 for ; Mon, 11 Sep 2023 09:01:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694448083; x=1695052883; 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=Nv82EoiGHiSlswPF4ZBC5vtaqLQQyQbCT7jtzdTnC00=; b=G0Op7zK6ijab5cR9UxN40ZrEk3ehXyD6231jOqaDELcBgJz4HodllaysSld1qy1+ai 5oWZV/kWmXX+6k6WMVcLjE3GnV1gJPPB3z8Z0EXU/ywLFG89fH2ZnKcFEH27ZvNYNNn4 FbNEK6wzf1m3J6gn03akteSCbBXf1CtTVQOlheQp2mvlSUpki6pKk905tU5riX/SKNh3 Wlb1eVCk2yaSmo86E8rBMslSNVP6UEr+VdJk7m55g1uuFdlhbfetOeRW7Uo8/ll/r7Zt pg0qHitcFoEpflJMkr50/VewhSCLMFOgDspUzkwVdHj2cyzuOa8zLZP0HE5wmtDwpvTs KYRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694448083; x=1695052883; 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=Nv82EoiGHiSlswPF4ZBC5vtaqLQQyQbCT7jtzdTnC00=; b=LHv6Wb/05nd6J681cXo1YFlQ2abbW/dij6WTnF29pkW+m07sAgqku3qzy5ZSn363oE 4PC/T0lA+nuuuZObELXOAYwlXxU1Y+PC8SfbJgqvlbyoPJZmgBIF94mTUwTYaRW70ISX SbN2tfCY/OzMikkz+hyPKc/mfJNtCB8Yvuf/h3bWG+0hUlWLcZjMj3ktxt+josB/Ivn+ n3K4ihJOe53qrkSDZ8TaxYTr/0VTrbtn+pV1MArrnDztvPJ9Yqd2/BDIwv9xV9FFi6DF hOwLGBfFXxDMHUBF2zw6mRg9lwnBfO0CfxbGFAD2ED74KdKNxc8dLeKCbsoxNTqHjUH8 ft3w== X-Gm-Message-State: AOJu0YyzBJjKNqjo/e1kZRrqcixRDajr5M158XPS7hTiPcydyPqU8NK1 +lDwroA2/kt1Ow4rWzozMHZEQaiq7nIYFg== X-Received: by 2002:a5d:49cc:0:b0:319:83e4:bbbf with SMTP id t12-20020a5d49cc000000b0031983e4bbbfmr7905239wrs.20.1694448083188; Mon, 11 Sep 2023 09:01:23 -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 f15-20020aa7d84f000000b005255f5735adsm4825343eds.24.2023.09.11.09.01.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Sep 2023 09:01:22 -0700 (PDT) From: AdrianEddy To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Sep 2023 18:00:55 +0200 Message-Id: <20230911160055.7538-1-adrian.eddy@gmail.com> X-Mailer: git-send-email 2.30.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: e3uuK0WkkwfQ --- libavcodec/avcodec.h | 1 + libavcodec/videotoolboxenc.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index da3c5234a0..51e63f72ec 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1691,6 +1691,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 d0a00347b5..fac942b7a9 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) { @@ -2838,6 +2844,7 @@ static const AVOption hevc_options[] = { { "profile", "Profile", OFFSET(profile), AV_OPT_TYPE_INT, { .i64 = AV_PROFILE_UNKNOWN }, AV_PROFILE_UNKNOWN, INT_MAX, VE, "profile" }, { "main", "Main Profile", 0, AV_OPT_TYPE_CONST, { .i64 = AV_PROFILE_HEVC_MAIN }, INT_MIN, INT_MAX, VE, "profile" }, { "main10", "Main10 Profile", 0, AV_OPT_TYPE_CONST, { .i64 = AV_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 },