On 2016-01-17 19:44, Luca Barbato wrote:
On 15/01/16 14:53, Arttu Ylä-Outinen wrote:
Updates libkvazaar to pass the exact frame rate to Kvazaar by setting
the numerator and denominator separately instead of a single floating
point number. The exact frame rate is needed for writing timing info to
the bitstream.
Requires Kvazaar version 0.8.1.
Signed-off-by: Arttu Ylä-Outinen <[email protected]>
---
configure | 2 +-
libavcodec/libkvazaar.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 8518e69..1067e00 100755
--- a/configure
+++ b/configure
@@ -4472,7 +4472,7 @@ enabled libgsm && { for gsm_hdr in "gsm.h"
"gsm/gsm.h"; do
check_lib "${gsm_hdr}" gsm_create -lgsm &&
break;
done || die "ERROR: libgsm not found"; }
enabled libilbc && require libilbc ilbc.h WebRtcIlbcfix_InitDecode
-lilbc
-enabled libkvazaar && require_pkg_config "kvazaar >= 0.7.1" kvazaar.h
kvz_api_get
+enabled libkvazaar && require_pkg_config "kvazaar >= 0.8.1" kvazaar.h
kvz_api_get
enabled libmfx && require_pkg_config libmfx "mfx/mfxvideo.h"
MFXInit
enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h
lame_set_VBR_quality -lmp3lame
enabled libopencore_amrnb && require libopencore_amrnb
opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
diff --git a/libavcodec/libkvazaar.c b/libavcodec/libkvazaar.c
index 89b024a..19122e0 100644
--- a/libavcodec/libkvazaar.c
+++ b/libavcodec/libkvazaar.c
@@ -80,8 +80,8 @@ static av_cold int libkvazaar_init(AVCodecContext *avctx)
cfg->width = avctx->width;
cfg->height = avctx->height;
- cfg->framerate =
- avctx->time_base.den / (double)(avctx->time_base.num *
avctx->ticks_per_frame);
+ cfg->framerate_num = avctx->time_base.den;
+ cfg->framerate_denom = avctx->time_base.num * avctx->ticks_per_frame;
cfg->target_bitrate = avctx->bit_rate;
cfg->vui.sar_width = avctx->sample_aspect_ratio.num;
cfg->vui.sar_height = avctx->sample_aspect_ratio.den;
Patch Ok to me. (will land this night or tomorrow assuming everybody
else is ok).
I sent this to FFmpeg as well and they noticed that the multiplication
might overflow. I'll send an updated patch soon.
- Arttu
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
