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

lavc/libkvazaar: Use avctx->frame_rate first for framerate setting 

perfer avctx->frame_rate first than use avctx->time_base when setting
the frame rate to encoder.

Signed-off-by: Jun Zhao <mypopydev@gmail.com>
This commit is contained in:
Jun Zhao 2018-12-15 17:12:46 +08:00
parent 90c4534206
commit 59deae5d1c
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/libkvazaar.c
View File

@ -79,6 +79,15 @@ static av_cold int libkvazaar_init(AVCodecContext *avctx)
cfg->width = avctx->width; cfg->width = avctx->width;
cfg->height = avctx->height; cfg->height = avctx->height;
if (avctx->framerate.num > 0 && avctx->framerate.den > 0) {
if (avctx->ticks_per_frame > INT_MAX / avctx->framerate.den) {
av_log(avctx, AV_LOG_ERROR,
"Could not set framerate for kvazaar: integer overflow\n");
return AVERROR(EINVAL);
}
cfg->framerate_num = avctx->framerate.num;
cfg->framerate_denom = avctx->time_base.den * avctx->ticks_per_frame;
} else {
if (avctx->ticks_per_frame > INT_MAX / avctx->time_base.num) { if (avctx->ticks_per_frame > INT_MAX / avctx->time_base.num) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Could not set framerate for kvazaar: integer overflow\n"); "Could not set framerate for kvazaar: integer overflow\n");
@ -86,6 +95,7 @@ static av_cold int libkvazaar_init(AVCodecContext *avctx)
} }
cfg->framerate_num = avctx->time_base.den; cfg->framerate_num = avctx->time_base.den;
cfg->framerate_denom = avctx->time_base.num * avctx->ticks_per_frame; cfg->framerate_denom = avctx->time_base.num * avctx->ticks_per_frame;
}
cfg->target_bitrate = avctx->bit_rate; cfg->target_bitrate = avctx->bit_rate;
cfg->vui.sar_width = avctx->sample_aspect_ratio.num; cfg->vui.sar_width = avctx->sample_aspect_ratio.num;
cfg->vui.sar_height = avctx->sample_aspect_ratio.den; cfg->vui.sar_height = avctx->sample_aspect_ratio.den;