This commit bring all up-to-date changes from master that are applicable to nextgenv2. Due to the remove VP10 code in master, we had to cherry pick the following commits to get those changes: Add default flags for arm64/armv8 builds Allows building simple targets with sane default flags. For example, using the Android arm64 toolchain from the NDK: https://developer.android.com/ndk/guides/standalone_toolchain.html ./build/tools/make-standalone-toolchain.sh --arch=arm64 \ --platform=android-24 --install-dir=/tmp/arm64 CROSS=/tmp/arm64/bin/aarch64-linux-android- \ ~/libvpx/configure --target=arm64-linux-gcc --disable-multithread BUG=webm:1143 vpx_lpf_horizontal_4_sse2: Remove dead load. Change-Id: I51026c52baa1f0881fcd5b68e1fdf08a2dc0916e Fail early when android target does not include --sdk-path Change-Id: I07e7e63476a2e32e3aae123abdee8b7bbbdc6a8c configure: clean up var style and set_all usage Use quotes whenever possible and {} always for variables. Replace multiple set_all calls with *able_feature(). Conflicts: build/make/configure.sh vp9-svc: Remove some unneeded code/comment. datarate_test,DatarateTestLarge: normalize bits type quiets a msvc warning: conversion from 'const int64_t' to 'size_t', possible loss of data mips added p6600 cpu support Removed -funroll-loops psnr.c: use int64_t for sum of differences Since the values can be negative. *.asm: normalize label format add a trailing ':', though it's optional with the tools we support, it's more common to use it to mark a label. this also quiets the orphan-labels warning with nasm/yasm. BUG=b/29583530 Prevent negative variance Due to rounding, hbd variance may become negative. This commit put in check and clamp of negative values to 0. configure: remove old visual studio support (<2010) BUG=b/29583530 Conflicts: configure configure: restore vs_version variable inadvertently lost in the final patchset of:078dff7configure: remove old visual studio support (<2010) this prevents an empty CONFIG_VS_VERSION and avoids make failure Require x86inc.asm Force enable x86inc.asm when building for x86. Previously there were compatibility issues so a flag was added to simplify disabling this code. The known issues have been resolved and x86inc.asm is the preferred abstraction layer (over x86_abi_support.asm). BUG=b:29583530 convolve_test: fix byte offsets in hbd build CONVERT_TO_BYTEPTR(x) was corrected in:003a9d2Port metric computation changes from nextgenv2 to use the more common (x) within the expansion. offsets should occur after converting the pointer to the desired type. + factorized some common expressions Conflicts: test/convolve_test.cc vpx_dsp: remove x86inc.asm distinction BUG=b:29583530 Conflicts: vpx_dsp/vpx_dsp.mk vpx_dsp/vpx_dsp_rtcd_defs.pl vpx_dsp/x86/highbd_variance_sse2.c vpx_dsp/x86/variance_sse2.c test: remove x86inc.asm distinction BUG=b:29583530 Conflicts: test/vp9_subtract_test.cc configure: remove x86inc.asm distinction BUG=b:29583530 Change-Id: I59a1192142e89a6a36b906f65a491a734e603617 Update vpx subpixel 1d filter ssse3 asm Speed test shows the new vertical filters have degradation on Celeron Chromebook. Added "X86_SUBPIX_VFILTER_PREFER_SLOW_CELERON" to control the vertical filters activated code. Now just simply active the code without degradation on Celeron. Later there should be 2 set of vertical filters ssse3 functions, and let jump table to choose based on CPU type. improve vpx_filter_block1d* based on replace paddsw+psrlw to pmulhrsw Make set_reference control API work in VP9 Moved the API patch from NextGenv2. An example was included. To try it, for example, run the following command: $ examples/vpx_cx_set_ref vp9 352 288 in.yuv out.ivf 4 30 Conflicts: examples.mk examples/vpx_cx_set_ref.c test/cx_set_ref.sh vp9/decoder/vp9_decoder.c deblock filter : moved from vp8 code branch The deblocking filters used in vp8 have been moved to vpx_dsp for use by both vp8 and vp9. vpx_thread.[hc]: update webp source reference + drop the blob hash, the updated reference will be updated in the commit message BUG=b/29583578 vpx_thread: use native windows cond var if available BUG=b/29583578 original webp change: commit 110ad5835ecd66995d0e7f66dca1b90dea595f5a Author: James Zern <jzern@google.com> Date: Mon Nov 23 19:49:58 2015 -0800 thread: use native windows cond var if available Vista / Server 2008 and up. no speed difference observed. 100644 blob 4fc372b7bc6980a9ed3618c8cce5b67ed7b0f412 src/utils/thread.c 100644 blob 840831185502d42a3246e4b7ff870121c8064791 src/utils/thread.h vpx_thread: use InitializeCriticalSectionEx if available BUG=b/29583578 original webp change: commit 63fadc9ffacc77d4617526a50c696d21d558a70b Author: James Zern <jzern@google.com> Date: Mon Nov 23 20:38:46 2015 -0800 thread: use InitializeCriticalSectionEx if available Windows Vista / Server 2008 and up 100644 blob f84207d89b3a6bb98bfe8f3fa55cad72dfd061ff src/utils/thread.c 100644 blob 840831185502d42a3246e4b7ff870121c8064791 src/utils/thread.h vpx_thread: use WaitForSingleObjectEx if available BUG=b/29583578 original webp change: commit 0fd0e12bfe83f16ce4f1c038b251ccbc13c62ac2 Author: James Zern <jzern@google.com> Date: Mon Nov 23 20:40:26 2015 -0800 thread: use WaitForSingleObjectEx if available Windows XP and up 100644 blob d58f74e5523dbc985fc531cf5f0833f1e9157cf0 src/utils/thread.c 100644 blob 840831185502d42a3246e4b7ff870121c8064791 src/utils/thread.h vpx_thread: use CreateThread for windows phone BUG=b/29583578 original webp change: commit d2afe974f9d751de144ef09d31255aea13b442c0 Author: James Zern <jzern@google.com> Date: Mon Nov 23 20:41:26 2015 -0800 thread: use CreateThread for windows phone _beginthreadex is unavailable for winrt/uwp Change-Id: Ie7412a568278ac67f0047f1764e2521193d74d4d 100644 blob 93f7622797f05f6acc1126e8296c481d276e4047 src/utils/thread.c 100644 blob 840831185502d42a3246e4b7ff870121c8064791 src/utils/thread.h vp9_postproc.c missing extern. BUG=webm:1256 deblock: missing const on extern const. postproc - move filling of noise buffer to vpx_dsp. Fix encoder crashes for odd size input clean-up vp9_intrapred_test remove tuple and overkill VP9IntraPredBase class. postproc: noise style fixes. gtest-all.cc: quiet an unused variable warning under windows / mingw builds vp9_intrapred_test: follow-up cleanup address few comments fromce050afaf3Change-Id: I3eece7efa9335f4210303993ef6c1857ad5c29c8
344 lines
11 KiB
C++
344 lines
11 KiB
C++
/*
|
|
* Copyright (c) 2013 The WebM project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include <math.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "third_party/googletest/src/include/gtest/gtest.h"
|
|
|
|
#include "./vp9_rtcd.h"
|
|
#include "./vpx_dsp_rtcd.h"
|
|
#include "test/acm_random.h"
|
|
#include "test/clear_system_state.h"
|
|
#include "test/register_state_check.h"
|
|
#include "test/util.h"
|
|
#include "vp9/common/vp9_blockd.h"
|
|
#include "vp9/common/vp9_scan.h"
|
|
#include "vpx/vpx_integer.h"
|
|
|
|
using libvpx_test::ACMRandom;
|
|
|
|
namespace {
|
|
typedef void (*FwdTxfmFunc)(const int16_t *in, tran_low_t *out, int stride);
|
|
typedef void (*InvTxfmFunc)(const tran_low_t *in, uint8_t *out, int stride);
|
|
typedef std::tr1::tuple<FwdTxfmFunc,
|
|
InvTxfmFunc,
|
|
InvTxfmFunc,
|
|
TX_SIZE, int> PartialInvTxfmParam;
|
|
const int kMaxNumCoeffs = 1024;
|
|
class PartialIDctTest : public ::testing::TestWithParam<PartialInvTxfmParam> {
|
|
public:
|
|
virtual ~PartialIDctTest() {}
|
|
virtual void SetUp() {
|
|
ftxfm_ = GET_PARAM(0);
|
|
full_itxfm_ = GET_PARAM(1);
|
|
partial_itxfm_ = GET_PARAM(2);
|
|
tx_size_ = GET_PARAM(3);
|
|
last_nonzero_ = GET_PARAM(4);
|
|
}
|
|
|
|
virtual void TearDown() { libvpx_test::ClearSystemState(); }
|
|
|
|
protected:
|
|
int last_nonzero_;
|
|
TX_SIZE tx_size_;
|
|
FwdTxfmFunc ftxfm_;
|
|
InvTxfmFunc full_itxfm_;
|
|
InvTxfmFunc partial_itxfm_;
|
|
};
|
|
|
|
TEST_P(PartialIDctTest, RunQuantCheck) {
|
|
ACMRandom rnd(ACMRandom::DeterministicSeed());
|
|
int size;
|
|
switch (tx_size_) {
|
|
case TX_4X4:
|
|
size = 4;
|
|
break;
|
|
case TX_8X8:
|
|
size = 8;
|
|
break;
|
|
case TX_16X16:
|
|
size = 16;
|
|
break;
|
|
case TX_32X32:
|
|
size = 32;
|
|
break;
|
|
default:
|
|
FAIL() << "Wrong Size!";
|
|
break;
|
|
}
|
|
DECLARE_ALIGNED(16, tran_low_t, test_coef_block1[kMaxNumCoeffs]);
|
|
DECLARE_ALIGNED(16, tran_low_t, test_coef_block2[kMaxNumCoeffs]);
|
|
DECLARE_ALIGNED(16, uint8_t, dst1[kMaxNumCoeffs]);
|
|
DECLARE_ALIGNED(16, uint8_t, dst2[kMaxNumCoeffs]);
|
|
|
|
const int count_test_block = 1000;
|
|
const int block_size = size * size;
|
|
|
|
DECLARE_ALIGNED(16, int16_t, input_extreme_block[kMaxNumCoeffs]);
|
|
DECLARE_ALIGNED(16, tran_low_t, output_ref_block[kMaxNumCoeffs]);
|
|
|
|
int max_error = 0;
|
|
for (int i = 0; i < count_test_block; ++i) {
|
|
// clear out destination buffer
|
|
memset(dst1, 0, sizeof(*dst1) * block_size);
|
|
memset(dst2, 0, sizeof(*dst2) * block_size);
|
|
memset(test_coef_block1, 0, sizeof(*test_coef_block1) * block_size);
|
|
memset(test_coef_block2, 0, sizeof(*test_coef_block2) * block_size);
|
|
|
|
ACMRandom rnd(ACMRandom::DeterministicSeed());
|
|
|
|
for (int i = 0; i < count_test_block; ++i) {
|
|
// Initialize a test block with input range [-255, 255].
|
|
if (i == 0) {
|
|
for (int j = 0; j < block_size; ++j)
|
|
input_extreme_block[j] = 255;
|
|
} else if (i == 1) {
|
|
for (int j = 0; j < block_size; ++j)
|
|
input_extreme_block[j] = -255;
|
|
} else {
|
|
for (int j = 0; j < block_size; ++j) {
|
|
input_extreme_block[j] = rnd.Rand8() % 2 ? 255 : -255;
|
|
}
|
|
}
|
|
|
|
ftxfm_(input_extreme_block, output_ref_block, size);
|
|
|
|
// quantization with maximum allowed step sizes
|
|
test_coef_block1[0] = (output_ref_block[0] / 1336) * 1336;
|
|
for (int j = 1; j < last_nonzero_; ++j)
|
|
test_coef_block1[vp9_default_scan_orders[tx_size_].scan[j]]
|
|
= (output_ref_block[j] / 1828) * 1828;
|
|
}
|
|
|
|
ASM_REGISTER_STATE_CHECK(full_itxfm_(test_coef_block1, dst1, size));
|
|
ASM_REGISTER_STATE_CHECK(partial_itxfm_(test_coef_block1, dst2, size));
|
|
|
|
for (int j = 0; j < block_size; ++j) {
|
|
const int diff = dst1[j] - dst2[j];
|
|
const int error = diff * diff;
|
|
if (max_error < error)
|
|
max_error = error;
|
|
}
|
|
}
|
|
|
|
EXPECT_EQ(0, max_error)
|
|
<< "Error: partial inverse transform produces different results";
|
|
}
|
|
|
|
TEST_P(PartialIDctTest, ResultsMatch) {
|
|
ACMRandom rnd(ACMRandom::DeterministicSeed());
|
|
int size;
|
|
switch (tx_size_) {
|
|
case TX_4X4:
|
|
size = 4;
|
|
break;
|
|
case TX_8X8:
|
|
size = 8;
|
|
break;
|
|
case TX_16X16:
|
|
size = 16;
|
|
break;
|
|
case TX_32X32:
|
|
size = 32;
|
|
break;
|
|
default:
|
|
FAIL() << "Wrong Size!";
|
|
break;
|
|
}
|
|
DECLARE_ALIGNED(16, tran_low_t, test_coef_block1[kMaxNumCoeffs]);
|
|
DECLARE_ALIGNED(16, tran_low_t, test_coef_block2[kMaxNumCoeffs]);
|
|
DECLARE_ALIGNED(16, uint8_t, dst1[kMaxNumCoeffs]);
|
|
DECLARE_ALIGNED(16, uint8_t, dst2[kMaxNumCoeffs]);
|
|
const int count_test_block = 1000;
|
|
const int max_coeff = 32766 / 4;
|
|
const int block_size = size * size;
|
|
int max_error = 0;
|
|
for (int i = 0; i < count_test_block; ++i) {
|
|
// clear out destination buffer
|
|
memset(dst1, 0, sizeof(*dst1) * block_size);
|
|
memset(dst2, 0, sizeof(*dst2) * block_size);
|
|
memset(test_coef_block1, 0, sizeof(*test_coef_block1) * block_size);
|
|
memset(test_coef_block2, 0, sizeof(*test_coef_block2) * block_size);
|
|
int max_energy_leftover = max_coeff * max_coeff;
|
|
for (int j = 0; j < last_nonzero_; ++j) {
|
|
int16_t coef = static_cast<int16_t>(sqrt(1.0 * max_energy_leftover) *
|
|
(rnd.Rand16() - 32768) / 65536);
|
|
max_energy_leftover -= coef * coef;
|
|
if (max_energy_leftover < 0) {
|
|
max_energy_leftover = 0;
|
|
coef = 0;
|
|
}
|
|
test_coef_block1[vp9_default_scan_orders[tx_size_].scan[j]] = coef;
|
|
}
|
|
|
|
memcpy(test_coef_block2, test_coef_block1,
|
|
sizeof(*test_coef_block2) * block_size);
|
|
|
|
ASM_REGISTER_STATE_CHECK(full_itxfm_(test_coef_block1, dst1, size));
|
|
ASM_REGISTER_STATE_CHECK(partial_itxfm_(test_coef_block2, dst2, size));
|
|
|
|
for (int j = 0; j < block_size; ++j) {
|
|
const int diff = dst1[j] - dst2[j];
|
|
const int error = diff * diff;
|
|
if (max_error < error)
|
|
max_error = error;
|
|
}
|
|
}
|
|
|
|
EXPECT_EQ(0, max_error)
|
|
<< "Error: partial inverse transform produces different results";
|
|
}
|
|
using std::tr1::make_tuple;
|
|
|
|
INSTANTIATE_TEST_CASE_P(
|
|
C, PartialIDctTest,
|
|
::testing::Values(
|
|
make_tuple(&vpx_fdct32x32_c,
|
|
&vpx_idct32x32_1024_add_c,
|
|
&vpx_idct32x32_34_add_c,
|
|
TX_32X32, 34),
|
|
make_tuple(&vpx_fdct32x32_c,
|
|
&vpx_idct32x32_1024_add_c,
|
|
&vpx_idct32x32_1_add_c,
|
|
TX_32X32, 1),
|
|
make_tuple(&vpx_fdct16x16_c,
|
|
&vpx_idct16x16_256_add_c,
|
|
&vpx_idct16x16_10_add_c,
|
|
TX_16X16, 10),
|
|
make_tuple(&vpx_fdct16x16_c,
|
|
&vpx_idct16x16_256_add_c,
|
|
&vpx_idct16x16_1_add_c,
|
|
TX_16X16, 1),
|
|
make_tuple(&vpx_fdct8x8_c,
|
|
&vpx_idct8x8_64_add_c,
|
|
&vpx_idct8x8_12_add_c,
|
|
TX_8X8, 12),
|
|
make_tuple(&vpx_fdct8x8_c,
|
|
&vpx_idct8x8_64_add_c,
|
|
&vpx_idct8x8_1_add_c,
|
|
TX_8X8, 1),
|
|
make_tuple(&vpx_fdct4x4_c,
|
|
&vpx_idct4x4_16_add_c,
|
|
&vpx_idct4x4_1_add_c,
|
|
TX_4X4, 1)));
|
|
|
|
#if HAVE_NEON && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
|
|
INSTANTIATE_TEST_CASE_P(
|
|
NEON, PartialIDctTest,
|
|
::testing::Values(
|
|
make_tuple(&vpx_fdct32x32_c,
|
|
&vpx_idct32x32_1024_add_c,
|
|
&vpx_idct32x32_1_add_neon,
|
|
TX_32X32, 1),
|
|
make_tuple(&vpx_fdct16x16_c,
|
|
&vpx_idct16x16_256_add_c,
|
|
&vpx_idct16x16_10_add_neon,
|
|
TX_16X16, 10),
|
|
make_tuple(&vpx_fdct16x16_c,
|
|
&vpx_idct16x16_256_add_c,
|
|
&vpx_idct16x16_1_add_neon,
|
|
TX_16X16, 1),
|
|
make_tuple(&vpx_fdct8x8_c,
|
|
&vpx_idct8x8_64_add_c,
|
|
&vpx_idct8x8_12_add_neon,
|
|
TX_8X8, 12),
|
|
make_tuple(&vpx_fdct8x8_c,
|
|
&vpx_idct8x8_64_add_c,
|
|
&vpx_idct8x8_1_add_neon,
|
|
TX_8X8, 1),
|
|
make_tuple(&vpx_fdct4x4_c,
|
|
&vpx_idct4x4_16_add_c,
|
|
&vpx_idct4x4_1_add_neon,
|
|
TX_4X4, 1)));
|
|
#endif // HAVE_NEON && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
|
|
|
|
#if HAVE_SSE2 && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
|
|
INSTANTIATE_TEST_CASE_P(
|
|
SSE2, PartialIDctTest,
|
|
::testing::Values(
|
|
make_tuple(&vpx_fdct32x32_c,
|
|
&vpx_idct32x32_1024_add_c,
|
|
&vpx_idct32x32_34_add_sse2,
|
|
TX_32X32, 34),
|
|
make_tuple(&vpx_fdct32x32_c,
|
|
&vpx_idct32x32_1024_add_c,
|
|
&vpx_idct32x32_1_add_sse2,
|
|
TX_32X32, 1),
|
|
make_tuple(&vpx_fdct16x16_c,
|
|
&vpx_idct16x16_256_add_c,
|
|
&vpx_idct16x16_10_add_sse2,
|
|
TX_16X16, 10),
|
|
make_tuple(&vpx_fdct16x16_c,
|
|
&vpx_idct16x16_256_add_c,
|
|
&vpx_idct16x16_1_add_sse2,
|
|
TX_16X16, 1),
|
|
make_tuple(&vpx_fdct8x8_c,
|
|
&vpx_idct8x8_64_add_c,
|
|
&vpx_idct8x8_12_add_sse2,
|
|
TX_8X8, 12),
|
|
make_tuple(&vpx_fdct8x8_c,
|
|
&vpx_idct8x8_64_add_c,
|
|
&vpx_idct8x8_1_add_sse2,
|
|
TX_8X8, 1),
|
|
make_tuple(&vpx_fdct4x4_c,
|
|
&vpx_idct4x4_16_add_c,
|
|
&vpx_idct4x4_1_add_sse2,
|
|
TX_4X4, 1)));
|
|
#endif
|
|
|
|
#if HAVE_SSSE3 && ARCH_X86_64 && \
|
|
!CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
|
|
INSTANTIATE_TEST_CASE_P(
|
|
SSSE3_64, PartialIDctTest,
|
|
::testing::Values(
|
|
make_tuple(&vpx_fdct8x8_c,
|
|
&vpx_idct8x8_64_add_c,
|
|
&vpx_idct8x8_12_add_ssse3,
|
|
TX_8X8, 12)));
|
|
#endif
|
|
|
|
#if HAVE_MSA && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
|
|
INSTANTIATE_TEST_CASE_P(
|
|
MSA, PartialIDctTest,
|
|
::testing::Values(
|
|
make_tuple(&vpx_fdct32x32_c,
|
|
&vpx_idct32x32_1024_add_c,
|
|
&vpx_idct32x32_34_add_msa,
|
|
TX_32X32, 34),
|
|
make_tuple(&vpx_fdct32x32_c,
|
|
&vpx_idct32x32_1024_add_c,
|
|
&vpx_idct32x32_1_add_msa,
|
|
TX_32X32, 1),
|
|
make_tuple(&vpx_fdct16x16_c,
|
|
&vpx_idct16x16_256_add_c,
|
|
&vpx_idct16x16_10_add_msa,
|
|
TX_16X16, 10),
|
|
make_tuple(&vpx_fdct16x16_c,
|
|
&vpx_idct16x16_256_add_c,
|
|
&vpx_idct16x16_1_add_msa,
|
|
TX_16X16, 1),
|
|
make_tuple(&vpx_fdct8x8_c,
|
|
&vpx_idct8x8_64_add_c,
|
|
&vpx_idct8x8_12_add_msa,
|
|
TX_8X8, 10),
|
|
make_tuple(&vpx_fdct8x8_c,
|
|
&vpx_idct8x8_64_add_c,
|
|
&vpx_idct8x8_1_add_msa,
|
|
TX_8X8, 1),
|
|
make_tuple(&vpx_fdct4x4_c,
|
|
&vpx_idct4x4_16_add_c,
|
|
&vpx_idct4x4_1_add_msa,
|
|
TX_4X4, 1)));
|
|
#endif // HAVE_MSA && !CONFIG_VP9_HIGHBITDEPTH && !CONFIG_EMULATE_HARDWARE
|
|
|
|
} // namespace
|