From: xufuji456 <839789740@qq.com> To: ffmpeg-devel@ffmpeg.org Cc: xufuji456 <839789740@qq.com>, kernrj@gmail.com Subject: [FFmpeg-devel] [PATCH] avcodec/videotoolboxenc: add CBP/CHP profile Date: Sun, 21 May 2023 19:22:26 +0800 Message-ID: <tencent_A91819467D708B6CE73CA0E50C21C46C9E07@qq.com> (raw) 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".
next reply other threads:[~2023-05-21 11:22 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-05-21 11:22 xufuji456 [this message] 2023-05-21 13:07 ` Rick Kern 2023-05-21 14:05 ` [FFmpeg-devel] =?gb18030?b?u9i4tKO6ICBbUEFUQ0hdIGF2Y29kZWMvdmlk?= =?gb18030?q?eotoolboxenc=3A_add_CBP/CHP_profile?= =?gb18030?B?0Oy4o8Kh?= 2023-05-23 2:27 [FFmpeg-devel] [PATCH] avcodec/videotoolboxenc: add CBP/CHP profile xufuji456 2023-05-26 11:37 ` [FFmpeg-devel] =?gb18030?b?u9i4tKO6W1BBVENIXSBhdmNvZGVjL3ZpZGVv?= =?gb18030?q?toolboxenc=3A_add_CBP/CHP_profile?= =?gb18030?B?0Oy4o8Kh?= 2023-06-03 21:39 ` [FFmpeg-devel] [PATCH] avcodec/videotoolboxenc: add CBP/CHP profile Rick Kern
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=tencent_A91819467D708B6CE73CA0E50C21C46C9E07@qq.com \ --to=839789740@qq.com \ --cc=ffmpeg-devel@ffmpeg.org \ --cc=kernrj@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git