clang-format v6.0.1
Change-Id: I5154ed2e941ed5b2e3a807418a294c5364169023
diff --git a/aom_dsp/intrapred.c b/aom_dsp/intrapred.c
index c6aa6b2..72ccfd8 100644
--- a/aom_dsp/intrapred.c
+++ b/aom_dsp/intrapred.c
@@ -239,23 +239,23 @@
return interm * multiplier >> shift2;
}
- // The constants (multiplier and shifts) for a given block size are obtained
- // as follows:
- // - Let sum_w_h = block width + block height.
- // - Shift 'sum_w_h' right until we reach an odd number. Let the number of
- // shifts for that block size be called 'shift1' (see the parameter in
- // dc_predictor_rect() function), and let the odd number be 'd'. [d has only 2
- // possible values: d = 3 for a 1:2 rect block and d = 5 for a 1:4 rect
- // block].
- // - Find multipliers for (i) dividing by 3, and (ii) dividing by 5,
- // using the "Algorithm 1" in:
- // http://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=1467632
- // by ensuring that m + n = 16 (in that algorithm). This ensures that our 2nd
- // shift will be 16, regardless of the block size.
+// The constants (multiplier and shifts) for a given block size are obtained
+// as follows:
+// - Let sum_w_h = block width + block height.
+// - Shift 'sum_w_h' right until we reach an odd number. Let the number of
+// shifts for that block size be called 'shift1' (see the parameter in
+// dc_predictor_rect() function), and let the odd number be 'd'. [d has only 2
+// possible values: d = 3 for a 1:2 rect block and d = 5 for a 1:4 rect
+// block].
+// - Find multipliers for (i) dividing by 3, and (ii) dividing by 5,
+// using the "Algorithm 1" in:
+// http://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=1467632
+// by ensuring that m + n = 16 (in that algorithm). This ensures that our 2nd
+// shift will be 16, regardless of the block size.
- // Note: For low bitdepth, assembly code may be optimized by using smaller
- // constants for smaller block sizes, where the range of the 'sum' is
- // restricted to fewer bits.
+// Note: For low bitdepth, assembly code may be optimized by using smaller
+// constants for smaller block sizes, where the range of the 'sum' is
+// restricted to fewer bits.
#define DC_MULTIPLIER_1X2 0x5556
#define DC_MULTIPLIER_1X4 0x3334
diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index ad12577..de5cc46 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -256,11 +256,11 @@
}
if (p->eobs[block] == 0 && plane == 0) {
- // TODO(debargha, jingning): Temporarily disable txk_type check for eob=0
- // case. It is possible that certain collision in hash index would cause
- // the assertion failure. To further optimize the rate-distortion
- // performance, we need to re-visit this part and enable this assert
- // again.
+ // TODO(debargha, jingning): Temporarily disable txk_type check for eob=0
+ // case. It is possible that certain collision in hash index would cause
+ // the assertion failure. To further optimize the rate-distortion
+ // performance, we need to re-visit this part and enable this assert
+ // again.
#if 0
if (args->cpi->oxcf.aq_mode == NO_AQ &&
args->cpi->oxcf.deltaq_mode == NO_DELTA_Q) {
@@ -598,11 +598,11 @@
}
if (*eob == 0 && plane == 0) {
- // TODO(jingning): Temporarily disable txk_type check for eob=0 case.
- // It is possible that certain collision in hash index would cause
- // the assertion failure. To further optimize the rate-distortion
- // performance, we need to re-visit this part and enable this assert
- // again.
+ // TODO(jingning): Temporarily disable txk_type check for eob=0 case.
+ // It is possible that certain collision in hash index would cause
+ // the assertion failure. To further optimize the rate-distortion
+ // performance, we need to re-visit this part and enable this assert
+ // again.
#if 0
if (args->cpi->oxcf.aq_mode == NO_AQ
&& args->cpi->oxcf.deltaq_mode == NO_DELTA_Q) {
diff --git a/test/av1_convolve_2d_test.cc b/test/av1_convolve_2d_test.cc
index 0328626..477aed8 100644
--- a/test/av1_convolve_2d_test.cc
+++ b/test/av1_convolve_2d_test.cc
@@ -12,13 +12,13 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/av1_convolve_2d_test_util.h"
-using ::testing::make_tuple;
-using ::testing::tuple;
using libaom_test::ACMRandom;
using libaom_test::AV1Convolve2D::AV1Convolve2DSrTest;
using libaom_test::AV1Convolve2D::AV1JntConvolve2DTest;
using libaom_test::AV1HighbdConvolve2D::AV1HighbdConvolve2DSrTest;
using libaom_test::AV1HighbdConvolve2D::AV1HighbdJntConvolve2DTest;
+using ::testing::make_tuple;
+using ::testing::tuple;
namespace {
TEST_P(AV1Convolve2DSrTest, DISABLED_Speed) { RunSpeedTest(GET_PARAM(0)); }
diff --git a/test/av1_convolve_scale_test.cc b/test/av1_convolve_scale_test.cc
index 3b1698e..1929c49 100644
--- a/test/av1_convolve_scale_test.cc
+++ b/test/av1_convolve_scale_test.cc
@@ -32,9 +32,9 @@
const int kXStepQn = 16;
const int kYStepQn = 20;
+using libaom_test::ACMRandom;
using ::testing::make_tuple;
using ::testing::tuple;
-using libaom_test::ACMRandom;
enum NTaps { EIGHT_TAP, TEN_TAP, TWELVE_TAP };
int NTapsToInt(NTaps ntaps) { return 8 + static_cast<int>(ntaps) * 2; }
diff --git a/test/av1_fwd_txfm1d_test.cc b/test/av1_fwd_txfm1d_test.cc
index 49a6668..db81d56 100644
--- a/test/av1_fwd_txfm1d_test.cc
+++ b/test/av1_fwd_txfm1d_test.cc
@@ -13,12 +13,12 @@
#include "test/av1_txfm_test.h"
using libaom_test::ACMRandom;
+using libaom_test::input_base;
+using libaom_test::reference_hybrid_1d;
using libaom_test::TYPE_ADST;
using libaom_test::TYPE_DCT;
using libaom_test::TYPE_IDTX;
using libaom_test::TYPE_TXFM;
-using libaom_test::input_base;
-using libaom_test::reference_hybrid_1d;
namespace {
const int txfm_type_num = 3;
diff --git a/test/av1_fwd_txfm2d_test.cc b/test/av1_fwd_txfm2d_test.cc
index 75f2053..c1b97f7 100644
--- a/test/av1_fwd_txfm2d_test.cc
+++ b/test/av1_fwd_txfm2d_test.cc
@@ -23,10 +23,10 @@
#include "av1/encoder/hybrid_fwd_txfm.h"
using libaom_test::ACMRandom;
-using libaom_test::TYPE_TXFM;
using libaom_test::bd;
using libaom_test::compute_avg_abs_error;
using libaom_test::input_base;
+using libaom_test::TYPE_TXFM;
using std::vector;
diff --git a/test/av1_highbd_iht_test.cc b/test/av1_highbd_iht_test.cc
index 2d6490c..7f077b6 100644
--- a/test/av1_highbd_iht_test.cc
+++ b/test/av1_highbd_iht_test.cc
@@ -25,8 +25,8 @@
namespace {
-using ::testing::tuple;
using libaom_test::ACMRandom;
+using ::testing::tuple;
typedef void (*HbdHtFunc)(const int16_t *input, int32_t *output, int stride,
TX_TYPE tx_type, int bd);
diff --git a/test/av1_horz_only_frame_superres_test.cc b/test/av1_horz_only_frame_superres_test.cc
index fd77ef3..ffc9136 100644
--- a/test/av1_horz_only_frame_superres_test.cc
+++ b/test/av1_horz_only_frame_superres_test.cc
@@ -30,9 +30,9 @@
const int kVPad = 32;
const int kHPad = 32;
+using libaom_test::ACMRandom;
using ::testing::make_tuple;
using ::testing::tuple;
-using libaom_test::ACMRandom;
template <typename Pixel>
class TestImage {
diff --git a/test/av1_inv_txfm2d_test.cc b/test/av1_inv_txfm2d_test.cc
index 11e231b..5432130 100644
--- a/test/av1_inv_txfm2d_test.cc
+++ b/test/av1_inv_txfm2d_test.cc
@@ -24,11 +24,11 @@
#include "test/util.h"
using libaom_test::ACMRandom;
-using libaom_test::InvTxfm2dFunc;
-using libaom_test::LbdInvTxfm2dFunc;
using libaom_test::bd;
using libaom_test::compute_avg_abs_error;
using libaom_test::input_base;
+using libaom_test::InvTxfm2dFunc;
+using libaom_test::LbdInvTxfm2dFunc;
using ::testing::Combine;
using ::testing::Range;
diff --git a/test/comp_avg_pred_test.cc b/test/comp_avg_pred_test.cc
index 9ad8973..9c6ed90 100644
--- a/test/comp_avg_pred_test.cc
+++ b/test/comp_avg_pred_test.cc
@@ -11,13 +11,13 @@
#include "test/comp_avg_pred_test.h"
-using ::testing::make_tuple;
-using ::testing::tuple;
using libaom_test::ACMRandom;
using libaom_test::AV1JNTCOMPAVG::AV1HighBDJNTCOMPAVGTest;
using libaom_test::AV1JNTCOMPAVG::AV1HighBDJNTCOMPAVGUPSAMPLEDTest;
using libaom_test::AV1JNTCOMPAVG::AV1JNTCOMPAVGTest;
using libaom_test::AV1JNTCOMPAVG::AV1JNTCOMPAVGUPSAMPLEDTest;
+using ::testing::make_tuple;
+using ::testing::tuple;
namespace {
diff --git a/test/filterintra_test.cc b/test/filterintra_test.cc
index 5971349..93e26ae 100644
--- a/test/filterintra_test.cc
+++ b/test/filterintra_test.cc
@@ -21,8 +21,8 @@
namespace {
-using ::testing::tuple;
using libaom_test::ACMRandom;
+using ::testing::tuple;
typedef void (*Predictor)(uint8_t *dst, ptrdiff_t stride, TX_SIZE tx_size,
const uint8_t *above, const uint8_t *left, int mode);
diff --git a/test/hiprec_convolve_test.cc b/test/hiprec_convolve_test.cc
index f94a073..dcf8523 100644
--- a/test/hiprec_convolve_test.cc
+++ b/test/hiprec_convolve_test.cc
@@ -12,11 +12,11 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/hiprec_convolve_test_util.h"
-using ::testing::make_tuple;
-using ::testing::tuple;
using libaom_test::ACMRandom;
using libaom_test::AV1HighbdHiprecConvolve::AV1HighbdHiprecConvolveTest;
using libaom_test::AV1HiprecConvolve::AV1HiprecConvolveTest;
+using ::testing::make_tuple;
+using ::testing::tuple;
namespace {
diff --git a/test/intrapred_test.cc b/test/intrapred_test.cc
index 1a1c0fc..43ab773 100644
--- a/test/intrapred_test.cc
+++ b/test/intrapred_test.cc
@@ -197,8 +197,8 @@
highbd_entry(type, 32, 16, opt, bd), highbd_entry(type, 32, 32, opt, bd)
#endif
- // ---------------------------------------------------------------------------
- // Low Bit Depth Tests
+// ---------------------------------------------------------------------------
+// Low Bit Depth Tests
#define lowbd_entry(type, width, height, opt) \
IntraPredFunc<IntraPred>(&aom_##type##_predictor_##width##x##height##_##opt, \
diff --git a/test/selfguided_filter_test.cc b/test/selfguided_filter_test.cc
index d2d5c61..464a58f 100644
--- a/test/selfguided_filter_test.cc
+++ b/test/selfguided_filter_test.cc
@@ -26,9 +26,9 @@
namespace {
+using libaom_test::ACMRandom;
using ::testing::make_tuple;
using ::testing::tuple;
-using libaom_test::ACMRandom;
typedef void (*SgrFunc)(const uint8_t *dat8, int width, int height, int stride,
int eps, const int *xqd, uint8_t *dst8, int dst_stride,
diff --git a/test/simd_cmp_impl.h b/test/simd_cmp_impl.h
index b98af9a..2aa02c8 100644
--- a/test/simd_cmp_impl.h
+++ b/test/simd_cmp_impl.h
@@ -471,7 +471,7 @@
#define MAP(name) \
{ \
- #name, reinterpret_cast < fptr > (c_##name), \
+#name, reinterpret_cast < fptr > (c_##name), \
reinterpret_cast < fptr > (name) \
}
diff --git a/test/warp_filter_test.cc b/test/warp_filter_test.cc
index 19a4e8b..d7b3ec9 100644
--- a/test/warp_filter_test.cc
+++ b/test/warp_filter_test.cc
@@ -10,11 +10,11 @@
*/
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/warp_filter_test_util.h"
-using ::testing::make_tuple;
-using ::testing::tuple;
using libaom_test::ACMRandom;
using libaom_test::AV1HighbdWarpFilter::AV1HighbdWarpFilterTest;
using libaom_test::AV1WarpFilter::AV1WarpFilterTest;
+using ::testing::make_tuple;
+using ::testing::tuple;
namespace {
