From: =?gb18030?B?0Oy4o8Kh?= <839789740@qq.com>
To: =?gb18030?B?ZmZtcGVnLWRldmVs?= <ffmpeg-devel@ffmpeg.org>
Cc: =?gb18030?B?UmljayZuYnNwO0tlcm4=?= <kernrj@gmail.com>
Subject: [FFmpeg-devel] =?gb18030?b?u9i4tKO6W1BBVENIXSBhdmNvZGVjL3ZpZGVv?= =?gb18030?q?toolboxenc=3A_add_CBP/CHP_profile?=
Date: Fri, 26 May 2023 19:37:15 +0800
Message-ID: <tencent_AFB29BF29696DF850EB23762121835C15109@qq.com> (raw)
In-Reply-To: <tencent_D6B24D63FE18A9C05DB29BF346964785C209@qq.com>
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="gb18030", Size: 8750 bytes --]
Kern, please help to review this patch, which has added CBP profile with profile options.
As for the VT_H264Profile replacement, let you take over, follow up this patch.
Thanks
------------------ ÔʼÓʼþ ------------------
·¢¼þÈË: "xufuji456" <839789740@qq.com>;
·¢ËÍʱ¼ä: 2023Äê5ÔÂ23ÈÕ(ÐÇÆÚ¶þ) ÉÏÎç10:27
ÊÕ¼þÈË: "ffmpeg-devel"<ffmpeg-devel@ffmpeg.org>;
³ËÍ: "Ð츣¡"<839789740@qq.com>;
Ö÷Ìâ: [PATCH] avcodec/videotoolboxenc: add CBP/CHP profile
The Constrained_Baseline and Constrained_High profile of H264 has available in iOS 15.0
Signed-off-by: xufuji456 <839789740@qq.com>
---
libavcodec/videotoolboxenc.c | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
index b017c90c36..028095cd04 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");
@@ -193,8 +197,10 @@ static void loadVTEncSymbols(void){
typedef enum VT_H264Profile {
H264_PROF_AUTO,
H264_PROF_BASELINE,
+ H264_PROF_CONSTRAINED_BASELINE,
H264_PROF_MAIN,
H264_PROF_HIGH,
+ H264_PROF_CONSTRAINED_HIGH,
H264_PROF_EXTENDED,
H264_PROF_COUNT
} VT_H264Profile;
@@ -763,6 +769,10 @@ static bool get_vt_h264_profile_level(AVCodecContext *avctx,
}
break;
+ case H264_PROF_CONSTRAINED_BASELINE:
+ *profile_level_val = compat_keys.kVTProfileLevel_H264_ConstrainedBaseline_AutoLevel;
+ break;
+
case H264_PROF_MAIN:
switch (vtctx->level) {
case 0: *profile_level_val =
@@ -805,6 +815,11 @@ static bool get_vt_h264_profile_level(AVCodecContext *avctx,
compat_keys.kVTProfileLevel_H264_High_5_2; break;
}
break;
+
+ case H264_PROF_CONSTRAINED_HIGH:
+ *profile_level_val = compat_keys.kVTProfileLevel_H264_ConstrainedHigh_AutoLevel;
+ break;
+
case H264_PROF_EXTENDED:
switch (vtctx->level) {
case 0: *profile_level_val =
@@ -2757,10 +2772,12 @@ static const enum AVPixelFormat prores_pix_fmts[] = {
#define OFFSET(x) offsetof(VTEncContext, x)
static const AVOption h264_options[] = {
{ "profile", "Profile", OFFSET(profile), AV_OPT_TYPE_INT64, { .i64 = H264_PROF_AUTO }, H264_PROF_AUTO, H264_PROF_COUNT, VE, "profile" },
- { "baseline", "Baseline Profile", 0, AV_OPT_TYPE_CONST, { .i64 = H264_PROF_BASELINE }, INT_MIN, INT_MAX, VE, "profile" },
- { "main", "Main Profile", 0, AV_OPT_TYPE_CONST, { .i64 = H264_PROF_MAIN }, INT_MIN, INT_MAX, VE, "profile" },
- { "high", "High Profile", 0, AV_OPT_TYPE_CONST, { .i64 = H264_PROF_HIGH }, INT_MIN, INT_MAX, VE, "profile" },
- { "extended", "Extend Profile", 0, AV_OPT_TYPE_CONST, { .i64 = H264_PROF_EXTENDED }, INT_MIN, INT_MAX, VE, "profile" },
+ { "baseline", "Baseline Profile", 0, AV_OPT_TYPE_CONST, { .i64 = H264_PROF_BASELINE }, INT_MIN, INT_MAX, VE, "profile" },
+ { "constrained_baseline", "Constrained_Baseline Profile", 0, AV_OPT_TYPE_CONST, { .i64 = H264_PROF_CONSTRAINED_BASELINE }, INT_MIN, INT_MAX, VE, "profile" },
+ { "main", "Main Profile", 0, AV_OPT_TYPE_CONST, { .i64 = H264_PROF_MAIN }, INT_MIN, INT_MAX, VE, "profile" },
+ { "high", "High Profile", 0, AV_OPT_TYPE_CONST, { .i64 = H264_PROF_HIGH }, INT_MIN, INT_MAX, VE, "profile" },
+ { "constrained_high", "Constrained_High Profile", 0, AV_OPT_TYPE_CONST, { .i64 = H264_PROF_CONSTRAINED_HIGH }, INT_MIN, INT_MAX, VE, "profile" },
+ { "extended", "Extend Profile", 0, AV_OPT_TYPE_CONST, { .i64 = H264_PROF_EXTENDED }, INT_MIN, INT_MAX, VE, "profile" },
{ "level", "Level", OFFSET(level), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 52, VE, "level" },
{ "1.3", "Level 1.3, only available with Baseline Profile", 0, AV_OPT_TYPE_CONST, { .i64 = 13 }, INT_MIN, INT_MAX, VE, "level" },
--
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 prev parent reply other threads:[~2023-05-26 11:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-23 2:27 [FFmpeg-devel] [PATCH] avcodec/videotoolboxenc: add CBP/CHP profile xufuji456
2023-05-26 11:37 ` =?gb18030?B?0Oy4o8Kh?= [this message]
2023-06-03 21:39 ` 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_AFB29BF29696DF850EB23762121835C15109@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