RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/mediacodecenc: Add operating_rate option 

For example, with
./ffmpeg -operating_rate 400 -hwaccel mediacodec -i test.mp4 -an \
  -c:v h264_mediacodec -operating_rate 400 -b:v 5M -f null -
The transcoding speed is 254 FPS.
Without -operating_rate on dec/enc, the speed is 148 FPS.
With -operating_rate on decoder only, the speed is 239 FPS.

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
This commit is contained in:
Zhao Zhili 2024-11-06 20:31:21 +08:00
parent 46ad1abd36
commit fa2ff5effc
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/mediacodecenc.c
View File

@ -76,6 +76,8 @@ typedef struct MediaCodecEncContext {
int level; int level;
int pts_as_dts; int pts_as_dts;
int extract_extradata; int extract_extradata;
// Ref. MediaFormat KEY_OPERATING_RATE
int operating_rate;
} MediaCodecEncContext; } MediaCodecEncContext;
enum { enum {
@ -354,6 +356,8 @@ static av_cold int mediacodec_init(AVCodecContext *avctx)
} }
if (s->pts_as_dts == -1) if (s->pts_as_dts == -1)
s->pts_as_dts = avctx->max_b_frames <= 0; s->pts_as_dts = avctx->max_b_frames <= 0;
if (s->operating_rate > 0)
ff_AMediaFormat_setInt32(format, "operating-rate", s->operating_rate);
ret = ff_AMediaCodec_getConfigureFlagEncode(s->codec); ret = ff_AMediaCodec_getConfigureFlagEncode(s->codec);
ret = ff_AMediaCodec_configure(s->codec, format, s->window, NULL, ret); ret = ff_AMediaCodec_configure(s->codec, format, s->window, NULL, ret);
@ -764,7 +768,8 @@ static const AVCodecHWConfigInternal *const mediacodec_hw_configs[] = {
{ "pts_as_dts", "Use PTS as DTS. It is enabled automatically if avctx max_b_frames <= 0, " \ { "pts_as_dts", "Use PTS as DTS. It is enabled automatically if avctx max_b_frames <= 0, " \
"since most of Android devices don't output B frames by default.", \ "since most of Android devices don't output B frames by default.", \
OFFSET(pts_as_dts), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE }, \ OFFSET(pts_as_dts), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE }, \
{ "operating_rate", "The desired operating rate that the codec will need to operate at, zero for unspecified", \
OFFSET(operating_rate), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, VE }, \
#define MEDIACODEC_ENCODER_CLASS(name) \ #define MEDIACODEC_ENCODER_CLASS(name) \
static const AVClass name ## _mediacodec_class = { \ static const AVClass name ## _mediacodec_class = { \

2
libavcodec/version.h
View File

@ -30,7 +30,7 @@
#include "version_major.h" #include "version_major.h"
#define LIBAVCODEC_VERSION_MINOR 25 #define LIBAVCODEC_VERSION_MINOR 25
#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_MICRO 101
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \