From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id BE14E46529 for ; Sun, 21 May 2023 11:22:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 11E3F68C023; Sun, 21 May 2023 14:22:46 +0300 (EEST) Received: from out162-62-57-210.mail.qq.com (out162-62-57-210.mail.qq.com [162.62.57.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D83D368BA65 for ; Sun, 21 May 2023 14:22:38 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1684668150; bh=dKmYChg/L+qNGJprYvbrqZHpP3+K9b4lEtpVWJyroDU=; h=From:To:Cc:Subject:Date; b=iEAUoQY7fvmnDrh8gxo9YY5UlBopK28IFBuwUVc88OJZIFHWgSbMAEc+jWcmT+M98 sIRBH3kd/pyyzOFBJde4OaGaUu5rQHyu2BLwP1RAYas4CNyIztAeJHNXp4r/QcUJOm kBO13m+m1j2DZo3AVJxzLesWLL7bA0CeB7VT0aRc= Received: from localhost.localdomain ([113.65.131.36]) by newxmesmtplogicsvrszc5-0.qq.com (NewEsmtp) with SMTP id 59C89C4C; Sun, 21 May 2023 19:22:28 +0800 X-QQ-mid: xmsmtpt1684668148ti6cgn6gl Message-ID: X-QQ-XMAILINFO: OKKHiI6c9SH3WVuWwrpqyOXdMcrYB0fmop7Rdh3Rd5c661WwR+a6wHRW7XCUzr y+n0CpPTwNHk+7KwsGTWDu4dLmJYlEmcqxK+GfALKk7g79RBC5LHhdx6e0PuLj5QNGvHDcz76s7H xrV3UEX7pkStLiUOR0zgMAbMx2VmNj77g5yX5vQC6aevB8XViz0Z/fu/VMIBFNj25FosgyDc3pm0 Bs6122QPgbMmKOT7PzdRFCU2Pz46N9niLXrUduB9RZEneGFhdyPgdwfXtv6tm1dvafmKnwSm9Jus 9P6nthymz69GOnzxBB8cEzQGD/ic7BCmZWCPosOMTtAVJCvDBJlSUOXnL0K3q1n8icjekOuzL9t0 r/kgmMxdaIm2Hjf6pSXuNlGpMI43+q21XtsR6BDpyhaHAp8teZ4tVrt20ruGOj7rwhlD7F4N0cvV m28hZYij1tg0yN8w7y+X028uC4Z5VRkcNlKITan4gBowq2s2DgVUKJHFM4G5aklRCAVUsiXVqJzN QcYXjMIJBDPh/87WMNiiCnHwG3zYj0nKkMeR8zLalRAm8iSteCJYB50bPO0Kn72CF1kEl5k+4QHl 4kOQi7QdAquQpOC5aE1sFWU2l6emVY+8LMauUo4cfwfPVXZ9EVJo6m9f06kAUcFvmInL6v2xxkTZ m0h5XCkwr9zVPpa4DYmmTAgnoukrhOByvBnqrsW306ZGqZzi2AlfHEsfsQU0SEzdqpJf/ZBM5uhC StTQ44S7o0Qu7BWW1U8FPF0ELwaJxTyznGgRx6ftQf0tnKw1A5dATXWx70DxlqmlPVQtQeCfy/xT KLGACB6SrhoX/NgD0Ted7xwfsXgG4S3gfBaumLxFyGoQXyfF31e9E8TqGxQ8FfCA9ozZ+iWZ7g1Y 6FGXBqiWfa0kkaGc9oZFpt23UwvPw3wlcldYJ+Yk/Kp8SHsStCJ4AKFkSPD1dHOQijV4wwbgxJki 0Wdnzv3iZ9D++uP3j/jKjPVU5WGc50GOocVKHEFUCTxfYPleb1gYAO+56IpBofUWc+1Vi+zx6j9b vUwsUSSQ== From: xufuji456 <839789740@qq.com> To: ffmpeg-devel@ffmpeg.org Date: Sun, 21 May 2023 19:22:26 +0800 X-OQ-MSGID: <20230521112226.14845-1-839789740@qq.com> X-Mailer: git-send-email 2.32.0 (Apple Git-132) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/videotoolboxenc: add CBP/CHP 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: xufuji456 <839789740@qq.com>, kernrj@gmail.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: The CBP/CHP profile has available with H264 in iOS 15.0. Official Doc: https://developer.apple.com/documentation/videotoolbox/kvtprofilelevel_h264_constrainedbaseline_autolevel Signed-off-by: xufuji456 <839789740@qq.com> --- libavcodec/videotoolboxenc.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index b017c90c36..6a9b19831b 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -108,6 +108,8 @@ static struct{ CFStringRef kVTProfileLevel_H264_High_AutoLevel; CFStringRef kVTProfileLevel_H264_Extended_5_0; CFStringRef kVTProfileLevel_H264_Extended_AutoLevel; + CFStringRef kVTProfileLevel_H264_ConstrainedBaseline_AutoLevel; + CFStringRef kVTProfileLevel_H264_ConstrainedHigh_AutoLevel; CFStringRef kVTProfileLevel_HEVC_Main_AutoLevel; CFStringRef kVTProfileLevel_HEVC_Main10_AutoLevel; @@ -171,6 +173,8 @@ static void loadVTEncSymbols(void){ GET_SYM(kVTProfileLevel_H264_High_AutoLevel, "H264_High_AutoLevel"); GET_SYM(kVTProfileLevel_H264_Extended_5_0, "H264_Extended_5_0"); GET_SYM(kVTProfileLevel_H264_Extended_AutoLevel, "H264_Extended_AutoLevel"); + 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"); @@ -743,8 +747,15 @@ static bool get_vt_h264_profile_level(AVCodecContext *avctx, case H264_PROF_BASELINE: switch (vtctx->level) { - case 0: *profile_level_val = - compat_keys.kVTProfileLevel_H264_Baseline_AutoLevel; break; + case 0: { + // check avctx->profile has been set constrained_baseline + if (avctx->profile == FF_PROFILE_H264_CONSTRAINED_BASELINE) { + *profile_level_val = compat_keys.kVTProfileLevel_H264_ConstrainedBaseline_AutoLevel; + } else { + *profile_level_val = compat_keys.kVTProfileLevel_H264_Baseline_AutoLevel; + } + break; + } case 13: *profile_level_val = kVTProfileLevel_H264_Baseline_1_3; break; case 30: *profile_level_val = kVTProfileLevel_H264_Baseline_3_0; break; case 31: *profile_level_val = kVTProfileLevel_H264_Baseline_3_1; break; @@ -784,6 +795,15 @@ static bool get_vt_h264_profile_level(AVCodecContext *avctx, case H264_PROF_HIGH: switch (vtctx->level) { + case 0: { + // check avctx->profile has been set constrained_high + if (avctx->profile == (FF_PROFILE_H264_HIGH | FF_PROFILE_H264_CONSTRAINED)) { + *profile_level_val = compat_keys.kVTProfileLevel_H264_ConstrainedHigh_AutoLevel; + } else { + *profile_level_val = compat_keys.kVTProfileLevel_H264_High_AutoLevel; + } + break; + } case 0: *profile_level_val = compat_keys.kVTProfileLevel_H264_High_AutoLevel; break; case 30: *profile_level_val = -- 2.32.0 (Apple Git-132) _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".