generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

AnsTest: Replace the dummy distribution

Browse Source 
Use constrained token table row 65/256 instead.

Change-Id: I8b442d4c82af8fa9d36ac2de0d73179ed040478d
(cherry picked from commit 47eb9a2ca46821b468903514cd34eaaca2533d45)
This commit is contained in:
Alex Converse
2016-09-09 10:30:36 -07:00
parent fc4980edb7
commit cba3d1f1c3
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
test/ans_test.cc
View File

@@ -74,15 +74,18 @@ bool check_uabs(const PvVec &pv_vec, uint8_t *buf) {
return ans_read_end(&d); return ans_read_end(&d);
} }
// TODO(aconverse@google.com): replace this with a more representative const aom_cdf_prob spareto65[] = { 260, 188, 138, 102, 133, 122, 64, 15, 1, 1 };
// distribution from the codec.
const rans_sym rans_sym_tab[] = {
{ 67, 0 }, { 99, 67 }, { 575, 166 }, { 283, 741 },
};
const int kRansSymbols =
static_cast<int>(sizeof(rans_sym_tab) / sizeof(rans_sym_tab[0]));
std::vector<int> ans_encode_build_vals(const rans_sym *tab, int iters) { const int kRansSymbols =
static_cast<int>(sizeof(spareto65) / sizeof(spareto65[0]));
std::vector<int> ans_encode_build_vals(rans_sym *const tab, int iters) {
aom_cdf_prob sum = 0;
for (int i = 0; i < kRansSymbols; ++i) {
tab[i].cum_prob = sum;
tab[i].prob = spareto65[i];
sum += spareto65[i];
}
std::vector<int> p_to_sym; std::vector<int> p_to_sym;
for (int i = 0; i < kRansSymbols; ++i) { for (int i = 0; i < kRansSymbols; ++i) {
p_to_sym.insert(p_to_sym.end(), tab[i].prob, i); p_to_sym.insert(p_to_sym.end(), tab[i].prob, i);
@@ -150,16 +153,20 @@ PvVec AbsTest::pv_vec_;
class AnsTest : public ::testing::Test { class AnsTest : public ::testing::Test {
protected: protected:
static void SetUpTestCase() { static void SetUpTestCase() {
sym_vec_ = ans_encode_build_vals(rans_sym_tab, kNumSyms); sym_vec_ = ans_encode_build_vals(rans_sym_tab_, kNumSyms);
} }
virtual void SetUp() { buf_ = new uint8_t[kNumSyms / 2]; } virtual void SetUp() { buf_ = new uint8_t[kNumSyms / 2]; }
virtual void TearDown() { delete[] buf_; } virtual void TearDown() { delete[] buf_; }
static const int kNumSyms = 25000000; static const int kNumSyms = 25000000;
static std::vector<int> sym_vec_; static std::vector<int> sym_vec_;
static rans_sym rans_sym_tab_[kRansSymbols];
uint8_t *buf_; uint8_t *buf_;
}; };
std::vector<int> AnsTest::sym_vec_; std::vector<int> AnsTest::sym_vec_;
rans_sym AnsTest::rans_sym_tab_[kRansSymbols];
TEST_F(AbsTest, Uabs) { EXPECT_TRUE(check_uabs(pv_vec_, buf_)); } TEST_F(AbsTest, Uabs) { EXPECT_TRUE(check_uabs(pv_vec_, buf_)); }
TEST_F(AnsTest, Rans) { EXPECT_TRUE(check_rans(sym_vec_, rans_sym_tab, buf_)); } TEST_F(AnsTest, Rans) {
EXPECT_TRUE(check_rans(sym_vec_, rans_sym_tab_, buf_));
}
} // namespace } // namespace