shithub: libvpx

Download patch

ref: 149d082377569c0330f8ed87327a837d25525f6a
parent: 8b4c31584eb22e944975207e37a7f0d5f1eaecb4
author: James Zern <[email protected]>
date: Thu Aug 18 21:28:01 EDT 2016 

vp9_pickmode: quiet float conversion warnings

Change-Id: I591e4f958955b3f2edb2f95a83c54cd83c8ef075


--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -1608,7 +1608,7 @@
         if (frame_mv[NEWMV][ref_frame].as_int != INVALID_MV) {
           const int pre_stride = xd->plane[0].pre[0].stride;
           int base_mv_sad = INT_MAX;
-          const float base_mv_bias = sf->base_mv_aggressive ? 1.5 : 1.0;
+          const float base_mv_bias = sf->base_mv_aggressive ? 1.5f : 1.0f;
           const uint8_t *const pre_buf =
               xd->plane[0].pre[0].buf +
               (frame_mv[NEWMV][ref_frame].as_mv.row >> 3) * pre_stride +
@@ -1616,7 +1616,7 @@
           base_mv_sad = cpi->fn_ptr[bsize].sdf(
               x->plane[0].src.buf, x->plane[0].src.stride, pre_buf, pre_stride);
 
-          if (base_mv_sad < base_mv_bias * x->pred_mv_sad[ref_frame]) {
+          if (base_mv_sad < (int)(base_mv_bias * x->pred_mv_sad[ref_frame])) {
             // Base layer mv is good.
             if (!combined_motion_search(cpi, x, bsize, mi_row, mi_col,
                                         &frame_mv[NEWMV][ref_frame], &rate_mv,