| Index: source/libvpx/vp8/encoder/firstpass.c
|
| ===================================================================
|
| --- source/libvpx/vp8/encoder/firstpass.c (revision 251189)
|
| +++ source/libvpx/vp8/encoder/firstpass.c (working copy)
|
| @@ -940,9 +940,9 @@
|
| /* Crude estimate of overhead cost from modes
|
| * << 9 is the normalization to (bits * 512) used in vp8_bits_per_mb
|
| */
|
| - mode_cost =((((av_pct_inter - av_pct_motion) * zz_cost) +
|
| - (av_pct_motion * motion_cost) +
|
| - (av_intra * intra_cost)) * cpi->common.MBs) * 512;
|
| + mode_cost = (int64_t)((((av_pct_inter - av_pct_motion) * zz_cost) +
|
| + (av_pct_motion * motion_cost) +
|
| + (av_intra * intra_cost)) * cpi->common.MBs) * 512;
|
|
|
| return mv_cost + mode_cost;
|
| }
|
| @@ -2310,7 +2310,7 @@
|
| pct_extra = (pct_extra > 20) ? 20 : pct_extra;
|
|
|
| cpi->twopass.alt_extra_bits =
|
| - (cpi->twopass.gf_group_bits * pct_extra) / 100;
|
| + (int)(cpi->twopass.gf_group_bits * pct_extra) / 100;
|
| cpi->twopass.gf_group_bits -= cpi->twopass.alt_extra_bits;
|
| cpi->twopass.alt_extra_bits /=
|
| ((cpi->baseline_gf_interval-1)>>1);
|
| @@ -2386,7 +2386,7 @@
|
| target_frame_size = max_bits;
|
|
|
| if (target_frame_size > cpi->twopass.gf_group_bits)
|
| - target_frame_size = cpi->twopass.gf_group_bits;
|
| + target_frame_size = (int)cpi->twopass.gf_group_bits;
|
| }
|
|
|
| /* Adjust error and bits remaining */
|
|
|