diff options
| author | Jun Zhao <barryjzhao@tencent.com> | 2019-04-27 18:45:23 +0800 |
|---|---|---|
| committer | Jun Zhao <barryjzhao@tencent.com> | 2019-05-11 00:10:44 +0800 |
| commit | 1e6338c2da7779f68c28cdb4d46ef0729d464bc0 (patch) | |
| tree | ae0ead6fd48b9df67623ff473e5f08f1cf0a3d8a /libavcodec/libx264.c | |
| parent | ab648f79c8160a8e69fb02f308ca3428762ebfe0 (diff) | |
| download | ffmpeg-1e6338c2da7779f68c28cdb4d46ef0729d464bc0.tar.gz | |
lavc/libx264: Use avctx->framerate first for frame rate setting
perfer avctx->framerate first than use avctx->time_base when setting
the frame rate to encoder. 1/time_base is not the average frame rate
if the frame rate is not constant. In this case, we need to setting
avctx->framerate and avctx->time_base both, but avctx->framerate not
equal to 1/(avctx->time_base).
Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
Diffstat (limited to 'libavcodec/libx264.c')
| -rw-r--r-- | libavcodec/libx264.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index a3493f393d..45d07a92fc 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -821,8 +821,13 @@ FF_ENABLE_DEPRECATION_WARNINGS x4->params.vui.i_sar_height = sh; x4->params.i_timebase_den = avctx->time_base.den; x4->params.i_timebase_num = avctx->time_base.num; - x4->params.i_fps_num = avctx->time_base.den; - x4->params.i_fps_den = avctx->time_base.num * avctx->ticks_per_frame; + if (avctx->framerate.num > 0 && avctx->framerate.den > 0) { + x4->params.i_fps_num = avctx->framerate.num; + x4->params.i_fps_den = avctx->framerate.den; + } else { + x4->params.i_fps_num = avctx->time_base.den; + x4->params.i_fps_den = avctx->time_base.num * avctx->ticks_per_frame; + } x4->params.analyse.b_psnr = avctx->flags & AV_CODEC_FLAG_PSNR; |