Commit 1e487c36 authored by Yaowu Xu's avatar Yaowu Xu

Fix MSVC warnings in tests

BUG=aomedia:80

Change-Id: I52df0b9a2284b35bef57a129870d645166ee871d
parent caaf9f92
......@@ -63,7 +63,7 @@ bool check_uabs(const PvVec &pv_vec, uint8_t *buf) {
if (ans_read_init(&d, buf, offset)) return false;
start = std::clock();
for (PvVec::const_iterator it = pv_vec.begin(); it != pv_vec.end(); ++it) {
okay &= uabs_read(&d, 256 - it->first) == it->second;
okay = okay && (uabs_read(&d, 256 - it->first) != 0) == it->second;
}
std::clock_t dec_time = std::clock() - start;
if (!okay) return false;
......@@ -71,7 +71,7 @@ bool check_uabs(const PvVec &pv_vec, uint8_t *buf) {
printf("uABS size %d enc_time %f dec_time %f\n", offset,
static_cast<float>(enc_time) / CLOCKS_PER_SEC,
static_cast<float>(dec_time) / CLOCKS_PER_SEC);
return ans_read_end(&d);
return ans_read_end(&d) != 0;
}
const aom_cdf_prob spareto65[] = { 8320, 6018, 4402, 3254, 4259,
......@@ -138,7 +138,7 @@ bool check_rans(const std::vector<int> &sym_vec, const rans_sym *const tab,
printf("rANS size %d enc_time %f dec_time %f\n", offset,
static_cast<float>(enc_time) / CLOCKS_PER_SEC,
static_cast<float>(dec_time) / CLOCKS_PER_SEC);
return ans_read_end(&d);
return ans_read_end(&d) != 0;
}
class AbsTest : public ::testing::Test {
......
......@@ -175,12 +175,12 @@ void test_clpf_speed(int w, int h, int depth, int iterations,
aom_usec_timer_start(&ref_timer);
test_clpf(w, h, depth, iterations, ref_clpf, ref_clpf);
aom_usec_timer_mark(&ref_timer);
int ref_elapsed_time = aom_usec_timer_elapsed(&ref_timer);
int ref_elapsed_time = (int)aom_usec_timer_elapsed(&ref_timer);
aom_usec_timer_start(&timer);
test_clpf(w, h, depth, iterations, clpf, clpf);
aom_usec_timer_mark(&timer);
int elapsed_time = aom_usec_timer_elapsed(&timer);
int elapsed_time = (int)aom_usec_timer_elapsed(&timer);
#if 0
std::cout << "[ ] C time = " << ref_elapsed_time / 1000
......
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