Skip to content
GitLab
Commit 3d13a988 authored by Jingning Han's avatar Jingning Han Committed by Gerrit Code Review
Browse files

Merge "Fix aligned memory allocation in unit tests"

parents f36f66cd 9b744ce3
v1.14.0-linphone 1.4.X experimental feature/update_to_v1.9.0-linphone feature/uwp_nuget forest frame_parallel highbitdepth indianrunnerduck javanwhistlingduck khakicampbell linphone linphone-android linphone-old longtailedduck m31-baseline m49-2623 m52-2743 m54-2840 m56-2924 m66-3359 m68-3440 mandarinduck mcw mcw2 nextgen nextgenv2 pcs-2013 playground sandbox/Jingning/experimental sandbox/Jingning/transcode sandbox/Jingning/vpx sandbox/aconverse@google.com/ansbench sandbox/debargha/playground sandbox/hkuang/frame_parallel sandbox/hkuang@google.com/decode sandbox/jimbankoski@google.com/proposed-aom sandbox/jingning@google.com/decoder_test_suite sandbox/jingning@google.com/experimental sandbox/jzern@google.com/test sandbox/wangch@google.com/vp9 sandbox/yaowu@google.com/mergeaom stable-vp9-decoder v1.12.0-linphone v1.6.1_linphone v1.7.0-linphone v1.9.0-linphone v1.9.0 v1.9.0-rc1 v1.8.2 v1.8.1 v1.8.0 v1.7.0 v1.6.1 v1.6.0 v1.5.0 v1.4.0 v1.3.0
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 18 additions and 13 deletions
test/fdct4x4_test.cc
+ 7
− 5
View file @ 3d13a988
...@@ -20,6 +20,7 @@ extern "C" { ...@@ -20,6 +20,7 @@ extern "C" {
#include "acm_random.h" #include "acm_random.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
#include "vpx_ports/mem.h"
using libvpx_test::ACMRandom; using libvpx_test::ACMRandom;
...@@ -77,8 +78,8 @@ class FwdTrans4x4Test : public ::testing::TestWithParam<int> { ...@@ -77,8 +78,8 @@ class FwdTrans4x4Test : public ::testing::TestWithParam<int> {
TEST_P(FwdTrans4x4Test, SignBiasCheck) { TEST_P(FwdTrans4x4Test, SignBiasCheck) {
ACMRandom rnd(ACMRandom::DeterministicSeed()); ACMRandom rnd(ACMRandom::DeterministicSeed());
int16_t test_input_block[16]; DECLARE_ALIGNED_ARRAY(16, int16_t, test_input_block, 16);
int16_t test_output_block[16]; DECLARE_ALIGNED_ARRAY(16, int16_t, test_output_block, 16);
const int pitch = 8; const int pitch = 8;
int count_sign_block[16][2]; int count_sign_block[16][2];
const int count_test_block = 1000000; const int count_test_block = 1000000;
...@@ -140,9 +141,10 @@ TEST_P(FwdTrans4x4Test, RoundTripErrorCheck) { ...@@ -140,9 +141,10 @@ TEST_P(FwdTrans4x4Test, RoundTripErrorCheck) {
double total_error = 0; double total_error = 0;
const int count_test_block = 1000000; const int count_test_block = 1000000;
for (int i = 0; i < count_test_block; ++i) { for (int i = 0; i < count_test_block; ++i) {
int16_t test_input_block[16]; DECLARE_ALIGNED_ARRAY(16, int16_t, test_input_block, 16);
int16_t test_temp_block[16]; DECLARE_ALIGNED_ARRAY(16, int16_t, test_temp_block, 16);
uint8_t dst[16], src[16]; DECLARE_ALIGNED_ARRAY(16, uint8_t, dst, 16);
DECLARE_ALIGNED_ARRAY(16, uint8_t, src, 16);
for (int j = 0; j < 16; ++j) { for (int j = 0; j < 16; ++j) {
src[j] = rnd.Rand8(); src[j] = rnd.Rand8();
......
test/fdct8x8_test.cc
+ 11
− 8
View file @ 3d13a988
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <string.h> #include <string.h>
#include "third_party/googletest/src/include/gtest/gtest.h" #include "third_party/googletest/src/include/gtest/gtest.h"
#include "vpx_ports/mem.h"
extern "C" { extern "C" {
#include "vp9_rtcd.h" #include "vp9_rtcd.h"
...@@ -81,8 +82,8 @@ class FwdTrans8x8Test : public ::testing::TestWithParam<int> { ...@@ -81,8 +82,8 @@ class FwdTrans8x8Test : public ::testing::TestWithParam<int> {
TEST_P(FwdTrans8x8Test, SignBiasCheck) { TEST_P(FwdTrans8x8Test, SignBiasCheck) {
ACMRandom rnd(ACMRandom::DeterministicSeed()); ACMRandom rnd(ACMRandom::DeterministicSeed());
int16_t test_input_block[64]; DECLARE_ALIGNED_ARRAY(16, int16_t, test_input_block, 64);
int16_t test_output_block[64]; DECLARE_ALIGNED_ARRAY(16, int16_t, test_output_block, 64);
const int pitch = 16; const int pitch = 16;
int count_sign_block[64][2]; int count_sign_block[64][2];
const int count_test_block = 100000; const int count_test_block = 100000;
...@@ -152,9 +153,10 @@ TEST_P(FwdTrans8x8Test, RoundTripErrorCheck) { ...@@ -152,9 +153,10 @@ TEST_P(FwdTrans8x8Test, RoundTripErrorCheck) {
double total_error = 0; double total_error = 0;
const int count_test_block = 100000; const int count_test_block = 100000;
for (int i = 0; i < count_test_block; ++i) { for (int i = 0; i < count_test_block; ++i) {
int16_t test_input_block[64]; DECLARE_ALIGNED_ARRAY(16, int16_t, test_input_block, 64);
int16_t test_temp_block[64]; DECLARE_ALIGNED_ARRAY(16, int16_t, test_temp_block, 64);
uint8_t dst[64], src[64]; DECLARE_ALIGNED_ARRAY(16, uint8_t, dst, 64);
DECLARE_ALIGNED_ARRAY(16, uint8_t, src, 64);
for (int j = 0; j < 64; ++j) { for (int j = 0; j < 64; ++j) {
src[j] = rnd.Rand8(); src[j] = rnd.Rand8();
...@@ -202,9 +204,10 @@ TEST_P(FwdTrans8x8Test, ExtremalCheck) { ...@@ -202,9 +204,10 @@ TEST_P(FwdTrans8x8Test, ExtremalCheck) {
double total_error = 0; double total_error = 0;
const int count_test_block = 100000; const int count_test_block = 100000;
for (int i = 0; i < count_test_block; ++i) { for (int i = 0; i < count_test_block; ++i) {
int16_t test_input_block[64]; DECLARE_ALIGNED_ARRAY(16, int16_t, test_input_block, 64);
int16_t test_temp_block[64]; DECLARE_ALIGNED_ARRAY(16, int16_t, test_temp_block, 64);
uint8_t dst[64], src[64]; DECLARE_ALIGNED_ARRAY(16, uint8_t, dst, 64);
DECLARE_ALIGNED_ARRAY(16, uint8_t, src, 64);
for (int j = 0; j < 64; ++j) { for (int j = 0; j < 64; ++j) {
src[j] = rnd.Rand8() % 2 ? 255 : 0; src[j] = rnd.Rand8() % 2 ? 255 : 0;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment