mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-10-09 16:57:30 +09:00
aom: update libaom to 0ec86ac7ae1e32a7e70410fa4972a655ec3670a4
This commit is contained in:
Roy Tam
parent
bc3f20e378
commit
eb361970c5
438 changed files with 52661 additions and 21905 deletions
262
third_party/aom/test/comp_avg_pred_test.h
vendored
262
third_party/aom/test/comp_avg_pred_test.h
vendored
|
|
@ -25,72 +25,73 @@
|
|||
namespace libaom_test {
|
||||
const int kMaxSize = 128 + 32; // padding
|
||||
|
||||
namespace AV1JNTCOMPAVG {
|
||||
namespace AV1DISTWTDCOMPAVG {
|
||||
|
||||
typedef void (*jntcompavg_func)(uint8_t *comp_pred, const uint8_t *pred,
|
||||
int width, int height, const uint8_t *ref,
|
||||
int ref_stride,
|
||||
const JNT_COMP_PARAMS *jcp_param);
|
||||
typedef void (*distwtdcompavg_func)(uint8_t *comp_pred, const uint8_t *pred,
|
||||
int width, int height, const uint8_t *ref,
|
||||
int ref_stride,
|
||||
const DIST_WTD_COMP_PARAMS *jcp_param);
|
||||
|
||||
typedef void (*jntcompavgupsampled_func)(
|
||||
typedef void (*distwtdcompavgupsampled_func)(
|
||||
MACROBLOCKD *xd, const struct AV1Common *const cm, int mi_row, int mi_col,
|
||||
const MV *const mv, uint8_t *comp_pred, const uint8_t *pred, int width,
|
||||
int height, int subpel_x_q3, int subpel_y_q3, const uint8_t *ref,
|
||||
int ref_stride, const JNT_COMP_PARAMS *jcp_param, int subpel_search);
|
||||
int ref_stride, const DIST_WTD_COMP_PARAMS *jcp_param, int subpel_search);
|
||||
|
||||
typedef void (*highbdjntcompavgupsampled_func)(
|
||||
typedef void (*highbddistwtdcompavgupsampled_func)(
|
||||
MACROBLOCKD *xd, const struct AV1Common *const cm, int mi_row, int mi_col,
|
||||
const MV *const mv, uint8_t *comp_pred8, const uint8_t *pred8, int width,
|
||||
int height, int subpel_x_q3, int subpel_y_q3, const uint8_t *ref8,
|
||||
int ref_stride, int bd, const JNT_COMP_PARAMS *jcp_param,
|
||||
int ref_stride, int bd, const DIST_WTD_COMP_PARAMS *jcp_param,
|
||||
int subpel_search);
|
||||
|
||||
typedef ::testing::tuple<jntcompavg_func, BLOCK_SIZE> JNTCOMPAVGParam;
|
||||
typedef ::testing::tuple<distwtdcompavg_func, BLOCK_SIZE> DISTWTDCOMPAVGParam;
|
||||
|
||||
typedef ::testing::tuple<jntcompavgupsampled_func, BLOCK_SIZE>
|
||||
JNTCOMPAVGUPSAMPLEDParam;
|
||||
typedef ::testing::tuple<distwtdcompavgupsampled_func, BLOCK_SIZE>
|
||||
DISTWTDCOMPAVGUPSAMPLEDParam;
|
||||
|
||||
typedef ::testing::tuple<int, jntcompavg_func, BLOCK_SIZE>
|
||||
HighbdJNTCOMPAVGParam;
|
||||
typedef ::testing::tuple<int, distwtdcompavg_func, BLOCK_SIZE>
|
||||
HighbdDISTWTDCOMPAVGParam;
|
||||
|
||||
typedef ::testing::tuple<int, highbdjntcompavgupsampled_func, BLOCK_SIZE>
|
||||
HighbdJNTCOMPAVGUPSAMPLEDParam;
|
||||
typedef ::testing::tuple<int, highbddistwtdcompavgupsampled_func, BLOCK_SIZE>
|
||||
HighbdDISTWTDCOMPAVGUPSAMPLEDParam;
|
||||
|
||||
::testing::internal::ParamGenerator<JNTCOMPAVGParam> BuildParams(
|
||||
jntcompavg_func filter) {
|
||||
::testing::internal::ParamGenerator<DISTWTDCOMPAVGParam> BuildParams(
|
||||
distwtdcompavg_func filter) {
|
||||
return ::testing::Combine(::testing::Values(filter),
|
||||
::testing::Range(BLOCK_4X4, BLOCK_SIZES_ALL));
|
||||
}
|
||||
|
||||
::testing::internal::ParamGenerator<JNTCOMPAVGUPSAMPLEDParam> BuildParams(
|
||||
jntcompavgupsampled_func filter) {
|
||||
::testing::internal::ParamGenerator<DISTWTDCOMPAVGUPSAMPLEDParam> BuildParams(
|
||||
distwtdcompavgupsampled_func filter) {
|
||||
return ::testing::Combine(::testing::Values(filter),
|
||||
::testing::Range(BLOCK_4X4, BLOCK_SIZES_ALL));
|
||||
}
|
||||
|
||||
::testing::internal::ParamGenerator<HighbdJNTCOMPAVGParam> BuildParams(
|
||||
jntcompavg_func filter, int is_hbd) {
|
||||
::testing::internal::ParamGenerator<HighbdDISTWTDCOMPAVGParam> BuildParams(
|
||||
distwtdcompavg_func filter, int is_hbd) {
|
||||
(void)is_hbd;
|
||||
return ::testing::Combine(::testing::Range(8, 13, 2),
|
||||
::testing::Values(filter),
|
||||
::testing::Range(BLOCK_4X4, BLOCK_SIZES_ALL));
|
||||
}
|
||||
|
||||
::testing::internal::ParamGenerator<HighbdJNTCOMPAVGUPSAMPLEDParam> BuildParams(
|
||||
highbdjntcompavgupsampled_func filter) {
|
||||
::testing::internal::ParamGenerator<HighbdDISTWTDCOMPAVGUPSAMPLEDParam>
|
||||
BuildParams(highbddistwtdcompavgupsampled_func filter) {
|
||||
return ::testing::Combine(::testing::Range(8, 13, 2),
|
||||
::testing::Values(filter),
|
||||
::testing::Range(BLOCK_4X4, BLOCK_SIZES_ALL));
|
||||
}
|
||||
|
||||
class AV1JNTCOMPAVGTest : public ::testing::TestWithParam<JNTCOMPAVGParam> {
|
||||
class AV1DISTWTDCOMPAVGTest
|
||||
: public ::testing::TestWithParam<DISTWTDCOMPAVGParam> {
|
||||
public:
|
||||
~AV1JNTCOMPAVGTest() {}
|
||||
~AV1DISTWTDCOMPAVGTest() {}
|
||||
void SetUp() { rnd_.Reset(ACMRandom::DeterministicSeed()); }
|
||||
void TearDown() { libaom_test::ClearSystemState(); }
|
||||
|
||||
protected:
|
||||
void RunCheckOutput(jntcompavg_func test_impl) {
|
||||
void RunCheckOutput(distwtdcompavg_func test_impl) {
|
||||
const int w = kMaxSize, h = kMaxSize;
|
||||
const int block_idx = GET_PARAM(1);
|
||||
|
||||
|
|
@ -107,27 +108,27 @@ class AV1JNTCOMPAVGTest : public ::testing::TestWithParam<JNTCOMPAVGParam> {
|
|||
const int in_w = block_size_wide[block_idx];
|
||||
const int in_h = block_size_high[block_idx];
|
||||
|
||||
JNT_COMP_PARAMS jnt_comp_params;
|
||||
jnt_comp_params.use_jnt_comp_avg = 1;
|
||||
DIST_WTD_COMP_PARAMS dist_wtd_comp_params;
|
||||
dist_wtd_comp_params.use_dist_wtd_comp_avg = 1;
|
||||
|
||||
for (int ii = 0; ii < 2; ii++) {
|
||||
for (int jj = 0; jj < 4; jj++) {
|
||||
jnt_comp_params.fwd_offset = quant_dist_lookup_table[ii][jj][0];
|
||||
jnt_comp_params.bck_offset = quant_dist_lookup_table[ii][jj][1];
|
||||
dist_wtd_comp_params.fwd_offset = quant_dist_lookup_table[ii][jj][0];
|
||||
dist_wtd_comp_params.bck_offset = quant_dist_lookup_table[ii][jj][1];
|
||||
|
||||
const int offset_r = 3 + rnd_.PseudoUniform(h - in_h - 7);
|
||||
const int offset_c = 3 + rnd_.PseudoUniform(w - in_w - 7);
|
||||
aom_jnt_comp_avg_pred_c(output, pred8 + offset_r * w + offset_c, in_w,
|
||||
in_h, ref8 + offset_r * w + offset_c, in_w,
|
||||
&jnt_comp_params);
|
||||
aom_dist_wtd_comp_avg_pred_c(output, pred8 + offset_r * w + offset_c,
|
||||
in_w, in_h, ref8 + offset_r * w + offset_c,
|
||||
in_w, &dist_wtd_comp_params);
|
||||
test_impl(output2, pred8 + offset_r * w + offset_c, in_w, in_h,
|
||||
ref8 + offset_r * w + offset_c, in_w, &jnt_comp_params);
|
||||
ref8 + offset_r * w + offset_c, in_w, &dist_wtd_comp_params);
|
||||
|
||||
for (int i = 0; i < in_h; ++i) {
|
||||
for (int j = 0; j < in_w; ++j) {
|
||||
int idx = i * in_w + j;
|
||||
ASSERT_EQ(output[idx], output2[idx])
|
||||
<< "Mismatch at unit tests for AV1JNTCOMPAVGTest\n"
|
||||
<< "Mismatch at unit tests for AV1DISTWTDCOMPAVGTest\n"
|
||||
<< in_w << "x" << in_h << " Pixel mismatch at index " << idx
|
||||
<< " = (" << i << ", " << j << ")";
|
||||
}
|
||||
|
|
@ -135,7 +136,7 @@ class AV1JNTCOMPAVGTest : public ::testing::TestWithParam<JNTCOMPAVGParam> {
|
|||
}
|
||||
}
|
||||
}
|
||||
void RunSpeedTest(jntcompavg_func test_impl) {
|
||||
void RunSpeedTest(distwtdcompavg_func test_impl) {
|
||||
const int w = kMaxSize, h = kMaxSize;
|
||||
const int block_idx = GET_PARAM(1);
|
||||
|
||||
|
|
@ -152,49 +153,49 @@ class AV1JNTCOMPAVGTest : public ::testing::TestWithParam<JNTCOMPAVGParam> {
|
|||
const int in_w = block_size_wide[block_idx];
|
||||
const int in_h = block_size_high[block_idx];
|
||||
|
||||
JNT_COMP_PARAMS jnt_comp_params;
|
||||
jnt_comp_params.use_jnt_comp_avg = 1;
|
||||
DIST_WTD_COMP_PARAMS dist_wtd_comp_params;
|
||||
dist_wtd_comp_params.use_dist_wtd_comp_avg = 1;
|
||||
|
||||
jnt_comp_params.fwd_offset = quant_dist_lookup_table[0][0][0];
|
||||
jnt_comp_params.bck_offset = quant_dist_lookup_table[0][0][1];
|
||||
dist_wtd_comp_params.fwd_offset = quant_dist_lookup_table[0][0][0];
|
||||
dist_wtd_comp_params.bck_offset = quant_dist_lookup_table[0][0][1];
|
||||
|
||||
const int num_loops = 1000000000 / (in_w + in_h);
|
||||
aom_usec_timer timer;
|
||||
aom_usec_timer_start(&timer);
|
||||
|
||||
for (int i = 0; i < num_loops; ++i)
|
||||
aom_jnt_comp_avg_pred_c(output, pred8, in_w, in_h, ref8, in_w,
|
||||
&jnt_comp_params);
|
||||
aom_dist_wtd_comp_avg_pred_c(output, pred8, in_w, in_h, ref8, in_w,
|
||||
&dist_wtd_comp_params);
|
||||
|
||||
aom_usec_timer_mark(&timer);
|
||||
const int elapsed_time = static_cast<int>(aom_usec_timer_elapsed(&timer));
|
||||
printf("jntcompavg c_code %3dx%-3d: %7.2f us\n", in_w, in_h,
|
||||
printf("distwtdcompavg c_code %3dx%-3d: %7.2f us\n", in_w, in_h,
|
||||
1000.0 * elapsed_time / num_loops);
|
||||
|
||||
aom_usec_timer timer1;
|
||||
aom_usec_timer_start(&timer1);
|
||||
|
||||
for (int i = 0; i < num_loops; ++i)
|
||||
test_impl(output2, pred8, in_w, in_h, ref8, in_w, &jnt_comp_params);
|
||||
test_impl(output2, pred8, in_w, in_h, ref8, in_w, &dist_wtd_comp_params);
|
||||
|
||||
aom_usec_timer_mark(&timer1);
|
||||
const int elapsed_time1 = static_cast<int>(aom_usec_timer_elapsed(&timer1));
|
||||
printf("jntcompavg test_code %3dx%-3d: %7.2f us\n", in_w, in_h,
|
||||
printf("distwtdcompavg test_code %3dx%-3d: %7.2f us\n", in_w, in_h,
|
||||
1000.0 * elapsed_time1 / num_loops);
|
||||
}
|
||||
|
||||
libaom_test::ACMRandom rnd_;
|
||||
}; // class AV1JNTCOMPAVGTest
|
||||
}; // class AV1DISTWTDCOMPAVGTest
|
||||
|
||||
class AV1JNTCOMPAVGUPSAMPLEDTest
|
||||
: public ::testing::TestWithParam<JNTCOMPAVGUPSAMPLEDParam> {
|
||||
class AV1DISTWTDCOMPAVGUPSAMPLEDTest
|
||||
: public ::testing::TestWithParam<DISTWTDCOMPAVGUPSAMPLEDParam> {
|
||||
public:
|
||||
~AV1JNTCOMPAVGUPSAMPLEDTest() {}
|
||||
~AV1DISTWTDCOMPAVGUPSAMPLEDTest() {}
|
||||
void SetUp() { rnd_.Reset(ACMRandom::DeterministicSeed()); }
|
||||
void TearDown() { libaom_test::ClearSystemState(); }
|
||||
|
||||
protected:
|
||||
void RunCheckOutput(jntcompavgupsampled_func test_impl) {
|
||||
void RunCheckOutput(distwtdcompavgupsampled_func test_impl) {
|
||||
const int w = kMaxSize, h = kMaxSize;
|
||||
const int block_idx = GET_PARAM(1);
|
||||
|
||||
|
|
@ -211,37 +212,40 @@ class AV1JNTCOMPAVGUPSAMPLEDTest
|
|||
const int in_w = block_size_wide[block_idx];
|
||||
const int in_h = block_size_high[block_idx];
|
||||
|
||||
JNT_COMP_PARAMS jnt_comp_params;
|
||||
jnt_comp_params.use_jnt_comp_avg = 1;
|
||||
DIST_WTD_COMP_PARAMS dist_wtd_comp_params;
|
||||
dist_wtd_comp_params.use_dist_wtd_comp_avg = 1;
|
||||
int sub_x_q3, sub_y_q3;
|
||||
int subpel_search;
|
||||
for (subpel_search = 1; subpel_search <= 2; ++subpel_search) {
|
||||
for (subpel_search = USE_4_TAPS; subpel_search <= USE_8_TAPS;
|
||||
++subpel_search) {
|
||||
for (sub_x_q3 = 0; sub_x_q3 < 8; ++sub_x_q3) {
|
||||
for (sub_y_q3 = 0; sub_y_q3 < 8; ++sub_y_q3) {
|
||||
for (int ii = 0; ii < 2; ii++) {
|
||||
for (int jj = 0; jj < 4; jj++) {
|
||||
jnt_comp_params.fwd_offset = quant_dist_lookup_table[ii][jj][0];
|
||||
jnt_comp_params.bck_offset = quant_dist_lookup_table[ii][jj][1];
|
||||
dist_wtd_comp_params.fwd_offset =
|
||||
quant_dist_lookup_table[ii][jj][0];
|
||||
dist_wtd_comp_params.bck_offset =
|
||||
quant_dist_lookup_table[ii][jj][1];
|
||||
|
||||
const int offset_r = 3 + rnd_.PseudoUniform(h - in_h - 7);
|
||||
const int offset_c = 3 + rnd_.PseudoUniform(w - in_w - 7);
|
||||
|
||||
aom_jnt_comp_avg_upsampled_pred_c(
|
||||
aom_dist_wtd_comp_avg_upsampled_pred_c(
|
||||
NULL, NULL, 0, 0, NULL, output,
|
||||
pred8 + offset_r * w + offset_c, in_w, in_h, sub_x_q3,
|
||||
sub_y_q3, ref8 + offset_r * w + offset_c, in_w,
|
||||
&jnt_comp_params, subpel_search);
|
||||
&dist_wtd_comp_params, subpel_search);
|
||||
test_impl(NULL, NULL, 0, 0, NULL, output2,
|
||||
pred8 + offset_r * w + offset_c, in_w, in_h, sub_x_q3,
|
||||
sub_y_q3, ref8 + offset_r * w + offset_c, in_w,
|
||||
&jnt_comp_params, subpel_search);
|
||||
&dist_wtd_comp_params, subpel_search);
|
||||
|
||||
for (int i = 0; i < in_h; ++i) {
|
||||
for (int j = 0; j < in_w; ++j) {
|
||||
int idx = i * in_w + j;
|
||||
ASSERT_EQ(output[idx], output2[idx])
|
||||
<< "Mismatch at unit tests for "
|
||||
"AV1JNTCOMPAVGUPSAMPLEDTest\n"
|
||||
"AV1DISTWTDCOMPAVGUPSAMPLEDTest\n"
|
||||
<< in_w << "x" << in_h << " Pixel mismatch at index "
|
||||
<< idx << " = (" << i << ", " << j
|
||||
<< "), sub pixel offset = (" << sub_y_q3 << ", "
|
||||
|
|
@ -254,7 +258,7 @@ class AV1JNTCOMPAVGUPSAMPLEDTest
|
|||
}
|
||||
}
|
||||
}
|
||||
void RunSpeedTest(jntcompavgupsampled_func test_impl) {
|
||||
void RunSpeedTest(distwtdcompavgupsampled_func test_impl) {
|
||||
const int w = kMaxSize, h = kMaxSize;
|
||||
const int block_idx = GET_PARAM(1);
|
||||
|
||||
|
|
@ -271,11 +275,11 @@ class AV1JNTCOMPAVGUPSAMPLEDTest
|
|||
const int in_w = block_size_wide[block_idx];
|
||||
const int in_h = block_size_high[block_idx];
|
||||
|
||||
JNT_COMP_PARAMS jnt_comp_params;
|
||||
jnt_comp_params.use_jnt_comp_avg = 1;
|
||||
DIST_WTD_COMP_PARAMS dist_wtd_comp_params;
|
||||
dist_wtd_comp_params.use_dist_wtd_comp_avg = 1;
|
||||
|
||||
jnt_comp_params.fwd_offset = quant_dist_lookup_table[0][0][0];
|
||||
jnt_comp_params.bck_offset = quant_dist_lookup_table[0][0][1];
|
||||
dist_wtd_comp_params.fwd_offset = quant_dist_lookup_table[0][0][0];
|
||||
dist_wtd_comp_params.bck_offset = quant_dist_lookup_table[0][0][1];
|
||||
|
||||
int sub_x_q3 = 0;
|
||||
int sub_y_q3 = 0;
|
||||
|
|
@ -283,16 +287,16 @@ class AV1JNTCOMPAVGUPSAMPLEDTest
|
|||
const int num_loops = 1000000000 / (in_w + in_h);
|
||||
aom_usec_timer timer;
|
||||
aom_usec_timer_start(&timer);
|
||||
int subpel_search = 2; // set to 1 to test 4-tap filter.
|
||||
int subpel_search = USE_8_TAPS; // set to USE_4_TAPS to test 4-tap filter.
|
||||
|
||||
for (int i = 0; i < num_loops; ++i)
|
||||
aom_jnt_comp_avg_upsampled_pred_c(NULL, NULL, 0, 0, NULL, output, pred8,
|
||||
in_w, in_h, sub_x_q3, sub_y_q3, ref8,
|
||||
in_w, &jnt_comp_params, subpel_search);
|
||||
aom_dist_wtd_comp_avg_upsampled_pred_c(
|
||||
NULL, NULL, 0, 0, NULL, output, pred8, in_w, in_h, sub_x_q3, sub_y_q3,
|
||||
ref8, in_w, &dist_wtd_comp_params, subpel_search);
|
||||
|
||||
aom_usec_timer_mark(&timer);
|
||||
const int elapsed_time = static_cast<int>(aom_usec_timer_elapsed(&timer));
|
||||
printf("jntcompavgupsampled c_code %3dx%-3d: %7.2f us\n", in_w, in_h,
|
||||
printf("distwtdcompavgupsampled c_code %3dx%-3d: %7.2f us\n", in_w, in_h,
|
||||
1000.0 * elapsed_time / num_loops);
|
||||
|
||||
aom_usec_timer timer1;
|
||||
|
|
@ -300,27 +304,27 @@ class AV1JNTCOMPAVGUPSAMPLEDTest
|
|||
|
||||
for (int i = 0; i < num_loops; ++i)
|
||||
test_impl(NULL, NULL, 0, 0, NULL, output2, pred8, in_w, in_h, sub_x_q3,
|
||||
sub_y_q3, ref8, in_w, &jnt_comp_params, subpel_search);
|
||||
sub_y_q3, ref8, in_w, &dist_wtd_comp_params, subpel_search);
|
||||
|
||||
aom_usec_timer_mark(&timer1);
|
||||
const int elapsed_time1 = static_cast<int>(aom_usec_timer_elapsed(&timer1));
|
||||
printf("jntcompavgupsampled test_code %3dx%-3d: %7.2f us\n", in_w, in_h,
|
||||
printf("distwtdcompavgupsampled test_code %3dx%-3d: %7.2f us\n", in_w, in_h,
|
||||
1000.0 * elapsed_time1 / num_loops);
|
||||
}
|
||||
|
||||
libaom_test::ACMRandom rnd_;
|
||||
}; // class AV1JNTCOMPAVGUPSAMPLEDTest
|
||||
}; // class AV1DISTWTDCOMPAVGUPSAMPLEDTest
|
||||
|
||||
class AV1HighBDJNTCOMPAVGTest
|
||||
: public ::testing::TestWithParam<HighbdJNTCOMPAVGParam> {
|
||||
class AV1HighBDDISTWTDCOMPAVGTest
|
||||
: public ::testing::TestWithParam<HighbdDISTWTDCOMPAVGParam> {
|
||||
public:
|
||||
~AV1HighBDJNTCOMPAVGTest() {}
|
||||
~AV1HighBDDISTWTDCOMPAVGTest() {}
|
||||
void SetUp() { rnd_.Reset(ACMRandom::DeterministicSeed()); }
|
||||
|
||||
void TearDown() { libaom_test::ClearSystemState(); }
|
||||
|
||||
protected:
|
||||
void RunCheckOutput(jntcompavg_func test_impl) {
|
||||
void RunCheckOutput(distwtdcompavg_func test_impl) {
|
||||
const int w = kMaxSize, h = kMaxSize;
|
||||
const int block_idx = GET_PARAM(2);
|
||||
const int bd = GET_PARAM(0);
|
||||
|
|
@ -337,31 +341,31 @@ class AV1HighBDJNTCOMPAVGTest
|
|||
const int in_w = block_size_wide[block_idx];
|
||||
const int in_h = block_size_high[block_idx];
|
||||
|
||||
JNT_COMP_PARAMS jnt_comp_params;
|
||||
jnt_comp_params.use_jnt_comp_avg = 1;
|
||||
DIST_WTD_COMP_PARAMS dist_wtd_comp_params;
|
||||
dist_wtd_comp_params.use_dist_wtd_comp_avg = 1;
|
||||
|
||||
for (int ii = 0; ii < 2; ii++) {
|
||||
for (int jj = 0; jj < 4; jj++) {
|
||||
jnt_comp_params.fwd_offset = quant_dist_lookup_table[ii][jj][0];
|
||||
jnt_comp_params.bck_offset = quant_dist_lookup_table[ii][jj][1];
|
||||
dist_wtd_comp_params.fwd_offset = quant_dist_lookup_table[ii][jj][0];
|
||||
dist_wtd_comp_params.bck_offset = quant_dist_lookup_table[ii][jj][1];
|
||||
|
||||
const int offset_r = 3 + rnd_.PseudoUniform(h - in_h - 7);
|
||||
const int offset_c = 3 + rnd_.PseudoUniform(w - in_w - 7);
|
||||
aom_highbd_jnt_comp_avg_pred_c(
|
||||
aom_highbd_dist_wtd_comp_avg_pred_c(
|
||||
CONVERT_TO_BYTEPTR(output),
|
||||
CONVERT_TO_BYTEPTR(pred8) + offset_r * w + offset_c, in_w, in_h,
|
||||
CONVERT_TO_BYTEPTR(ref8) + offset_r * w + offset_c, in_w,
|
||||
&jnt_comp_params);
|
||||
&dist_wtd_comp_params);
|
||||
test_impl(CONVERT_TO_BYTEPTR(output2),
|
||||
CONVERT_TO_BYTEPTR(pred8) + offset_r * w + offset_c, in_w,
|
||||
in_h, CONVERT_TO_BYTEPTR(ref8) + offset_r * w + offset_c,
|
||||
in_w, &jnt_comp_params);
|
||||
in_w, &dist_wtd_comp_params);
|
||||
|
||||
for (int i = 0; i < in_h; ++i) {
|
||||
for (int j = 0; j < in_w; ++j) {
|
||||
int idx = i * in_w + j;
|
||||
ASSERT_EQ(output[idx], output2[idx])
|
||||
<< "Mismatch at unit tests for AV1HighBDJNTCOMPAVGTest\n"
|
||||
<< "Mismatch at unit tests for AV1HighBDDISTWTDCOMPAVGTest\n"
|
||||
<< in_w << "x" << in_h << " Pixel mismatch at index " << idx
|
||||
<< " = (" << i << ", " << j << ")";
|
||||
}
|
||||
|
|
@ -369,7 +373,7 @@ class AV1HighBDJNTCOMPAVGTest
|
|||
}
|
||||
}
|
||||
}
|
||||
void RunSpeedTest(jntcompavg_func test_impl) {
|
||||
void RunSpeedTest(distwtdcompavg_func test_impl) {
|
||||
const int w = kMaxSize, h = kMaxSize;
|
||||
const int block_idx = GET_PARAM(2);
|
||||
const int bd = GET_PARAM(0);
|
||||
|
|
@ -386,24 +390,24 @@ class AV1HighBDJNTCOMPAVGTest
|
|||
const int in_w = block_size_wide[block_idx];
|
||||
const int in_h = block_size_high[block_idx];
|
||||
|
||||
JNT_COMP_PARAMS jnt_comp_params;
|
||||
jnt_comp_params.use_jnt_comp_avg = 1;
|
||||
DIST_WTD_COMP_PARAMS dist_wtd_comp_params;
|
||||
dist_wtd_comp_params.use_dist_wtd_comp_avg = 1;
|
||||
|
||||
jnt_comp_params.fwd_offset = quant_dist_lookup_table[0][0][0];
|
||||
jnt_comp_params.bck_offset = quant_dist_lookup_table[0][0][1];
|
||||
dist_wtd_comp_params.fwd_offset = quant_dist_lookup_table[0][0][0];
|
||||
dist_wtd_comp_params.bck_offset = quant_dist_lookup_table[0][0][1];
|
||||
|
||||
const int num_loops = 1000000000 / (in_w + in_h);
|
||||
aom_usec_timer timer;
|
||||
aom_usec_timer_start(&timer);
|
||||
|
||||
for (int i = 0; i < num_loops; ++i)
|
||||
aom_highbd_jnt_comp_avg_pred_c(
|
||||
aom_highbd_dist_wtd_comp_avg_pred_c(
|
||||
CONVERT_TO_BYTEPTR(output), CONVERT_TO_BYTEPTR(pred8), in_w, in_h,
|
||||
CONVERT_TO_BYTEPTR(ref8), in_w, &jnt_comp_params);
|
||||
CONVERT_TO_BYTEPTR(ref8), in_w, &dist_wtd_comp_params);
|
||||
|
||||
aom_usec_timer_mark(&timer);
|
||||
const int elapsed_time = static_cast<int>(aom_usec_timer_elapsed(&timer));
|
||||
printf("highbdjntcompavg c_code %3dx%-3d: %7.2f us\n", in_w, in_h,
|
||||
printf("highbddistwtdcompavg c_code %3dx%-3d: %7.2f us\n", in_w, in_h,
|
||||
1000.0 * elapsed_time / num_loops);
|
||||
|
||||
aom_usec_timer timer1;
|
||||
|
|
@ -411,33 +415,33 @@ class AV1HighBDJNTCOMPAVGTest
|
|||
|
||||
for (int i = 0; i < num_loops; ++i)
|
||||
test_impl(CONVERT_TO_BYTEPTR(output2), CONVERT_TO_BYTEPTR(pred8), in_w,
|
||||
in_h, CONVERT_TO_BYTEPTR(ref8), in_w, &jnt_comp_params);
|
||||
in_h, CONVERT_TO_BYTEPTR(ref8), in_w, &dist_wtd_comp_params);
|
||||
|
||||
aom_usec_timer_mark(&timer1);
|
||||
const int elapsed_time1 = static_cast<int>(aom_usec_timer_elapsed(&timer1));
|
||||
printf("highbdjntcompavg test_code %3dx%-3d: %7.2f us\n", in_w, in_h,
|
||||
printf("highbddistwtdcompavg test_code %3dx%-3d: %7.2f us\n", in_w, in_h,
|
||||
1000.0 * elapsed_time1 / num_loops);
|
||||
}
|
||||
|
||||
libaom_test::ACMRandom rnd_;
|
||||
}; // class AV1HighBDJNTCOMPAVGTest
|
||||
}; // class AV1HighBDDISTWTDCOMPAVGTest
|
||||
|
||||
class AV1HighBDJNTCOMPAVGUPSAMPLEDTest
|
||||
: public ::testing::TestWithParam<HighbdJNTCOMPAVGUPSAMPLEDParam> {
|
||||
class AV1HighBDDISTWTDCOMPAVGUPSAMPLEDTest
|
||||
: public ::testing::TestWithParam<HighbdDISTWTDCOMPAVGUPSAMPLEDParam> {
|
||||
public:
|
||||
~AV1HighBDJNTCOMPAVGUPSAMPLEDTest() {}
|
||||
~AV1HighBDDISTWTDCOMPAVGUPSAMPLEDTest() {}
|
||||
void SetUp() { rnd_.Reset(ACMRandom::DeterministicSeed()); }
|
||||
void TearDown() { libaom_test::ClearSystemState(); }
|
||||
|
||||
protected:
|
||||
void RunCheckOutput(highbdjntcompavgupsampled_func test_impl) {
|
||||
void RunCheckOutput(highbddistwtdcompavgupsampled_func test_impl) {
|
||||
const int w = kMaxSize, h = kMaxSize;
|
||||
const int block_idx = GET_PARAM(2);
|
||||
const int bd = GET_PARAM(0);
|
||||
uint16_t pred8[kMaxSize * kMaxSize];
|
||||
uint16_t ref8[kMaxSize * kMaxSize];
|
||||
uint16_t output[kMaxSize * kMaxSize];
|
||||
uint16_t output2[kMaxSize * kMaxSize];
|
||||
DECLARE_ALIGNED(16, uint16_t, output[kMaxSize * kMaxSize]);
|
||||
DECLARE_ALIGNED(16, uint16_t, output2[kMaxSize * kMaxSize]);
|
||||
|
||||
for (int i = 0; i < h; ++i)
|
||||
for (int j = 0; j < w; ++j) {
|
||||
|
|
@ -447,39 +451,42 @@ class AV1HighBDJNTCOMPAVGUPSAMPLEDTest
|
|||
const int in_w = block_size_wide[block_idx];
|
||||
const int in_h = block_size_high[block_idx];
|
||||
|
||||
JNT_COMP_PARAMS jnt_comp_params;
|
||||
jnt_comp_params.use_jnt_comp_avg = 1;
|
||||
DIST_WTD_COMP_PARAMS dist_wtd_comp_params;
|
||||
dist_wtd_comp_params.use_dist_wtd_comp_avg = 1;
|
||||
int sub_x_q3, sub_y_q3;
|
||||
int subpel_search;
|
||||
for (subpel_search = 1; subpel_search <= 2; ++subpel_search) {
|
||||
for (subpel_search = USE_4_TAPS; subpel_search <= USE_8_TAPS;
|
||||
++subpel_search) {
|
||||
for (sub_x_q3 = 0; sub_x_q3 < 8; ++sub_x_q3) {
|
||||
for (sub_y_q3 = 0; sub_y_q3 < 8; ++sub_y_q3) {
|
||||
for (int ii = 0; ii < 2; ii++) {
|
||||
for (int jj = 0; jj < 4; jj++) {
|
||||
jnt_comp_params.fwd_offset = quant_dist_lookup_table[ii][jj][0];
|
||||
jnt_comp_params.bck_offset = quant_dist_lookup_table[ii][jj][1];
|
||||
dist_wtd_comp_params.fwd_offset =
|
||||
quant_dist_lookup_table[ii][jj][0];
|
||||
dist_wtd_comp_params.bck_offset =
|
||||
quant_dist_lookup_table[ii][jj][1];
|
||||
|
||||
const int offset_r = 3 + rnd_.PseudoUniform(h - in_h - 7);
|
||||
const int offset_c = 3 + rnd_.PseudoUniform(w - in_w - 7);
|
||||
|
||||
aom_highbd_jnt_comp_avg_upsampled_pred_c(
|
||||
aom_highbd_dist_wtd_comp_avg_upsampled_pred_c(
|
||||
NULL, NULL, 0, 0, NULL, CONVERT_TO_BYTEPTR(output),
|
||||
CONVERT_TO_BYTEPTR(pred8) + offset_r * w + offset_c, in_w,
|
||||
in_h, sub_x_q3, sub_y_q3,
|
||||
CONVERT_TO_BYTEPTR(ref8) + offset_r * w + offset_c, in_w, bd,
|
||||
&jnt_comp_params, subpel_search);
|
||||
&dist_wtd_comp_params, subpel_search);
|
||||
test_impl(NULL, NULL, 0, 0, NULL, CONVERT_TO_BYTEPTR(output2),
|
||||
CONVERT_TO_BYTEPTR(pred8) + offset_r * w + offset_c,
|
||||
in_w, in_h, sub_x_q3, sub_y_q3,
|
||||
CONVERT_TO_BYTEPTR(ref8) + offset_r * w + offset_c,
|
||||
in_w, bd, &jnt_comp_params, subpel_search);
|
||||
in_w, bd, &dist_wtd_comp_params, subpel_search);
|
||||
|
||||
for (int i = 0; i < in_h; ++i) {
|
||||
for (int j = 0; j < in_w; ++j) {
|
||||
int idx = i * in_w + j;
|
||||
ASSERT_EQ(output[idx], output2[idx])
|
||||
<< "Mismatch at unit tests for "
|
||||
"AV1HighBDJNTCOMPAVGUPSAMPLEDTest\n"
|
||||
"AV1HighBDDISTWTDCOMPAVGUPSAMPLEDTest\n"
|
||||
<< in_w << "x" << in_h << " Pixel mismatch at index "
|
||||
<< idx << " = (" << i << ", " << j
|
||||
<< "), sub pixel offset = (" << sub_y_q3 << ", "
|
||||
|
|
@ -492,14 +499,14 @@ class AV1HighBDJNTCOMPAVGUPSAMPLEDTest
|
|||
}
|
||||
}
|
||||
}
|
||||
void RunSpeedTest(highbdjntcompavgupsampled_func test_impl) {
|
||||
void RunSpeedTest(highbddistwtdcompavgupsampled_func test_impl) {
|
||||
const int w = kMaxSize, h = kMaxSize;
|
||||
const int block_idx = GET_PARAM(2);
|
||||
const int bd = GET_PARAM(0);
|
||||
uint16_t pred8[kMaxSize * kMaxSize];
|
||||
uint16_t ref8[kMaxSize * kMaxSize];
|
||||
uint16_t output[kMaxSize * kMaxSize];
|
||||
uint16_t output2[kMaxSize * kMaxSize];
|
||||
DECLARE_ALIGNED(16, uint16_t, output[kMaxSize * kMaxSize]);
|
||||
DECLARE_ALIGNED(16, uint16_t, output2[kMaxSize * kMaxSize]);
|
||||
|
||||
for (int i = 0; i < h; ++i)
|
||||
for (int j = 0; j < w; ++j) {
|
||||
|
|
@ -509,27 +516,28 @@ class AV1HighBDJNTCOMPAVGUPSAMPLEDTest
|
|||
const int in_w = block_size_wide[block_idx];
|
||||
const int in_h = block_size_high[block_idx];
|
||||
|
||||
JNT_COMP_PARAMS jnt_comp_params;
|
||||
jnt_comp_params.use_jnt_comp_avg = 1;
|
||||
DIST_WTD_COMP_PARAMS dist_wtd_comp_params;
|
||||
dist_wtd_comp_params.use_dist_wtd_comp_avg = 1;
|
||||
|
||||
jnt_comp_params.fwd_offset = quant_dist_lookup_table[0][0][0];
|
||||
jnt_comp_params.bck_offset = quant_dist_lookup_table[0][0][1];
|
||||
dist_wtd_comp_params.fwd_offset = quant_dist_lookup_table[0][0][0];
|
||||
dist_wtd_comp_params.bck_offset = quant_dist_lookup_table[0][0][1];
|
||||
int sub_x_q3 = 0;
|
||||
int sub_y_q3 = 0;
|
||||
const int num_loops = 1000000000 / (in_w + in_h);
|
||||
aom_usec_timer timer;
|
||||
aom_usec_timer_start(&timer);
|
||||
int subpel_search = 2; // set to 1 to test 4-tap filter.
|
||||
int subpel_search = USE_8_TAPS; // set to USE_4_TAPS to test 4-tap filter.
|
||||
for (int i = 0; i < num_loops; ++i)
|
||||
aom_highbd_jnt_comp_avg_upsampled_pred_c(
|
||||
aom_highbd_dist_wtd_comp_avg_upsampled_pred_c(
|
||||
NULL, NULL, 0, 0, NULL, CONVERT_TO_BYTEPTR(output),
|
||||
CONVERT_TO_BYTEPTR(pred8), in_w, in_h, sub_x_q3, sub_y_q3,
|
||||
CONVERT_TO_BYTEPTR(ref8), in_w, bd, &jnt_comp_params, subpel_search);
|
||||
CONVERT_TO_BYTEPTR(ref8), in_w, bd, &dist_wtd_comp_params,
|
||||
subpel_search);
|
||||
|
||||
aom_usec_timer_mark(&timer);
|
||||
const int elapsed_time = static_cast<int>(aom_usec_timer_elapsed(&timer));
|
||||
printf("highbdjntcompavgupsampled c_code %3dx%-3d: %7.2f us\n", in_w, in_h,
|
||||
1000.0 * elapsed_time / num_loops);
|
||||
printf("highbddistwtdcompavgupsampled c_code %3dx%-3d: %7.2f us\n", in_w,
|
||||
in_h, 1000.0 * elapsed_time / num_loops);
|
||||
|
||||
aom_usec_timer timer1;
|
||||
aom_usec_timer_start(&timer1);
|
||||
|
|
@ -537,19 +545,19 @@ class AV1HighBDJNTCOMPAVGUPSAMPLEDTest
|
|||
for (int i = 0; i < num_loops; ++i)
|
||||
test_impl(NULL, NULL, 0, 0, NULL, CONVERT_TO_BYTEPTR(output2),
|
||||
CONVERT_TO_BYTEPTR(pred8), in_w, in_h, sub_x_q3, sub_y_q3,
|
||||
CONVERT_TO_BYTEPTR(ref8), in_w, bd, &jnt_comp_params,
|
||||
CONVERT_TO_BYTEPTR(ref8), in_w, bd, &dist_wtd_comp_params,
|
||||
subpel_search);
|
||||
|
||||
aom_usec_timer_mark(&timer1);
|
||||
const int elapsed_time1 = static_cast<int>(aom_usec_timer_elapsed(&timer1));
|
||||
printf("highbdjntcompavgupsampled test_code %3dx%-3d: %7.2f us\n", in_w,
|
||||
printf("highbddistwtdcompavgupsampled test_code %3dx%-3d: %7.2f us\n", in_w,
|
||||
in_h, 1000.0 * elapsed_time1 / num_loops);
|
||||
}
|
||||
|
||||
libaom_test::ACMRandom rnd_;
|
||||
}; // class AV1HighBDJNTCOMPAVGUPSAMPLEDTest
|
||||
}; // class AV1HighBDDISTWTDCOMPAVGUPSAMPLEDTest
|
||||
|
||||
} // namespace AV1JNTCOMPAVG
|
||||
} // namespace AV1DISTWTDCOMPAVG
|
||||
} // namespace libaom_test
|
||||
|
||||
#endif // AOM_TEST_COMP_AVG_PRED_TEST_H_
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue