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 3BB6140166 for ; Sun, 4 Dec 2022 17:13:48 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DA89068BBAD; Sun, 4 Dec 2022 19:13:09 +0200 (EET) Received: from out203-205-221-239.mail.qq.com (out203-205-221-239.mail.qq.com [203.205.221.239]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 56AC968B96D for ; Sun, 4 Dec 2022 19:12:59 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1670173974; bh=pZLLyovrZKTSzC5/NhBLG5/6RV3uw9aXF/7tysZViE4=; h=From:To:Cc:Subject:Date; b=dgRxYnPUh7J9XP8KNpzs0xo3n8HmEw6jo9IWXyipvJgmrHG3AmJns56mCcusggdK7 Rc3zRGD2eEospI23i5SMDLXeAu7OKMZ5Glg2nWZVV1QiDoMn8q2A+s+WUSxLvCdCM/ SJyvW546Fjs33My5bt1CMFQVOD88ATd5WbGBczaY= Received: from localhost.localdomain ([14.153.79.182]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 334B3853; Mon, 05 Dec 2022 01:12:52 +0800 X-QQ-mid: xmsmtpt1670173972tbfvau6wr Message-ID: X-QQ-XMAILINFO: NJ/+omVLhVgaNoo3uyuXlWoHq+ZfocH3ujyMHKYov3Wc1PSJyF2opwCvG0zYdF 4eU3QNXxDLwI2Lj46NnHi2ywb+sKIB7WiTACNJFIabOnqHxMPpo3H9ok1VQcMumU0WkHspaHSolj y5u6Im32Y69mrBz6Qj0t2USmX1WdbAk0sWuAH20KEY9MK8pV8w6nXSZTkhrHXcpZQRlMtg5j6AEx 0umEJmb70VkmNrJonC09V6DmM4D7AKdLwMn3qOSc9+G5ijCJmUPbAt9kLvecl7gkgo8ry1Q081Dw acnThwHRtbPfqvM2iJiexjB6EHk7aicPISxOv4V/W8dWSWTA6ggjFInS/MhgqKwXKxUjeE6C0OF5 Xd8+1mO4guRPG4xxC5nyfkt1KecOMzwmCkHIjcUjrQdeoAj63FsduHegbdms1/3FGma2fyfPuFCn 2TT/DraMjCLULTJUlyQR+xiJm4xknKmr4A3YQD1OTulgMvLJk71GSq6GGZHOfjuEr1nhMjqhPrQP 8JHj9pXecmPsrm0qEW5Y3oxk0t4tSz4i/DeMuEp7Jkf8urqtPMASg3XSV42Y3tFl/LLQEEVa3Fms tKUyf7ltCaEOpimrrgf0Y0XrHTJGZAVEnMrQmPfeavgG8NV71d92bWP50xjUAJmyUWPIHiw+eBrx ge4hR4/+u6zzGR24not3fs8vmBiFomDelJN297Y3xVXRXO+Qee1P8g/mIx0zevX3HWi22J6Vcflg TO139QlAvO7xnAAlsZN2Z3K9vCuu4wPZYuxx8tAjw7EIi/ThP3MNxwavW/KuFiLvp0aCaJqyirYM 2SEmP7PTjcavspP9h4W393I0HA2wwtwlgdHSSeWXEdahquEfjc9SIpjlWYm3TllT0Hhcg7OAeejO kpeushURSDfs5BB4REUV3u4PGJhIncYogLlScFUwRfuQLWRKOu6mPxECEGObt1tOfsCtr25gxc7e tlmUKVPBZ5R2LUlMMOkw== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Dec 2022 01:12:22 +0800 X-OQ-MSGID: <20221204171228.50160-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/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 69246ad693..c8d8f84e46 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 AVOption common_options[] = { 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" }, { NULL }, }; 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".