mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-10-09 08:47:31 +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
|
|
@ -200,9 +200,9 @@ void AV1JntConvolve2DTest::RunCheckOutput(convolve_2d_func test_impl) {
|
|||
ConvolveParams conv_params2 =
|
||||
get_conv_params_no_round(do_average, 0, output2, MAX_SB_SIZE, 1, 8);
|
||||
|
||||
// Test special case where jnt_comp_avg is not used
|
||||
conv_params1.use_jnt_comp_avg = 0;
|
||||
conv_params2.use_jnt_comp_avg = 0;
|
||||
// Test special case where dist_wtd_comp_avg is not used
|
||||
conv_params1.use_dist_wtd_comp_avg = 0;
|
||||
conv_params2.use_dist_wtd_comp_avg = 0;
|
||||
|
||||
const int subx_range = has_subx ? 16 : 1;
|
||||
const int suby_range = has_suby ? 16 : 1;
|
||||
|
|
@ -211,9 +211,10 @@ void AV1JntConvolve2DTest::RunCheckOutput(convolve_2d_func test_impl) {
|
|||
// Choose random locations within the source block
|
||||
const int offset_r = 3 + rnd_.PseudoUniform(h - out_h - 7);
|
||||
const int offset_c = 3 + rnd_.PseudoUniform(w - out_w - 7);
|
||||
av1_jnt_convolve_2d_c(input + offset_r * w + offset_c, w, output8_1,
|
||||
MAX_SB_SIZE, out_w, out_h, filter_params_x,
|
||||
filter_params_y, subx, suby, &conv_params1);
|
||||
av1_dist_wtd_convolve_2d_c(input + offset_r * w + offset_c, w,
|
||||
output8_1, MAX_SB_SIZE, out_w, out_h,
|
||||
filter_params_x, filter_params_y, subx,
|
||||
suby, &conv_params1);
|
||||
test_impl(input + offset_r * w + offset_c, w, output8_2,
|
||||
MAX_SB_SIZE, out_w, out_h, filter_params_x,
|
||||
filter_params_y, subx, suby, &conv_params2);
|
||||
|
|
@ -222,7 +223,7 @@ void AV1JntConvolve2DTest::RunCheckOutput(convolve_2d_func test_impl) {
|
|||
for (int j = 0; j < out_w; ++j) {
|
||||
int idx = i * MAX_SB_SIZE + j;
|
||||
ASSERT_EQ(output1[idx], output2[idx])
|
||||
<< "Mismatch at unit tests for av1_jnt_convolve_2d\n"
|
||||
<< "Mismatch at unit tests for av1_dist_wtd_convolve_2d\n"
|
||||
<< out_w << "x" << out_h << " Pixel mismatch at index "
|
||||
<< idx << " = (" << i << ", " << j
|
||||
<< "), sub pixel offset = (" << suby << ", " << subx << ")";
|
||||
|
|
@ -247,8 +248,8 @@ void AV1JntConvolve2DTest::RunCheckOutput(convolve_2d_func test_impl) {
|
|||
// Test different combination of fwd and bck offset weights
|
||||
for (int k = 0; k < 2; ++k) {
|
||||
for (int l = 0; l < 4; ++l) {
|
||||
conv_params1.use_jnt_comp_avg = 1;
|
||||
conv_params2.use_jnt_comp_avg = 1;
|
||||
conv_params1.use_dist_wtd_comp_avg = 1;
|
||||
conv_params2.use_dist_wtd_comp_avg = 1;
|
||||
conv_params1.fwd_offset = quant_dist_lookup_table[k][l][0];
|
||||
conv_params1.bck_offset = quant_dist_lookup_table[k][l][1];
|
||||
conv_params2.fwd_offset = quant_dist_lookup_table[k][l][0];
|
||||
|
|
@ -259,10 +260,10 @@ void AV1JntConvolve2DTest::RunCheckOutput(convolve_2d_func test_impl) {
|
|||
// Choose random locations within the source block
|
||||
const int offset_r = 3 + rnd_.PseudoUniform(h - out_h - 7);
|
||||
const int offset_c = 3 + rnd_.PseudoUniform(w - out_w - 7);
|
||||
av1_jnt_convolve_2d_c(input + offset_r * w + offset_c, w,
|
||||
output8_1, MAX_SB_SIZE, out_w, out_h,
|
||||
filter_params_x, filter_params_y, subx,
|
||||
suby, &conv_params1);
|
||||
av1_dist_wtd_convolve_2d_c(input + offset_r * w + offset_c, w,
|
||||
output8_1, MAX_SB_SIZE, out_w, out_h,
|
||||
filter_params_x, filter_params_y,
|
||||
subx, suby, &conv_params1);
|
||||
test_impl(input + offset_r * w + offset_c, w, output8_2,
|
||||
MAX_SB_SIZE, out_w, out_h, filter_params_x,
|
||||
filter_params_y, subx, suby, &conv_params2);
|
||||
|
|
@ -272,7 +273,7 @@ void AV1JntConvolve2DTest::RunCheckOutput(convolve_2d_func test_impl) {
|
|||
int idx = i * MAX_SB_SIZE + j;
|
||||
ASSERT_EQ(output1[idx], output2[idx])
|
||||
<< "Mismatch at unit tests for "
|
||||
"av1_jnt_convolve_2d\n"
|
||||
"av1_dist_wtd_convolve_2d\n"
|
||||
<< out_w << "x" << out_h << " Pixel mismatch at index "
|
||||
<< idx << " = (" << i << ", " << j
|
||||
<< "), sub pixel offset = (" << suby << ", " << subx
|
||||
|
|
@ -333,7 +334,7 @@ void AV1JntConvolve2DTest::RunSpeedTest(convolve_2d_func test_impl) {
|
|||
ConvolveParams conv_params =
|
||||
get_conv_params_no_round(do_average, 0, output, MAX_SB_SIZE, 1, 8);
|
||||
|
||||
conv_params.use_jnt_comp_avg = 0;
|
||||
conv_params.use_dist_wtd_comp_avg = 0;
|
||||
|
||||
// Choose random locations within the source block
|
||||
const int offset_r = 3 + rnd_.PseudoUniform(h - out_h - 7);
|
||||
|
|
@ -540,8 +541,8 @@ void AV1HighbdJntConvolve2DTest::RunSpeedTest(
|
|||
ConvolveParams conv_params =
|
||||
get_conv_params_no_round(do_average, 0, output, MAX_SB_SIZE, 1, bd);
|
||||
|
||||
// Test special case where jnt_comp_avg is not used
|
||||
conv_params.use_jnt_comp_avg = 0;
|
||||
// Test special case where dist_wtd_comp_avg is not used
|
||||
conv_params.use_dist_wtd_comp_avg = 0;
|
||||
|
||||
subx = 0;
|
||||
suby = 0;
|
||||
|
|
@ -601,9 +602,9 @@ void AV1HighbdJntConvolve2DTest::RunCheckOutput(
|
|||
ConvolveParams conv_params2 = get_conv_params_no_round(
|
||||
do_average, 0, output2, MAX_SB_SIZE, 1, bd);
|
||||
|
||||
// Test special case where jnt_comp_avg is not used
|
||||
conv_params1.use_jnt_comp_avg = 0;
|
||||
conv_params2.use_jnt_comp_avg = 0;
|
||||
// Test special case where dist_wtd_comp_avg is not used
|
||||
conv_params1.use_dist_wtd_comp_avg = 0;
|
||||
conv_params2.use_dist_wtd_comp_avg = 0;
|
||||
|
||||
const int subx_range = has_subx ? 16 : 1;
|
||||
const int suby_range = has_suby ? 16 : 1;
|
||||
|
|
@ -612,10 +613,10 @@ void AV1HighbdJntConvolve2DTest::RunCheckOutput(
|
|||
// Choose random locations within the source block
|
||||
const int offset_r = 3 + rnd_.PseudoUniform(h - out_h - 7);
|
||||
const int offset_c = 3 + rnd_.PseudoUniform(w - out_w - 7);
|
||||
av1_highbd_jnt_convolve_2d_c(input + offset_r * w + offset_c, w,
|
||||
output16_1, MAX_SB_SIZE, out_w, out_h,
|
||||
filter_params_x, filter_params_y, subx,
|
||||
suby, &conv_params1, bd);
|
||||
av1_highbd_dist_wtd_convolve_2d_c(
|
||||
input + offset_r * w + offset_c, w, output16_1, MAX_SB_SIZE,
|
||||
out_w, out_h, filter_params_x, filter_params_y, subx, suby,
|
||||
&conv_params1, bd);
|
||||
test_impl(input + offset_r * w + offset_c, w, output16_2,
|
||||
MAX_SB_SIZE, out_w, out_h, filter_params_x,
|
||||
filter_params_y, subx, suby, &conv_params2, bd);
|
||||
|
|
@ -648,8 +649,8 @@ void AV1HighbdJntConvolve2DTest::RunCheckOutput(
|
|||
// Test different combination of fwd and bck offset weights
|
||||
for (int k = 0; k < 2; ++k) {
|
||||
for (int l = 0; l < 4; ++l) {
|
||||
conv_params1.use_jnt_comp_avg = 1;
|
||||
conv_params2.use_jnt_comp_avg = 1;
|
||||
conv_params1.use_dist_wtd_comp_avg = 1;
|
||||
conv_params2.use_dist_wtd_comp_avg = 1;
|
||||
conv_params1.fwd_offset = quant_dist_lookup_table[k][l][0];
|
||||
conv_params1.bck_offset = quant_dist_lookup_table[k][l][1];
|
||||
conv_params2.fwd_offset = quant_dist_lookup_table[k][l][0];
|
||||
|
|
@ -662,7 +663,7 @@ void AV1HighbdJntConvolve2DTest::RunCheckOutput(
|
|||
// Choose random locations within the source block
|
||||
const int offset_r = 3 + rnd_.PseudoUniform(h - out_h - 7);
|
||||
const int offset_c = 3 + rnd_.PseudoUniform(w - out_w - 7);
|
||||
av1_highbd_jnt_convolve_2d_c(
|
||||
av1_highbd_dist_wtd_convolve_2d_c(
|
||||
input + offset_r * w + offset_c, w, output16_1, MAX_SB_SIZE,
|
||||
out_w, out_h, filter_params_x, filter_params_y, subx, suby,
|
||||
&conv_params1, bd);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue