Commit 9f78e85b authored by Yaowu Xu's avatar Yaowu Xu

Use proper inttypes for varaiance computations

This commit correct the integer types used in variance functions. It
now uses same integer type when number of pixels are same, e.g
16x64 and 64x16 use same integer types as 32x32
8x32 and 32x8 use same integer types as 16x16

Change-Id: I1a54ba8d73e09126e680ae5af3ee52395a41df41
parent 7f7e89f9
......@@ -472,10 +472,10 @@ DECLS(ssse3);
FN(4, 4, 4, 2, 2, opt, (int32_t), (int32_t)); \
FN(4, 16, 4, 2, 4, opt, (int32_t), (int32_t)); \
FN(16, 4, 16, 4, 2, opt, (int32_t), (int32_t)); \
FN(8, 32, 8, 3, 5, opt, (int32_t), (int32_t)); \
FN(32, 8, 16, 5, 3, opt, (int32_t), (int32_t)); \
FN(16, 64, 16, 4, 6, opt, (int32_t), (int32_t)); \
FN(64, 16, 16, 6, 4, opt, (int32_t), (int32_t))
FN(8, 32, 8, 3, 5, opt, (uint32_t), (int64_t)); \
FN(32, 8, 16, 5, 3, opt, (uint32_t), (int64_t)); \
FN(16, 64, 16, 4, 6, opt, (int64_t), (int64_t)); \
FN(64, 16, 16, 6, 4, opt, (int64_t), (int64_t))
#else
#define FNS(opt) \
FN(64, 64, 16, 6, 6, opt, (int64_t), (int64_t)); \
......@@ -566,10 +566,10 @@ DECLS(ssse3);
FN(4, 4, 4, 2, 2, opt, (uint32_t), (int32_t)); \
FN(4, 16, 4, 2, 4, opt, (int32_t), (int32_t)); \
FN(16, 4, 16, 4, 2, opt, (int32_t), (int32_t)); \
FN(8, 32, 8, 3, 5, opt, (int32_t), (int32_t)); \
FN(32, 8, 16, 5, 3, opt, (int32_t), (int32_t)); \
FN(16, 64, 16, 4, 6, opt, (int32_t), (int32_t)); \
FN(64, 16, 16, 6, 4, opt, (int32_t), (int32_t))
FN(8, 32, 8, 3, 5, opt, (uint32_t), (int64_t)); \
FN(32, 8, 16, 5, 3, opt, (uint32_t), (int64_t)); \
FN(16, 64, 16, 4, 6, opt, (int64_t), (int64_t)); \
FN(64, 16, 16, 6, 4, opt, (int64_t), (int64_t))
#else
#define FNS(opt) \
FN(64, 64, 16, 6, 6, opt, (int64_t), (int64_t)); \
......
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