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 C765546551 for ; Sun, 21 May 2023 14:41:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3025C68BE0F; Sun, 21 May 2023 17:41:53 +0300 (EEST) Received: from out203-205-221-240.mail.qq.com (out203-205-221-240.mail.qq.com [203.205.221.240]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 073A868B75C for ; Sun, 21 May 2023 17:41:45 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1684680097; bh=fh4e5lFthVNCvMMzEUB/Sn66/PykXV0cEpuDPIN+FfU=; h=From:To:Cc:Subject:Date; b=UH83kalzOGJOYI+CMTGAUUXBf0Jb3aTR5vh5JIS8S5OjKuiXQu0WWYuP+P2M0HmGK EoDRzC5fYiJEFsc/c1hVxwUJmEb0cZnRzAUZPEvhTiARVQLZ9paauteRtxvC6yHok/ Gt/ErkdoDaseaEOyXPAbE2GE/yarBv4kKfhonEFM= Received: from localhost.localdomain ([113.65.131.36]) by newxmesmtplogicsvrsza7-0.qq.com (NewEsmtp) with SMTP id A6489234; Sun, 21 May 2023 22:41:36 +0800 X-QQ-mid: xmsmtpt1684680096t8ijbidg5 Message-ID: X-QQ-XMAILINFO: M19Y29Y2tssFRLPzn9Cg+ck0bVNn+vIV00I9LiAvGPa29PBuWH/bDB38+LSoff 6A78r8bj2LONQ5D3tpeeROR6T8bRVlpgqIu0mlJg3bPCZKf4S2uf3ZAwe2Fcczl7a74xfQTPqP0P tiGhmqQZtBwop5GRagTF+Wh9ikHn2T1YNmUbeZVL+xyj0XZiiGw+kG9emUTwEDHcgHUPMEea9wna VhXAC8X3Gd8CCkGbd006YisEHkQqXgzoQGcrmfRg06xW7D736eengVRJRZEMYqiuS1DIuhT7EYQ5 WYAOQgRCTSweZ7JLOBq4f6s2oaZzjx/jeizmAWh/h/ArJw7d4mO2oWBfaeB51AQ819gsV6Fp+YBH axqbUUEqwtFjOtj7vHK5uW8fs10wXMHGeZgGa+rBBAmxjJvCQSXTA635twXX5ghMECVDEdMs9yAB r7pCC9khcJNiFQCT06Kh5bbekQhKfyJYWrPB3zdzlwsy+EJD7ITYsV1tSg9kK+1zLe5pIyIEP3Ig opCK6qaaQe6XELkK2B/d7Q1WI3JpdLIpVePHAZSENBWbiM4U/JtBcz0kk21V6yE0I4Dflmy+SL3G o7PKQjcf7kYb0lvGXSyLtapymDdyELSiDYeaCa4fzjIorFksmaFpjlBjTeqjDHq5MODPNh38HZnf xTJVHH7lHxtjsIFt7jNlABadxFJOOLNGDXUgHnbqqpv+UplNh4e46hz9pGC1ZW6Ecdqyz1z9SjXH quYZn8kVMRDCpKCmJZrdZrgjU4N/sypabau5yD45gy+EyHemLeZ+R1cZ9P3AYpN6ssiyqAYKeFEx 7lxNyyLQTy2e8r/Sd5efKy62rMBDhDnygpE5r06Oz+iIrZv8ZNwWCBltqZKERAQlLsBG6ppQrvjh hwyAekoWlK9lOejeHO/tcOsGNmPatTiS5cGdhltyj+TJAr2xJDRcObXLFV7PIqHBwxbP/smAsPc7 YRA5TxDqa9iQZVsu9WQ2mFOU7QjZQXWZRQ4UaSSL00QHx/K1kv5dI9FajwKdjOUGcj1YZI+GmQAn 3M/RjXBg== From: xufuji456 <839789740@qq.com> To: ffmpeg-devel@ffmpeg.org Date: Sun, 21 May 2023 22:41:34 +0800 X-OQ-MSGID: <20230521144134.16755-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: replace VT_H264Profile with avctx 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: For compatibility with constrained_baseline in the future, replace VT_H264Profile/VT_HEVCProfile with avctx->profile. Signed-off-by: xufuji456 <839789740@qq.com> --- libavcodec/videotoolboxenc.c | 55 +++++++++++------------------------- 1 file changed, 16 insertions(+), 39 deletions(-) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index b017c90c36..4966ab36ae 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -190,28 +190,12 @@ static void loadVTEncSymbols(void){ "EnableLowLatencyRateControl"); } -typedef enum VT_H264Profile { - H264_PROF_AUTO, - H264_PROF_BASELINE, - H264_PROF_MAIN, - H264_PROF_HIGH, - H264_PROF_EXTENDED, - H264_PROF_COUNT -} VT_H264Profile; - typedef enum VTH264Entropy{ VT_ENTROPY_NOT_SET, VT_CAVLC, VT_CABAC } VTH264Entropy; -typedef enum VT_HEVCProfile { - HEVC_PROF_AUTO, - HEVC_PROF_MAIN, - HEVC_PROF_MAIN10, - HEVC_PROF_COUNT -} VT_HEVCProfile; - static const uint8_t start_code[] = { 0, 0, 0, 1 }; typedef struct ExtraSEI { @@ -730,18 +714,13 @@ static bool get_vt_h264_profile_level(AVCodecContext *avctx, VTEncContext *vtctx = avctx->priv_data; int64_t profile = vtctx->profile; - if (profile == H264_PROF_AUTO && vtctx->level) { - //Need to pick a profile if level is not auto-selected. - profile = vtctx->has_b_frames ? H264_PROF_MAIN : H264_PROF_BASELINE; - } - *profile_level_val = NULL; switch (profile) { case H264_PROF_AUTO: return true; - case H264_PROF_BASELINE: + case FF_PROFILE_H264_BASELINE: switch (vtctx->level) { case 0: *profile_level_val = compat_keys.kVTProfileLevel_H264_Baseline_AutoLevel; break; @@ -763,7 +742,7 @@ static bool get_vt_h264_profile_level(AVCodecContext *avctx, } break; - case H264_PROF_MAIN: + case FF_PROFILE_H264_MAIN: switch (vtctx->level) { case 0: *profile_level_val = compat_keys.kVTProfileLevel_H264_Main_AutoLevel; break; @@ -782,7 +761,7 @@ static bool get_vt_h264_profile_level(AVCodecContext *avctx, } break; - case H264_PROF_HIGH: + case FF_PROFILE_H264_HIGH: switch (vtctx->level) { case 0: *profile_level_val = compat_keys.kVTProfileLevel_H264_High_AutoLevel; break; @@ -805,7 +784,7 @@ static bool get_vt_h264_profile_level(AVCodecContext *avctx, compat_keys.kVTProfileLevel_H264_High_5_2; break; } break; - case H264_PROF_EXTENDED: + case FF_PROFILE_H264_EXTENDED: switch (vtctx->level) { case 0: *profile_level_val = compat_keys.kVTProfileLevel_H264_Extended_AutoLevel; break; @@ -838,13 +817,11 @@ static bool get_vt_hevc_profile_level(AVCodecContext *avctx, *profile_level_val = NULL; switch (profile) { - case HEVC_PROF_AUTO: - return true; - case HEVC_PROF_MAIN: + case FF_PROFILE_HEVC_MAIN: *profile_level_val = compat_keys.kVTProfileLevel_HEVC_Main_AutoLevel; break; - case HEVC_PROF_MAIN10: + case FF_PROFILE_HEVC_MAIN_10: *profile_level_val = compat_keys.kVTProfileLevel_HEVC_Main10_AutoLevel; break; @@ -1515,12 +1492,12 @@ static int vtenc_configure_encoder(AVCodecContext *avctx) vtctx->get_param_set_func = CMVideoFormatDescriptionGetH264ParameterSetAtIndex; vtctx->has_b_frames = avctx->max_b_frames > 0; - if(vtctx->has_b_frames && vtctx->profile == H264_PROF_BASELINE){ + if(vtctx->has_b_frames && vtctx->profile == FF_PROFILE_H264_BASELINE) { av_log(avctx, AV_LOG_WARNING, "Cannot use B-frames with baseline profile. Output will not contain B-frames.\n"); vtctx->has_b_frames = 0; } - if (vtctx->entropy == VT_CABAC && vtctx->profile == H264_PROF_BASELINE) { + if (vtctx->entropy == VT_CABAC && vtctx->profile == FF_PROFILE_H264_BASELINE) { av_log(avctx, AV_LOG_WARNING, "CABAC entropy requires 'main' or 'high' profile, but baseline was requested. Encode will not use CABAC entropy.\n"); vtctx->entropy = VT_ENTROPY_NOT_SET; } @@ -2756,11 +2733,11 @@ 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" }, + { "profile", "Profile", OFFSET(profile), AV_OPT_TYPE_INT64, { .i64 = FF_PROFILE_H264_BASELINE }, FF_PROFILE_H264_BASELINE, FF_PROFILE_H264_HIGH, VE, "profile" }, + { "baseline", "Baseline Profile", 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_H264_BASELINE }, INT_MIN, INT_MAX, VE, "profile" }, + { "main", "Main Profile", 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_H264_MAIN }, INT_MIN, INT_MAX, VE, "profile" }, + { "extended", "Extend Profile", 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_H264_EXTENDED }, INT_MIN, INT_MAX, VE, "profile" }, + { "high", "High Profile", 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_H264_HIGH }, 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" }, @@ -2811,9 +2788,9 @@ const FFCodec ff_h264_videotoolbox_encoder = { }; static const AVOption hevc_options[] = { - { "profile", "Profile", OFFSET(profile), AV_OPT_TYPE_INT64, { .i64 = HEVC_PROF_AUTO }, HEVC_PROF_AUTO, HEVC_PROF_COUNT, VE, "profile" }, - { "main", "Main Profile", 0, AV_OPT_TYPE_CONST, { .i64 = HEVC_PROF_MAIN }, INT_MIN, INT_MAX, VE, "profile" }, - { "main10", "Main10 Profile", 0, AV_OPT_TYPE_CONST, { .i64 = HEVC_PROF_MAIN10 }, INT_MIN, INT_MAX, VE, "profile" }, + { "profile", "Profile", OFFSET(profile), AV_OPT_TYPE_INT64, { .i64 = FF_PROFILE_HEVC_MAIN }, FF_PROFILE_HEVC_MAIN, FF_PROFILE_HEVC_MAIN_10, VE, "profile" }, + { "main", "Main Profile", 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_HEVC_MAIN }, INT_MIN, INT_MAX, VE, "profile" }, + { "main10", "Main10 Profile", 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_HEVC_MAIN_10 }, 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 }, -- 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".