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 A6A2745A1F for ; Fri, 9 Jun 2023 11:21:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 16BD568C31F; Fri, 9 Jun 2023 14:21:22 +0300 (EEST) Received: from out203-205-221-210.mail.qq.com (out203-205-221-210.mail.qq.com [203.205.221.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 891C668C318 for ; Fri, 9 Jun 2023 14:21:14 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1686309671; bh=BDgtHBT01Ns9g1jnBFAUXsJbAmEweyn56MwF+XhKwZ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=eeP7SR44xiwcevyG41UW8OfOsD6Y1ytwvihToQ2D1N8luikA1rskAkcXBOMluEzNc 9NbCuJg+T2+6K81tX3wrXfkp/Wyc/p36jtdrhjPOd+1Ckire8b5YBsqi4PJoZc9zeB nRnNqS8PB5X7uOIxWZuJ5mz0VIxx0XfZHpTy0UkM= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.55]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id 3C02EA18; Fri, 09 Jun 2023 19:15:00 +0800 X-QQ-mid: xmsmtpt1686309309tscejqlcr Message-ID: X-QQ-XMAILINFO: Mdc3TkmnJyI/ziFiBJGOro3kHMOZV0+/gIiLfqJr0qNM5vkCv9Vf95+Rggey0b Z9pjO8mQSSop+Zk9YQEwfnJMz8RkWYGx/LMwehcv2fsPjbzBg7QJ0PzyMP3vUsWcNMyh7SQeZgq9 N4xfN/3PtfR9YFlaamDKs0AnlEgINNZtxsONVuVPcPccyPhhlrSZPaxVSWhJEN4ukVKYu9/DEgLJ rOiYweAT2KbvpezvKjrDsMftWvY63mdInkaV6jzbr/mCfX7tcj6yRASpEY1wo7G8LLbKu7ZLHQNK M9DHTvF85n7aX0n/ELayTR/daOdCGVb24/Kwln+HSRvqwk6ybGPC3YpTt8lUhYKF4umEFc3mkIWJ CGZBkmYcSg5pelAzHzQhO21HsODBgyIlFa2zb5rjcggoKD+AZtz3jxglsMhczTXEMcGluqfYFla7 Geu0rdoH7TmHbA1KKFHOE5dPoP7Hd/iiXT+o742w/ke0NQ3NRLwCI+OAfcQFwPLhC+PMF9B11g4M F7rkAQDTKVKpsr44Wa8mzi7h4vvc3O6IDNB84szXf6o7tEV+pTz7G0b9jy+HONuNOS/dFJYX8s+p yG4uEbD/DW0FG9t0B+Jfiqoa2LkNvQrib1U8w88dwv6h69iFu4LQ6nQ1aJIcmvQfve759c2Y8ZLA SSaoOoXUXhTUlQgspW+ML24gSMIvzrWu0KS8emcJeeA6JbWjiEjWSh6ma5ims9+Ejk9AX0BqmvTF 5GF9gAGYRaJ10aY2TsgmI1VL1MgtQfLW9bx6VFHbpatOF4O59ILlRcPn9EcgZc4OuIPDvbXUJPe+ 2kz7B2DygnNBRU3R4QyA7i+SP8NBkI/5Tr0WemB/8xPVY2nX9CXVh1QIExgZp6Ik1pP7edyJLzF2 nTJy/TOi9QyA1MEUNQtpIo3CkiyrlbZjGfebRyZvLTiln+g93aiCGwkrPS3H/XmarGbfZlrmo0JX pjiHJP5Iy/4zH5/Pm/+FWrezfbJ62Fxc0KmweoAqQ= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Jun 2023 19:14:54 +0800 X-OQ-MSGID: <20230609111455.17989-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230609111455.17989-1-quinkblack@foxmail.com> References: <20230609111455.17989-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/videotoolboxenc: remove AUTO_PROFILE define 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: Zhao Zhili 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: From: Zhao Zhili Use FF_PROFILE_UNKNOWN as auto mode. --- libavcodec/videotoolboxenc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index 26485a3dea..9f65519700 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -206,7 +206,6 @@ static void loadVTEncSymbols(void){ GET_SYM(kVTCompressionPropertyKey_MinAllowedFrameQP, "MinAllowedFrameQP"); } -#define AUTO_PROFILE 0 #define H264_PROFILE_CONSTRAINED_HIGH (FF_PROFILE_H264_HIGH | FF_PROFILE_H264_CONSTRAINED) typedef enum VTH264Entropy{ @@ -737,7 +736,7 @@ static bool get_vt_h264_profile_level(AVCodecContext *avctx, VTEncContext *vtctx = avctx->priv_data; int profile = vtctx->profile; - if (profile == AUTO_PROFILE && vtctx->level) { + if (profile == FF_PROFILE_UNKNOWN && vtctx->level) { //Need to pick a profile if level is not auto-selected. profile = vtctx->has_b_frames ? FF_PROFILE_H264_MAIN : FF_PROFILE_H264_BASELINE; } @@ -745,7 +744,7 @@ static bool get_vt_h264_profile_level(AVCodecContext *avctx, *profile_level_val = NULL; switch (profile) { - case AUTO_PROFILE: + case FF_PROFILE_UNKNOWN: return true; case FF_PROFILE_H264_BASELINE: @@ -869,7 +868,7 @@ static bool get_vt_hevc_profile_level(AVCodecContext *avctx, *profile_level_val = NULL; switch (profile) { - case AUTO_PROFILE: + case FF_PROFILE_UNKNOWN: return true; case FF_PROFILE_HEVC_MAIN: *profile_level_val = @@ -2891,7 +2890,7 @@ 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_INT, { .i64 = AUTO_PROFILE }, 0, INT_MAX, VE, "profile" }, + { "profile", "Profile", OFFSET(profile), AV_OPT_TYPE_INT, { .i64 = FF_PROFILE_UNKNOWN }, FF_PROFILE_UNKNOWN, INT_MAX, VE, "profile" }, { "baseline", "Baseline Profile", 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_H264_BASELINE }, INT_MIN, INT_MAX, VE, "profile" }, { "constrained_baseline", "Constrained Baseline Profile", 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_H264_CONSTRAINED_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" }, @@ -2948,7 +2947,7 @@ const FFCodec ff_h264_videotoolbox_encoder = { }; static const AVOption hevc_options[] = { - { "profile", "Profile", OFFSET(profile), AV_OPT_TYPE_INT, { .i64 = AUTO_PROFILE }, 0, INT_MAX, VE, "profile" }, + { "profile", "Profile", OFFSET(profile), AV_OPT_TYPE_INT, { .i64 = FF_PROFILE_UNKNOWN }, FF_PROFILE_UNKNOWN, INT_MAX, 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" }, -- 2.40.1 _______________________________________________ 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".