Commit 5a72620d authored by Guillermo Ballester Valor's avatar Guillermo Ballester Valor Committed by John Koleszar

Fix compiler warnings

Change-Id: I2a97f08cc3c7808ce5be39e910cc5147ecf03a1d
parent 48c84d13
......@@ -1232,6 +1232,8 @@ static void define_gf_group(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame)
start_pos = cpi->stats_in;
vpx_memset(&next_frame, 0, sizeof(next_frame)); // assure clean
// Preload the stats for the next frame.
mod_frame_err = calculate_modified_err(cpi, this_frame);
......@@ -2038,6 +2040,8 @@ void vp8_find_next_key_frame(VP8_COMP *cpi, FIRSTPASS_STATS *this_frame)
double kf_group_coded_err = 0.0;
double two_pass_min_rate = (double)(cpi->oxcf.target_bandwidth * cpi->oxcf.two_pass_vbrmin_section / 100);
vpx_memset(&next_frame, 0, sizeof(next_frame)); // assure clean
vp8_clear_system_state(); //__asm emms;
start_position = cpi->stats_in;
......
......@@ -811,7 +811,7 @@ void vp8_set_speed_features(VP8_COMP *cpi)
sf->full_freq[1] = 31;
sf->search_method = NSTEP;
if (!cpi->ref_frame_flags & VP8_LAST_FLAG)
if (!(cpi->ref_frame_flags & VP8_LAST_FLAG))
{
sf->thresh_mult[THR_NEWMV ] = INT_MAX;
sf->thresh_mult[THR_NEARESTMV] = INT_MAX;
......@@ -820,7 +820,7 @@ void vp8_set_speed_features(VP8_COMP *cpi)
sf->thresh_mult[THR_SPLITMV ] = INT_MAX;
}
if (!cpi->ref_frame_flags & VP8_GOLD_FLAG)
if (!(cpi->ref_frame_flags & VP8_GOLD_FLAG))
{
sf->thresh_mult[THR_NEARESTG ] = INT_MAX;
sf->thresh_mult[THR_ZEROG ] = INT_MAX;
......@@ -829,7 +829,7 @@ void vp8_set_speed_features(VP8_COMP *cpi)
sf->thresh_mult[THR_SPLITG ] = INT_MAX;
}
if (!cpi->ref_frame_flags & VP8_ALT_FLAG)
if (!(cpi->ref_frame_flags & VP8_ALT_FLAG))
{
sf->thresh_mult[THR_NEARESTA ] = INT_MAX;
sf->thresh_mult[THR_ZEROA ] = INT_MAX;
......
......@@ -454,6 +454,7 @@ int vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int rec
vpx_memset(mode_mv, 0, sizeof(mode_mv));
vpx_memset(nearest_mv, 0, sizeof(nearest_mv));
vpx_memset(near_mv, 0, sizeof(near_mv));
vpx_memset(&best_mbmode, 0, sizeof(best_mbmode));
// set up all the refframe dependent pointers.
......
......@@ -1125,6 +1125,9 @@ static int vp8_rd_pick_best_mbsegmentation(VP8_COMP *cpi, MACROBLOCK *x, MV *bes
MV bmvs[16];
int beobs[16];
vpx_memset(beobs, 0, sizeof(beobs));
for (segmentation = 0; segmentation < VP8_NUMMBSPLITS; segmentation++)
{
int label_count;
......@@ -1459,6 +1462,8 @@ int vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
*returnintra = INT_MAX;
vpx_memset(&best_mbmode, 0, sizeof(best_mbmode)); // clean
cpi->mbs_tested_so_far++; // Count of the number of MBs tested so far this frame
x->skip = 0;
......
......@@ -109,7 +109,7 @@ update_error_state(vpx_codec_alg_priv_t *ctx,
} while(0)
#define RANGE_CHECK(p,memb,lo,hi) do {\
if(!((p)->memb >= (lo) && (p)->memb <= hi)) \
if(!(((p)->memb == lo || (p)->memb > (lo)) && (p)->memb <= hi)) \
ERROR(#memb " out of range ["#lo".."#hi"]");\
} while(0)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment