mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-19 14:57:32 +09:00
Update libaom to rev b25610052a1398032320008d69b51d2da94f5928
This commit is contained in:
trav90
Roy Tam
parent
8493557d20
commit
3d109dd4fc
240 changed files with 16977 additions and 6139 deletions
|
|
@ -63,10 +63,10 @@ void AV1Convolve2DSrTest::RunCheckOutput(convolve_2d_func test_impl) {
|
|||
for (hfilter = EIGHTTAP_REGULAR; hfilter < INTERP_FILTERS_ALL; ++hfilter) {
|
||||
for (vfilter = EIGHTTAP_REGULAR; vfilter < INTERP_FILTERS_ALL;
|
||||
++vfilter) {
|
||||
InterpFilterParams filter_params_x =
|
||||
const InterpFilterParams *filter_params_x =
|
||||
av1_get_interp_filter_params_with_block_size((InterpFilter)hfilter,
|
||||
out_w);
|
||||
InterpFilterParams filter_params_y =
|
||||
const InterpFilterParams *filter_params_y =
|
||||
av1_get_interp_filter_params_with_block_size((InterpFilter)vfilter,
|
||||
out_h);
|
||||
for (int do_average = 0; do_average < 1; ++do_average) {
|
||||
|
|
@ -83,11 +83,11 @@ void AV1Convolve2DSrTest::RunCheckOutput(convolve_2d_func test_impl) {
|
|||
const int offset_r = 3 + rnd_.PseudoUniform(h - out_h - 7);
|
||||
const int offset_c = 3 + rnd_.PseudoUniform(w - out_w - 7);
|
||||
av1_convolve_2d_sr_c(input + offset_r * w + offset_c, w, output,
|
||||
MAX_SB_SIZE, out_w, out_h, &filter_params_x,
|
||||
&filter_params_y, subx, suby, &conv_params1);
|
||||
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, output2,
|
||||
MAX_SB_SIZE, out_w, out_h, &filter_params_x,
|
||||
&filter_params_y, subx, suby, &conv_params2);
|
||||
MAX_SB_SIZE, out_w, out_h, filter_params_x,
|
||||
filter_params_y, subx, suby, &conv_params2);
|
||||
|
||||
if (memcmp(output, output2, sizeof(output))) {
|
||||
for (int i = 0; i < MAX_SB_SIZE; ++i) {
|
||||
|
|
@ -137,10 +137,10 @@ void AV1Convolve2DSrTest::RunSpeedTest(convolve_2d_func test_impl) {
|
|||
const int out_h = block_size_high[block_idx] >> shift;
|
||||
const int num_loops = 1000000000 / (out_w + out_h);
|
||||
|
||||
InterpFilterParams filter_params_x =
|
||||
const InterpFilterParams *filter_params_x =
|
||||
av1_get_interp_filter_params_with_block_size((InterpFilter)hfilter,
|
||||
out_w);
|
||||
InterpFilterParams filter_params_y =
|
||||
const InterpFilterParams *filter_params_y =
|
||||
av1_get_interp_filter_params_with_block_size((InterpFilter)vfilter,
|
||||
out_h);
|
||||
|
||||
|
|
@ -148,8 +148,8 @@ void AV1Convolve2DSrTest::RunSpeedTest(convolve_2d_func test_impl) {
|
|||
aom_usec_timer_start(&timer);
|
||||
|
||||
for (int i = 0; i < num_loops; ++i)
|
||||
test_impl(input, w, output, MAX_SB_SIZE, out_w, out_h, &filter_params_x,
|
||||
&filter_params_y, subx, suby, &conv_params2);
|
||||
test_impl(input, w, output, MAX_SB_SIZE, out_w, out_h, filter_params_x,
|
||||
filter_params_y, subx, suby, &conv_params2);
|
||||
|
||||
aom_usec_timer_mark(&timer);
|
||||
const int elapsed_time = static_cast<int>(aom_usec_timer_elapsed(&timer));
|
||||
|
|
@ -188,10 +188,10 @@ void AV1JntConvolve2DTest::RunCheckOutput(convolve_2d_func test_impl) {
|
|||
const int out_h = block_size_high[block_idx];
|
||||
for (hfilter = EIGHTTAP_REGULAR; hfilter < INTERP_FILTERS_ALL; ++hfilter) {
|
||||
for (vfilter = EIGHTTAP_REGULAR; vfilter < INTERP_FILTERS_ALL; ++vfilter) {
|
||||
InterpFilterParams filter_params_x =
|
||||
const InterpFilterParams *filter_params_x =
|
||||
av1_get_interp_filter_params_with_block_size((InterpFilter)hfilter,
|
||||
out_w);
|
||||
InterpFilterParams filter_params_y =
|
||||
const InterpFilterParams *filter_params_y =
|
||||
av1_get_interp_filter_params_with_block_size((InterpFilter)vfilter,
|
||||
out_h);
|
||||
for (int do_average = 0; do_average <= 1; ++do_average) {
|
||||
|
|
@ -212,11 +212,11 @@ void AV1JntConvolve2DTest::RunCheckOutput(convolve_2d_func test_impl) {
|
|||
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);
|
||||
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);
|
||||
MAX_SB_SIZE, out_w, out_h, filter_params_x,
|
||||
filter_params_y, subx, suby, &conv_params2);
|
||||
|
||||
for (int i = 0; i < out_h; ++i) {
|
||||
for (int j = 0; j < out_w; ++j) {
|
||||
|
|
@ -261,11 +261,11 @@ void AV1JntConvolve2DTest::RunCheckOutput(convolve_2d_func test_impl) {
|
|||
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,
|
||||
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);
|
||||
MAX_SB_SIZE, out_w, out_h, filter_params_x,
|
||||
filter_params_y, subx, suby, &conv_params2);
|
||||
|
||||
for (int i = 0; i < out_h; ++i) {
|
||||
for (int j = 0; j < out_w; ++j) {
|
||||
|
|
@ -323,10 +323,10 @@ void AV1JntConvolve2DTest::RunSpeedTest(convolve_2d_func test_impl) {
|
|||
const int num_loops = 1000000000 / (out_w + out_h);
|
||||
const int do_average = 0;
|
||||
|
||||
InterpFilterParams filter_params_x =
|
||||
const InterpFilterParams *filter_params_x =
|
||||
av1_get_interp_filter_params_with_block_size((InterpFilter)hfilter,
|
||||
out_w);
|
||||
InterpFilterParams filter_params_y =
|
||||
const InterpFilterParams *filter_params_y =
|
||||
av1_get_interp_filter_params_with_block_size((InterpFilter)vfilter,
|
||||
out_h);
|
||||
|
||||
|
|
@ -344,7 +344,7 @@ void AV1JntConvolve2DTest::RunSpeedTest(convolve_2d_func test_impl) {
|
|||
|
||||
for (int i = 0; i < num_loops; ++i)
|
||||
test_impl(input + offset_r * w + offset_c, w, output8, MAX_SB_SIZE, out_w,
|
||||
out_h, &filter_params_x, &filter_params_y, subx, suby,
|
||||
out_h, filter_params_x, filter_params_y, subx, suby,
|
||||
&conv_params);
|
||||
|
||||
aom_usec_timer_mark(&timer);
|
||||
|
|
@ -407,10 +407,10 @@ void AV1HighbdConvolve2DSrTest::RunSpeedTest(
|
|||
const int out_h = block_size_high[block_idx] >> shift;
|
||||
const int num_loops = 1000000000 / (out_w + out_h);
|
||||
|
||||
InterpFilterParams filter_params_x =
|
||||
const InterpFilterParams *filter_params_x =
|
||||
av1_get_interp_filter_params_with_block_size((InterpFilter)hfilter,
|
||||
out_w);
|
||||
InterpFilterParams filter_params_y =
|
||||
const InterpFilterParams *filter_params_y =
|
||||
av1_get_interp_filter_params_with_block_size((InterpFilter)vfilter,
|
||||
out_h);
|
||||
|
||||
|
|
@ -418,7 +418,7 @@ void AV1HighbdConvolve2DSrTest::RunSpeedTest(
|
|||
aom_usec_timer_start(&timer);
|
||||
for (int i = 0; i < num_loops; ++i)
|
||||
test_impl(input + offset_r * w + offset_c, w, output, MAX_SB_SIZE, out_w,
|
||||
out_h, &filter_params_x, &filter_params_y, subx, suby,
|
||||
out_h, filter_params_x, filter_params_y, subx, suby,
|
||||
&conv_params, bd);
|
||||
|
||||
aom_usec_timer_mark(&timer);
|
||||
|
|
@ -456,10 +456,10 @@ void AV1HighbdConvolve2DSrTest::RunCheckOutput(
|
|||
for (hfilter = EIGHTTAP_REGULAR; hfilter < INTERP_FILTERS_ALL; ++hfilter) {
|
||||
for (vfilter = EIGHTTAP_REGULAR; vfilter < INTERP_FILTERS_ALL;
|
||||
++vfilter) {
|
||||
InterpFilterParams filter_params_x =
|
||||
const InterpFilterParams *filter_params_x =
|
||||
av1_get_interp_filter_params_with_block_size((InterpFilter)hfilter,
|
||||
out_w);
|
||||
InterpFilterParams filter_params_y =
|
||||
const InterpFilterParams *filter_params_y =
|
||||
av1_get_interp_filter_params_with_block_size((InterpFilter)vfilter,
|
||||
out_h);
|
||||
for (int do_average = 0; do_average < 1; ++do_average) {
|
||||
|
|
@ -477,11 +477,11 @@ void AV1HighbdConvolve2DSrTest::RunCheckOutput(
|
|||
const int offset_c = 3 + rnd_.PseudoUniform(w - out_w - 7);
|
||||
av1_highbd_convolve_2d_sr_c(input + offset_r * w + offset_c, w,
|
||||
output, MAX_SB_SIZE, out_w, out_h,
|
||||
&filter_params_x, &filter_params_y,
|
||||
filter_params_x, filter_params_y,
|
||||
subx, suby, &conv_params1, bd);
|
||||
test_impl(input + offset_r * w + offset_c, w, output2,
|
||||
MAX_SB_SIZE, out_w, out_h, &filter_params_x,
|
||||
&filter_params_y, subx, suby, &conv_params2, bd);
|
||||
MAX_SB_SIZE, out_w, out_h, filter_params_x,
|
||||
filter_params_y, subx, suby, &conv_params2, bd);
|
||||
|
||||
if (memcmp(output, output2, sizeof(output))) {
|
||||
for (int i = 0; i < MAX_SB_SIZE; ++i) {
|
||||
|
|
@ -530,10 +530,10 @@ void AV1HighbdJntConvolve2DTest::RunSpeedTest(
|
|||
const int out_w = block_size_wide[block_idx];
|
||||
const int out_h = block_size_high[block_idx];
|
||||
|
||||
InterpFilterParams filter_params_x =
|
||||
const InterpFilterParams *filter_params_x =
|
||||
av1_get_interp_filter_params_with_block_size((InterpFilter)hfilter,
|
||||
out_w);
|
||||
InterpFilterParams filter_params_y =
|
||||
const InterpFilterParams *filter_params_y =
|
||||
av1_get_interp_filter_params_with_block_size((InterpFilter)vfilter,
|
||||
out_h);
|
||||
|
||||
|
|
@ -554,8 +554,8 @@ void AV1HighbdJntConvolve2DTest::RunSpeedTest(
|
|||
aom_usec_timer_start(&timer);
|
||||
for (int i = 0; i < num_loops; ++i)
|
||||
test_impl(input + offset_r * w + offset_c, w, output16, MAX_SB_SIZE, out_w,
|
||||
out_h, &filter_params_x, &filter_params_y, subx, suby,
|
||||
&conv_params, bd);
|
||||
out_h, filter_params_x, filter_params_y, subx, suby, &conv_params,
|
||||
bd);
|
||||
|
||||
aom_usec_timer_mark(&timer);
|
||||
const int elapsed_time = static_cast<int>(aom_usec_timer_elapsed(&timer));
|
||||
|
|
@ -589,10 +589,10 @@ void AV1HighbdJntConvolve2DTest::RunCheckOutput(
|
|||
const int out_h = block_size_high[block_idx];
|
||||
for (hfilter = EIGHTTAP_REGULAR; hfilter < INTERP_FILTERS_ALL; ++hfilter) {
|
||||
for (vfilter = EIGHTTAP_REGULAR; vfilter < INTERP_FILTERS_ALL; ++vfilter) {
|
||||
InterpFilterParams filter_params_x =
|
||||
const InterpFilterParams *filter_params_x =
|
||||
av1_get_interp_filter_params_with_block_size((InterpFilter)hfilter,
|
||||
out_w);
|
||||
InterpFilterParams filter_params_y =
|
||||
const InterpFilterParams *filter_params_y =
|
||||
av1_get_interp_filter_params_with_block_size((InterpFilter)vfilter,
|
||||
out_h);
|
||||
for (int do_average = 0; do_average <= 1; ++do_average) {
|
||||
|
|
@ -614,11 +614,11 @@ void AV1HighbdJntConvolve2DTest::RunCheckOutput(
|
|||
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);
|
||||
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);
|
||||
MAX_SB_SIZE, out_w, out_h, filter_params_x,
|
||||
filter_params_y, subx, suby, &conv_params2, bd);
|
||||
|
||||
for (int i = 0; i < out_h; ++i) {
|
||||
for (int j = 0; j < out_w; ++j) {
|
||||
|
|
@ -664,11 +664,11 @@ void AV1HighbdJntConvolve2DTest::RunCheckOutput(
|
|||
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);
|
||||
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);
|
||||
MAX_SB_SIZE, out_w, out_h, filter_params_x,
|
||||
filter_params_y, subx, suby, &conv_params2, bd);
|
||||
|
||||
for (int i = 0; i < out_h; ++i) {
|
||||
for (int j = 0; j < out_w; ++j) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue