Update aom to v1.0.0

Update aom to commit id d14c5bb4f336ef1842046089849dee4a301fbbf0.
This commit is contained in:
trav90 2018-10-19 21:52:15 -05:00 • committed by Roy Tam
commit 48f6d2e034
1087 changed files with 154333 additions and 265310 deletions

View file

@ -12,24 +12,26 @@
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include <vector>
#include "config/av1_rtcd.h"
#include "test/acm_random.h"
#include "test/util.h"
#include "test/av1_txfm_test.h"
#include "av1/common/av1_txfm.h"
#include "./av1_rtcd.h"
using libaom_test::ACMRandom;
using libaom_test::input_base;
using libaom_test::TYPE_TXFM;
using libaom_test::bd;
using libaom_test::compute_avg_abs_error;
using libaom_test::Fwd_Txfm2d_Func;
using libaom_test::TYPE_TXFM;
using libaom_test::input_base;
using std::vector;
namespace {
#if CONFIG_HIGHBITDEPTH
// tx_type_, tx_size_, max_error_, max_avg_error_
typedef std::tr1::tuple<TX_TYPE, TX_SIZE, double, double> AV1FwdTxfm2dParam;
typedef ::testing::tuple<TX_TYPE, TX_SIZE, double, double> AV1FwdTxfm2dParam;
class AV1FwdTxfm2d : public ::testing::TestWithParam<AV1FwdTxfm2dParam> {
public:
@ -39,22 +41,16 @@ class AV1FwdTxfm2d : public ::testing::TestWithParam<AV1FwdTxfm2dParam> {
max_error_ = GET_PARAM(2);
max_avg_error_ = GET_PARAM(3);
count_ = 500;
TXFM_2D_FLIP_CFG fwd_txfm_flip_cfg =
av1_get_fwd_txfm_cfg(tx_type_, tx_size_);
// TODO(sarahparker) this test will need to be updated when these
// functions are extended to support rectangular transforms
int amplify_bit = fwd_txfm_flip_cfg.row_cfg->shift[0] +
fwd_txfm_flip_cfg.row_cfg->shift[1] +
fwd_txfm_flip_cfg.row_cfg->shift[2];
TXFM_2D_FLIP_CFG fwd_txfm_flip_cfg;
av1_get_fwd_txfm_cfg(tx_type_, tx_size_, &fwd_txfm_flip_cfg);
amplify_factor_ = libaom_test::get_amplification_factor(tx_type_, tx_size_);
tx_width_ = tx_size_wide[fwd_txfm_flip_cfg.tx_size];
tx_height_ = tx_size_high[fwd_txfm_flip_cfg.tx_size];
ud_flip_ = fwd_txfm_flip_cfg.ud_flip;
lr_flip_ = fwd_txfm_flip_cfg.lr_flip;
amplify_factor_ =
amplify_bit >= 0 ? (1 << amplify_bit) : (1.0 / (1 << -amplify_bit));
fwd_txfm_ = libaom_test::fwd_txfm_func_ls[tx_size_];
txfm1d_size_ = libaom_test::get_txfm1d_size(tx_size_);
txfm2d_size_ = txfm1d_size_ * txfm1d_size_;
get_txfm1d_type(tx_type_, &type0_, &type1_);
txfm2d_size_ = tx_width_ * tx_height_;
input_ = reinterpret_cast<int16_t *>(
aom_memalign(16, sizeof(input_[0]) * txfm2d_size_));
output_ = reinterpret_cast<int32_t *>(
@ -76,33 +72,40 @@ class AV1FwdTxfm2d : public ::testing::TestWithParam<AV1FwdTxfm2dParam> {
ref_output_[ni] = 0;
}
fwd_txfm_(input_, output_, txfm1d_size_, tx_type_, bd);
fwd_txfm_(input_, output_, tx_width_, tx_type_, bd);
if (lr_flip_ && ud_flip_)
libaom_test::fliplrud(ref_input_, txfm1d_size_, txfm1d_size_);
else if (lr_flip_)
libaom_test::fliplr(ref_input_, txfm1d_size_, txfm1d_size_);
else if (ud_flip_)
libaom_test::flipud(ref_input_, txfm1d_size_, txfm1d_size_);
reference_hybrid_2d(ref_input_, ref_output_, txfm1d_size_, type0_,
type1_);
for (int ni = 0; ni < txfm2d_size_; ++ni) {
ref_output_[ni] = round(ref_output_[ni] * amplify_factor_);
EXPECT_GE(max_error_,
fabs(output_[ni] - ref_output_[ni]) / amplify_factor_);
if (lr_flip_ && ud_flip_) {
libaom_test::fliplrud(ref_input_, tx_width_, tx_height_, tx_width_);
} else if (lr_flip_) {
libaom_test::fliplr(ref_input_, tx_width_, tx_height_, tx_width_);
} else if (ud_flip_) {
libaom_test::flipud(ref_input_, tx_width_, tx_height_, tx_width_);
}
libaom_test::reference_hybrid_2d(ref_input_, ref_output_, tx_type_,
tx_size_);
double actual_max_error = 0;
for (int ni = 0; ni < txfm2d_size_; ++ni) {
ref_output_[ni] = round(ref_output_[ni]);
const double this_error =
fabs(output_[ni] - ref_output_[ni]) / amplify_factor_;
actual_max_error = AOMMAX(actual_max_error, this_error);
}
EXPECT_GE(max_error_, actual_max_error)
<< "tx_size = " << tx_size_ << ", tx_type = " << tx_type_;
if (actual_max_error > max_error_) { // exit early.
break;
}
avg_abs_error += compute_avg_abs_error<int32_t, double>(
output_, ref_output_, txfm2d_size_);
}
avg_abs_error /= amplify_factor_;
avg_abs_error /= count_;
// max_abs_avg_error comes from upper bound of avg_abs_error
// printf("type0: %d type1: %d txfm_size: %d accuracy_avg_abs_error:
// %f\n", type0_, type1_, txfm1d_size_, avg_abs_error);
EXPECT_GE(max_avg_error_, avg_abs_error);
EXPECT_GE(max_avg_error_, avg_abs_error)
<< "tx_size = " << tx_size_ << ", tx_type = " << tx_type_;
}
virtual void TearDown() {
@ -119,11 +122,10 @@ class AV1FwdTxfm2d : public ::testing::TestWithParam<AV1FwdTxfm2dParam> {
double amplify_factor_;
TX_TYPE tx_type_;
TX_SIZE tx_size_;
int txfm1d_size_;
int tx_width_;
int tx_height_;
int txfm2d_size_;
Fwd_Txfm2d_Func fwd_txfm_;
TYPE_TXFM type0_;
TYPE_TXFM type1_;
FwdTxfm2dFunc fwd_txfm_;
int16_t *input_;
int32_t *output_;
double *ref_input_;
@ -132,76 +134,209 @@ class AV1FwdTxfm2d : public ::testing::TestWithParam<AV1FwdTxfm2dParam> {
int lr_flip_; // flip left to right
};
TEST_P(AV1FwdTxfm2d, RunFwdAccuracyCheck) { RunFwdAccuracyCheck(); }
const AV1FwdTxfm2dParam av1_fwd_txfm2d_param_c[] = {
#if CONFIG_EXT_TX
AV1FwdTxfm2dParam(FLIPADST_DCT, TX_4X4, 2, 0.2),
AV1FwdTxfm2dParam(DCT_FLIPADST, TX_4X4, 2, 0.2),
AV1FwdTxfm2dParam(FLIPADST_FLIPADST, TX_4X4, 2, 0.2),
AV1FwdTxfm2dParam(ADST_FLIPADST, TX_4X4, 2, 0.2),
AV1FwdTxfm2dParam(FLIPADST_ADST, TX_4X4, 2, 0.2),
AV1FwdTxfm2dParam(FLIPADST_DCT, TX_8X8, 5, 0.6),
AV1FwdTxfm2dParam(DCT_FLIPADST, TX_8X8, 5, 0.6),
AV1FwdTxfm2dParam(FLIPADST_FLIPADST, TX_8X8, 5, 0.6),
AV1FwdTxfm2dParam(ADST_FLIPADST, TX_8X8, 5, 0.6),
AV1FwdTxfm2dParam(FLIPADST_ADST, TX_8X8, 5, 0.6),
AV1FwdTxfm2dParam(FLIPADST_DCT, TX_16X16, 11, 1.5),
AV1FwdTxfm2dParam(DCT_FLIPADST, TX_16X16, 11, 1.5),
AV1FwdTxfm2dParam(FLIPADST_FLIPADST, TX_16X16, 11, 1.5),
AV1FwdTxfm2dParam(ADST_FLIPADST, TX_16X16, 11, 1.5),
AV1FwdTxfm2dParam(FLIPADST_ADST, TX_16X16, 11, 1.5),
AV1FwdTxfm2dParam(FLIPADST_DCT, TX_32X32, 70, 7),
AV1FwdTxfm2dParam(DCT_FLIPADST, TX_32X32, 70, 7),
AV1FwdTxfm2dParam(FLIPADST_FLIPADST, TX_32X32, 70, 7),
AV1FwdTxfm2dParam(ADST_FLIPADST, TX_32X32, 70, 7),
AV1FwdTxfm2dParam(FLIPADST_ADST, TX_32X32, 70, 7),
#endif
AV1FwdTxfm2dParam(DCT_DCT, TX_4X4, 2, 0.2),
AV1FwdTxfm2dParam(ADST_DCT, TX_4X4, 2, 0.2),
AV1FwdTxfm2dParam(DCT_ADST, TX_4X4, 2, 0.2),
AV1FwdTxfm2dParam(ADST_ADST, TX_4X4, 2, 0.2),
AV1FwdTxfm2dParam(DCT_DCT, TX_8X8, 5, 0.6),
AV1FwdTxfm2dParam(ADST_DCT, TX_8X8, 5, 0.6),
AV1FwdTxfm2dParam(DCT_ADST, TX_8X8, 5, 0.6),
AV1FwdTxfm2dParam(ADST_ADST, TX_8X8, 5, 0.6),
AV1FwdTxfm2dParam(DCT_DCT, TX_16X16, 11, 1.5),
AV1FwdTxfm2dParam(ADST_DCT, TX_16X16, 11, 1.5),
AV1FwdTxfm2dParam(DCT_ADST, TX_16X16, 11, 1.5),
AV1FwdTxfm2dParam(ADST_ADST, TX_16X16, 11, 1.5),
AV1FwdTxfm2dParam(DCT_DCT, TX_32X32, 70, 7),
AV1FwdTxfm2dParam(ADST_DCT, TX_32X32, 70, 7),
AV1FwdTxfm2dParam(DCT_ADST, TX_32X32, 70, 7),
AV1FwdTxfm2dParam(ADST_ADST, TX_32X32, 70, 7)
static double avg_error_ls[TX_SIZES_ALL] = {
0.5, // 4x4 transform
0.5, // 8x8 transform
1.2, // 16x16 transform
6.1, // 32x32 transform
3.4, // 64x64 transform
0.57, // 4x8 transform
0.68, // 8x4 transform
0.92, // 8x16 transform
1.1, // 16x8 transform
4.1, // 16x32 transform
6, // 32x16 transform
3.5, // 32x64 transform
5.7, // 64x32 transform
0.6, // 4x16 transform
0.9, // 16x4 transform
1.2, // 8x32 transform
1.7, // 32x8 transform
2.0, // 16x64 transform
4.7, // 64x16 transform
};
static double max_error_ls[TX_SIZES_ALL] = {
3, // 4x4 transform
5, // 8x8 transform
11, // 16x16 transform
70, // 32x32 transform
64, // 64x64 transform
3.9, // 4x8 transform
4.3, // 8x4 transform
12, // 8x16 transform
12, // 16x8 transform
32, // 16x32 transform
46, // 32x16 transform
136, // 32x64 transform
136, // 64x32 transform
5, // 4x16 transform
6, // 16x4 transform
21, // 8x32 transform
13, // 32x8 transform
30, // 16x64 transform
36, // 64x16 transform
};
vector<AV1FwdTxfm2dParam> GetTxfm2dParamList() {
vector<AV1FwdTxfm2dParam> param_list;
for (int s = 0; s < TX_SIZES; ++s) {
const double max_error = max_error_ls[s];
const double avg_error = avg_error_ls[s];
for (int t = 0; t < TX_TYPES; ++t) {
const TX_TYPE tx_type = static_cast<TX_TYPE>(t);
const TX_SIZE tx_size = static_cast<TX_SIZE>(s);
if (libaom_test::IsTxSizeTypeValid(tx_size, tx_type)) {
param_list.push_back(
AV1FwdTxfm2dParam(tx_type, tx_size, max_error, avg_error));
}
}
}
return param_list;
}
INSTANTIATE_TEST_CASE_P(C, AV1FwdTxfm2d,
::testing::ValuesIn(av1_fwd_txfm2d_param_c));
::testing::ValuesIn(GetTxfm2dParamList()));
TEST_P(AV1FwdTxfm2d, RunFwdAccuracyCheck) { RunFwdAccuracyCheck(); }
TEST(AV1FwdTxfm2d, CfgTest) {
for (int bd_idx = 0; bd_idx < BD_NUM; ++bd_idx) {
int bd = libaom_test::bd_arr[bd_idx];
int8_t low_range = libaom_test::low_range_arr[bd_idx];
int8_t high_range = libaom_test::high_range_arr[bd_idx];
// TODO(angiebird): include rect txfm in this test
for (int tx_size = 0; tx_size < TX_SIZES; ++tx_size) {
for (int tx_size = 0; tx_size < TX_SIZES_ALL; ++tx_size) {
for (int tx_type = 0; tx_type < TX_TYPES; ++tx_type) {
TXFM_2D_FLIP_CFG cfg = av1_get_fwd_txfm_cfg(
static_cast<TX_TYPE>(tx_type), static_cast<TX_SIZE>(tx_size));
if (libaom_test::IsTxSizeTypeValid(static_cast<TX_SIZE>(tx_size),
static_cast<TX_TYPE>(tx_type)) ==
false) {
continue;
}
TXFM_2D_FLIP_CFG cfg;
av1_get_fwd_txfm_cfg(static_cast<TX_TYPE>(tx_type),
static_cast<TX_SIZE>(tx_size), &cfg);
int8_t stage_range_col[MAX_TXFM_STAGE_NUM];
int8_t stage_range_row[MAX_TXFM_STAGE_NUM];
av1_gen_fwd_stage_range(stage_range_col, stage_range_row, &cfg, bd);
const TXFM_1D_CFG *col_cfg = cfg.col_cfg;
const TXFM_1D_CFG *row_cfg = cfg.row_cfg;
libaom_test::txfm_stage_range_check(stage_range_col, col_cfg->stage_num,
col_cfg->cos_bit, low_range,
libaom_test::txfm_stage_range_check(stage_range_col, cfg.stage_num_col,
cfg.cos_bit_col, low_range,
high_range);
libaom_test::txfm_stage_range_check(stage_range_row, row_cfg->stage_num,
row_cfg->cos_bit, low_range,
libaom_test::txfm_stage_range_check(stage_range_row, cfg.stage_num_row,
cfg.cos_bit_row, low_range,
high_range);
}
}
}
}
#endif // CONFIG_HIGHBITDEPTH
typedef void (*lowbd_fwd_txfm_func)(const int16_t *src_diff, tran_low_t *coeff,
int diff_stride, TxfmParam *txfm_param);
void AV1FwdTxfm2dMatchTest(TX_SIZE tx_size, lowbd_fwd_txfm_func target_func) {
const int bd = 8;
TxfmParam param;
memset(&param, 0, sizeof(param));
const int rows = tx_size_high[tx_size];
const int cols = tx_size_wide[tx_size];
// printf("%d x %d\n", cols, rows);
for (int tx_type = 0; tx_type < TX_TYPES; ++tx_type) {
if (libaom_test::IsTxSizeTypeValid(
tx_size, static_cast<TX_TYPE>(tx_type)) == false) {
continue;
}
FwdTxfm2dFunc ref_func = libaom_test::fwd_txfm_func_ls[tx_size];
if (ref_func != NULL) {
DECLARE_ALIGNED(16, int16_t, input[64 * 64]) = { 0 };
DECLARE_ALIGNED(16, int32_t, output[64 * 64]);
DECLARE_ALIGNED(16, int32_t, ref_output[64 * 64]);
int input_stride = 64;
ACMRandom rnd(ACMRandom::DeterministicSeed());
for (int cnt = 0; cnt < 500; ++cnt) {
if (cnt == 0) {
for (int r = 0; r < rows; ++r) {
for (int c = 0; c < cols; ++c) {
input[r * input_stride + c] = (1 << bd) - 1;
}
}
} else {
for (int r = 0; r < rows; ++r) {
for (int c = 0; c < cols; ++c) {
input[r * input_stride + c] = rnd.Rand16() % (1 << bd);
}
}
}
param.tx_type = (TX_TYPE)tx_type;
param.tx_size = (TX_SIZE)tx_size;
param.tx_set_type = EXT_TX_SET_ALL16;
param.bd = bd;
ref_func(input, ref_output, input_stride, (TX_TYPE)tx_type, bd);
target_func(input, output, input_stride, &param);
const int check_rows = AOMMIN(32, rows);
const int check_cols = AOMMIN(32, rows * cols / check_rows);
for (int r = 0; r < check_rows; ++r) {
for (int c = 0; c < check_cols; ++c) {
ASSERT_EQ(ref_output[r * check_cols + c],
output[r * check_cols + c])
<< "[" << r << "," << c << "] cnt:" << cnt
<< " tx_size: " << tx_size << " tx_type: " << tx_type;
}
}
}
}
}
}
typedef ::testing::tuple<TX_SIZE, lowbd_fwd_txfm_func> LbdFwdTxfm2dParam;
class AV1FwdTxfm2dTest : public ::testing::TestWithParam<LbdFwdTxfm2dParam> {};
TEST_P(AV1FwdTxfm2dTest, match) {
AV1FwdTxfm2dMatchTest(GET_PARAM(0), GET_PARAM(1));
}
using ::testing::Combine;
using ::testing::Values;
using ::testing::ValuesIn;
#if HAVE_SSE2
static TX_SIZE fwd_txfm_for_sse2[] = {
TX_4X4,
TX_8X8,
TX_16X16,
TX_32X32,
// TX_64X64,
TX_4X8,
TX_8X4,
TX_8X16,
TX_16X8,
TX_16X32,
TX_32X16,
// TX_32X64,
// TX_64X32,
TX_4X16,
TX_16X4,
TX_8X32,
TX_32X8,
TX_16X64,
TX_64X16,
};
INSTANTIATE_TEST_CASE_P(SSE2, AV1FwdTxfm2dTest,
Combine(ValuesIn(fwd_txfm_for_sse2),
Values(av1_lowbd_fwd_txfm_sse2)));
#endif // HAVE_SSE2
#if HAVE_SSE4_1
static TX_SIZE fwd_txfm_for_sse41[] = {
TX_4X4,
TX_64X64,
TX_32X64,
TX_64X32,
};
INSTANTIATE_TEST_CASE_P(SSE4_1, AV1FwdTxfm2dTest,
Combine(ValuesIn(fwd_txfm_for_sse41),
Values(av1_lowbd_fwd_txfm_sse4_1)));
#endif // HAVE_SSE4_1
} // namespace