Commit d8f83fcf authored by Yaowu Xu's avatar Yaowu Xu Committed by Gerrit Code Review

Merge "blockiness_test: fix implicit float conversion" into nextgenv2

parents 73eb764a 74e23033
...@@ -152,7 +152,7 @@ class BlockinessVP9Test ...@@ -152,7 +152,7 @@ class BlockinessVP9Test
BlockinessVP9Test() : BlockinessTestBase(GET_PARAM(0), GET_PARAM(1)) {} BlockinessVP9Test() : BlockinessTestBase(GET_PARAM(0), GET_PARAM(1)) {}
protected: protected:
int CheckBlockiness() { double GetBlockiness() const {
return vp9_get_blockiness(source_data_, source_stride_, return vp9_get_blockiness(source_data_, source_stride_,
reference_data_, reference_stride_, reference_data_, reference_stride_,
width_, height_); width_, height_);
...@@ -168,16 +168,17 @@ TEST_P(BlockinessVP9Test, SourceBlockierThanReference) { ...@@ -168,16 +168,17 @@ TEST_P(BlockinessVP9Test, SourceBlockierThanReference) {
// Source is blockier than reference. // Source is blockier than reference.
FillRandomBlocky(source_data_, source_stride_); FillRandomBlocky(source_data_, source_stride_);
FillConstant(reference_data_, reference_stride_, 128); FillConstant(reference_data_, reference_stride_, 128);
int super_blocky = CheckBlockiness(); const double super_blocky = GetBlockiness();
EXPECT_EQ(0, super_blocky) << "Blocky source should produce 0 blockiness."; EXPECT_DOUBLE_EQ(0.0, super_blocky)
<< "Blocky source should produce 0 blockiness.";
} }
TEST_P(BlockinessVP9Test, ReferenceBlockierThanSource) { TEST_P(BlockinessVP9Test, ReferenceBlockierThanSource) {
// Source is blockier than reference. // Source is blockier than reference.
FillConstant(source_data_, source_stride_, 128); FillConstant(source_data_, source_stride_, 128);
FillRandomBlocky(reference_data_, reference_stride_); FillRandomBlocky(reference_data_, reference_stride_);
int super_blocky = CheckBlockiness(); const double super_blocky = GetBlockiness();
EXPECT_GT(super_blocky, 0.0) EXPECT_GT(super_blocky, 0.0)
<< "Blocky reference should score high for blockiness."; << "Blocky reference should score high for blockiness.";
...@@ -187,10 +188,10 @@ TEST_P(BlockinessVP9Test, BlurringDecreasesBlockiness) { ...@@ -187,10 +188,10 @@ TEST_P(BlockinessVP9Test, BlurringDecreasesBlockiness) {
// Source is blockier than reference. // Source is blockier than reference.
FillConstant(source_data_, source_stride_, 128); FillConstant(source_data_, source_stride_, 128);
FillRandomBlocky(reference_data_, reference_stride_); FillRandomBlocky(reference_data_, reference_stride_);
int super_blocky = CheckBlockiness(); const double super_blocky = GetBlockiness();
Blur(reference_data_, reference_stride_, 4); Blur(reference_data_, reference_stride_, 4);
int less_blocky = CheckBlockiness(); const double less_blocky = GetBlockiness();
EXPECT_GT(super_blocky, less_blocky) EXPECT_GT(super_blocky, less_blocky)
<< "A straight blur should decrease blockiness."; << "A straight blur should decrease blockiness.";
...@@ -201,10 +202,10 @@ TEST_P(BlockinessVP9Test, WorstCaseBlockiness) { ...@@ -201,10 +202,10 @@ TEST_P(BlockinessVP9Test, WorstCaseBlockiness) {
FillConstant(source_data_, source_stride_, 128); FillConstant(source_data_, source_stride_, 128);
FillCheckerboard(reference_data_, reference_stride_); FillCheckerboard(reference_data_, reference_stride_);
int super_blocky = CheckBlockiness(); const double super_blocky = GetBlockiness();
Blur(reference_data_, reference_stride_, 4); Blur(reference_data_, reference_stride_, 4);
int less_blocky = CheckBlockiness(); const double less_blocky = GetBlockiness();
EXPECT_GT(super_blocky, less_blocky) EXPECT_GT(super_blocky, less_blocky)
<< "A straight blur should decrease blockiness."; << "A straight blur should decrease blockiness.";
......
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