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 CF70644B6A for ; Wed, 7 Dec 2022 09:32:26 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CDBC568BD94; Wed, 7 Dec 2022 11:32:13 +0200 (EET) 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 569FD68B3E9 for ; Wed, 7 Dec 2022 11:32:03 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1670405520; bh=1UFBbt0qhAxWzaY0EhFfiRuQOJ/BUaRiz0o3VTP7/Yc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=H9Yx6W9HQJ05AbXvGuVtJMVl0oTn7/Nsqy9eS9DSNjlzjl6sni5uWvKUunXKeXZD1 f49tJ3o+/GE4B6hIS5fgNAXSKnhD65ZmcU0lagLvk99qvw/OnbgLm64oddwup/YqQl Su1c16ODetPIdx9JxwPU959RlxUzD2yyDtKBk3aA= Received: from localhost.localdomain ([59.37.125.102]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 7F9B046E; Wed, 07 Dec 2022 17:31:57 +0800 X-QQ-mid: xmsmtpt1670405519tpg6akzz3 Message-ID: X-QQ-XMAILINFO: Nfm/+M6ONQ57SUuEoeCPExiIQWoYfhE1YFXE/qozO5rKimDmsRHgyq2Odb4YAv 3pOikLFGNC3FvOK6uQKPUoKgPg2QgdC2wZ/J7bbd5nzHJYKfjsFf7hUM3SEu0HjNizVsKFqDWZ68 iq94ExF/l5xr81SYqeyS9tf/37BM0gkRYIWjBqvchGFx3VIZizB0MVIiBZsSFrd2kI1kAhoB44Uz QG/TUKHq89J8ls19c6Xbm82yBxKBh3tLoSdxbO27jQqpgIKAPln7/3qVI+BNU/T12R6Df9SDt5Mx sKtEqTMWI2eX2/SP0FUhXzHpxWdhw7UyrBwXYR2wlxnpYcPB5EmRi85pLJ7PWxM+g1fzU863Vwrz pCt9U/yxDoZqGD37M8snH6b2rS13FiXXXV4kwHG2u6wVPSvAQ5OjS4SOrAoIewpO8Z3KHtRzD583 AJN3zcd1fHQcEcB1UWxUIL9LIrE1RvFQX/ElFx9fYAZHilY5OHh4oCX9scApVMQr9E4xaHYE4jVE 6ggVoihTRxdsrCONXaogly6GCGCj+volHb+LfKtwTSEz4f7jdbNzeCUUk50cReZ2kXGox9Lv1lsP /iTxiXPfjwugrur5sCIJFo5kRQSFx3DsIXtXHvPxaq8uT6TYg9jWQZa8W0e6/nEzuc0hwzQMomcj Q4CWacr5bPxl78RnXgkpE7FgyIxONgzUNTXrvy8QkHk9vnVEGj9pNueDHOUwstaV9tntDBebEOB9 uX5uQKu90iKDIRapQZEeo/YnKxL2RYL/HAwkL5Z4oEGPUWrLsE5IhdQf2XuF3zofs4yL1vcHF4Zt 9VuR2T1m0RZZixJ2UpU54MZDDeR7CmQ8TxxbmMbwj6ymXbunx2Z1xxbze26h7/BVS9sLa//GJE62 sVtPeE1oyf0QejGZVZjoTmGRsWCmJcuj4EoepVYg54Xu0kDMToitvIr7xRHP9498SEHXYhVlNk98 l1p3pilUjH3jBDtp2nzJCNvpD/LlrLWNLZSA+2PTFBJ6SmMu8PNQ== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Dec 2022 17:31:17 +0800 X-OQ-MSGID: <20221207093122.553668-3-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221207093122.553668-1-quinkblack@foxmail.com> References: <20221207093122.553668-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/7] avcodec/mediacodecenc: add bitrate_mode option 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 --- libavcodec/mediacodecenc.c | 25 +++++++++++++++++++++++++ libavcodec/version.h | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/libavcodec/mediacodecenc.c b/libavcodec/mediacodecenc.c index 4f9185342f..ec0e0b3a86 100644 --- a/libavcodec/mediacodecenc.c +++ b/libavcodec/mediacodecenc.c @@ -39,6 +39,17 @@ #define INPUT_DEQUEUE_TIMEOUT_US 8000 #define OUTPUT_DEQUEUE_TIMEOUT_US 8000 +enum BitrateMode { + /* Constant quality mode */ + BITRATE_MODE_CQ = 0, + /* Variable bitrate mode */ + BITRATE_MODE_VBR = 1, + /* Constant bitrate mode */ + BITRATE_MODE_CBR = 2, + /* Constant bitrate mode with frame drops */ + BITRATE_MODE_CBR_FD = 3, +}; + typedef struct MediaCodecEncContext { AVClass *avclass; FFAMediaCodec *codec; @@ -67,6 +78,8 @@ typedef struct MediaCodecEncContext { int eof_sent; AVFrame *frame; + + int bitrate_mode; } MediaCodecEncContext; enum { @@ -193,6 +206,8 @@ static av_cold int mediacodec_init(AVCodecContext *avctx) if (avctx->bit_rate) ff_AMediaFormat_setInt32(format, "bitrate", avctx->bit_rate); + if (s->bitrate_mode >= 0) + ff_AMediaFormat_setInt32(format, "bitrate-mode", s->bitrate_mode); // frame-rate and i-frame-interval are required to configure codec if (avctx->framerate.num >= avctx->framerate.den && avctx->framerate.den > 0) { s->fps = avctx->framerate.num / avctx->framerate.den; @@ -485,6 +500,16 @@ static const AVCodecHWConfigInternal *const mediacodec_hw_configs[] = { OFFSET(use_ndk_codec), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE }, \ { "codec_name", "Select codec by name", \ OFFSET(name), AV_OPT_TYPE_STRING, {0}, 0, 0, VE }, \ + { "bitrate_mode", "Bitrate control method", \ + OFFSET(bitrate_mode), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, VE, "bitrate_mode" }, \ + { "cq", "Constant quality mode", \ + 0, AV_OPT_TYPE_CONST, {.i64 = BITRATE_MODE_CQ}, 0, 0, VE, "bitrate_mode" }, \ + { "vbr", "Variable bitrate mode", \ + 0, AV_OPT_TYPE_CONST, {.i64 = BITRATE_MODE_VBR}, 0, 0, VE, "bitrate_mode" }, \ + { "cbr", "Constant bitrate mode", \ + 0, AV_OPT_TYPE_CONST, {.i64 = BITRATE_MODE_CBR}, 0, 0, VE, "bitrate_mode" }, \ + { "cbr_fd", "Constant bitrate mode with frame drops", \ + 0, AV_OPT_TYPE_CONST, {.i64 = BITRATE_MODE_CBR_FD}, 0, 0, VE, "bitrate_mode" }, \ #define MEDIACODEC_ENCODER_CLASS(name) \ diff --git a/libavcodec/version.h b/libavcodec/version.h index 9e66920593..527b4dbd0b 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 54 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ -- 2.25.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".