generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cast variance reference output

Browse Source 
The larger internal variables are required for the intermediates
but RoundHighBitDepth brings them down to uint32_t/unsigned int.

Fixes type warnings in visual studio.

Change-Id: I48d35284d6cbde330ccdc1f46b6215a645d5eb00
This commit is contained in:
Johann 2015-06-01 10:53:46 -07:00
parent 71e88f903d
commit fdc549994a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/variance_test.cc
View File

@ -96,8 +96,8 @@ static unsigned int variance_ref(const uint8_t *src, const uint8_t *ref,
} }
} }
RoundHighBitDepth(bit_depth, &se, &sse); RoundHighBitDepth(bit_depth, &se, &sse);
*sse_ptr = sse; *sse_ptr = (uint32_t) sse;
return sse - (((int64_t) se * se) >> (l2w + l2h)); return (unsigned int) (sse - (((int64_t) se * se) >> (l2w + l2h)));
} }
static unsigned int subpel_variance_ref(const uint8_t *ref, const uint8_t *src, static unsigned int subpel_variance_ref(const uint8_t *ref, const uint8_t *src,
@ -142,8 +142,8 @@ static unsigned int subpel_variance_ref(const uint8_t *ref, const uint8_t *src,
} }
} }
RoundHighBitDepth(bit_depth, &se, &sse); RoundHighBitDepth(bit_depth, &se, &sse);
*sse_ptr = sse; *sse_ptr = (unsigned int) sse;
return sse - (((int64_t) se * se) >> (l2w + l2h)); return (unsigned int) (sse - (((int64_t) se * se) >> (l2w + l2h)));
} }
typedef unsigned int (*SumOfSquaresFunction)(const int16_t *src); typedef unsigned int (*SumOfSquaresFunction)(const int16_t *src);
@ -510,8 +510,8 @@ unsigned int subpel_avg_variance_ref(const uint8_t *ref,
} }
} }
RoundHighBitDepth(bit_depth, &se, &sse); RoundHighBitDepth(bit_depth, &se, &sse);
*sse_ptr = sse; *sse_ptr = (unsigned int) sse;
return sse - (((int64_t) se * se) >> (l2w + l2h)); return (unsigned int) (sse - (((int64_t) se * se) >> (l2w + l2h)));
} }
template<typename SubpelVarianceFunctionType> template<typename SubpelVarianceFunctionType>