diff options
| author | Jerome Jiang <jianj@google.com> | 2021-07-22 17:07:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-07-22 17:07:58 +0000 |
| commit | c382caa4d15caa31d783fa74a0a4f457ca213d36 (patch) | |
| tree | a58d12f6ed980711259000a92a9a96d89dfed968 | |
| parent | cd260eba10b9155f6e6086c999bd4c9d3ca6c706 (diff) | |
| parent | 6b4b82fd7a47720d608f6349bdb2cb2b81adb6a1 (diff) | |
| download | libvpx-c382caa4d15caa31d783fa74a0a4f457ca213d36.tar libvpx-c382caa4d15caa31d783fa74a0a4f457ca213d36.tar.gz libvpx-c382caa4d15caa31d783fa74a0a4f457ca213d36.tar.bz2 libvpx-c382caa4d15caa31d783fa74a0a4f457ca213d36.zip | |
Merge "Use round to be more accurate casting float to int" into main
| -rw-r--r-- | vp8/encoder/onyx_if.c | 6 | ||||
| -rw-r--r-- | vp9/encoder/vp9_svc_layercontext.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index aeed719d1..71ef057a4 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -301,9 +301,9 @@ static void init_temporal_layer_context(VP8_COMP *cpi, VP8_CONFIG *oxcf, /* Work out the average size of a frame within this layer */ if (layer > 0) { lc->avg_frame_size_for_layer = - (int)((cpi->oxcf.target_bitrate[layer] - - cpi->oxcf.target_bitrate[layer - 1]) * - 1000 / (lc->framerate - prev_layer_framerate)); + (int)round((cpi->oxcf.target_bitrate[layer] - + cpi->oxcf.target_bitrate[layer - 1]) * + 1000 / (lc->framerate - prev_layer_framerate)); } lc->active_worst_quality = cpi->oxcf.worst_allowed_q; diff --git a/vp9/encoder/vp9_svc_layercontext.c b/vp9/encoder/vp9_svc_layercontext.c index f9a0de62a..ad3a8f7af 100644 --- a/vp9/encoder/vp9_svc_layercontext.c +++ b/vp9/encoder/vp9_svc_layercontext.c @@ -322,8 +322,8 @@ void vp9_update_temporal_layer_framerate(VP9_COMP *const cpi) { const int prev_layer_target_bandwidth = oxcf->layer_target_bitrate[st_idx - 1]; lc->avg_frame_size = - (int)((lc->target_bandwidth - prev_layer_target_bandwidth) / - (lc->framerate - prev_layer_framerate)); + (int)round((lc->target_bandwidth - prev_layer_target_bandwidth) / + (lc->framerate - prev_layer_framerate)); } } |