Skip to content

Commit fa1f9af

Browse files
jzernjzern
committed
test/**.cc: use using instead of typedef
created with clang-tidy --fix --checks=-*,modernize-use-using This change required some clean up using clang-tidy 19.1.7; 'using Name = enum/struct {' instances were corrected and parameter names were restored to function pointer parameter lists. Change-Id: Ia1793b2de3ff46a46f6b81b3182dbc6e52ed42ee
1 parent ad204a2 commit fa1f9af

39 files changed

+255
-254
lines changed

‎test/add_noise_test.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ namespace {
2424

2525
static const int kNoiseSize = 3072;
2626

27-
typedef void (*AddNoiseFunc)(uint8_t *start, const int8_t *noise,
28-
int blackclamp, int whiteclamp, int width,
29-
int height, int pitch);
27+
using AddNoiseFunc = void (*)(uint8_t *start, const int8_t *noise,
28+
int blackclamp, int whiteclamp, int width,
29+
int height, int pitch);
3030

31-
typedef std::tuple<double, AddNoiseFunc> AddNoiseTestFPParam;
31+
using AddNoiseTestFPParam = std::tuple<double, AddNoiseFunc>;
3232

3333
class AddNoiseTest : public ::testing::Test,
3434
public ::testing::WithParamInterface<AddNoiseTestFPParam> {

‎test/avg_test.cc

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ class AverageTestBase : public ::testing::Test {
9494

9595
ACMRandom rnd_;
9696
};
97-
typedef unsigned int (*AverageFunction)(const uint8_t *s, int pitch);
97+
using AverageFunction = unsigned int (*)(const uint8_t *s, int pitch);
9898

99-
typedef std::tuple<int, int, int, int, AverageFunction> AvgFunc;
99+
using AvgFunc = std::tuple<int, int, int, int, AverageFunction>;
100100

101101
class AverageTest : public AverageTestBase<uint8_t>,
102102
public ::testing::WithParamInterface<AvgFunc> {
@@ -153,10 +153,10 @@ class AverageTestHBD : public AverageTestBase<uint16_t>,
153153
#endif // CONFIG_VP9_HIGHBITDEPTH
154154

155155
#if HAVE_NEON || HAVE_SSE2 || HAVE_MSA
156-
typedef void (*IntProRowFunc)(int16_t hbuf[16], uint8_t const *ref,
157-
const int ref_stride, const int height);
156+
using IntProRowFunc = void (*)(int16_t hbuf[16], uint8_t const *ref,
157+
const int ref_stride, const int height);
158158

159-
typedef std::tuple<int, IntProRowFunc, IntProRowFunc> IntProRowParam;
159+
using IntProRowParam = std::tuple<int, IntProRowFunc, IntProRowFunc>;
160160

161161
class IntProRowTest : public AverageTestBase<uint8_t>,
162162
public ::testing::WithParamInterface<IntProRowParam> {
@@ -205,9 +205,9 @@ class IntProRowTest : public AverageTestBase<uint8_t>,
205205
};
206206
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(IntProRowTest);
207207

208-
typedef int16_t (*IntProColFunc)(uint8_t const *ref, const int width);
208+
using IntProColFunc = int16_t (*)(uint8_t const *ref, const int width);
209209

210-
typedef std::tuple<int, IntProColFunc, IntProColFunc> IntProColParam;
210+
using IntProColParam = std::tuple<int, IntProColFunc, IntProColFunc>;
211211

212212
class IntProColTest : public AverageTestBase<uint8_t>,
213213
public ::testing::WithParamInterface<IntProColParam> {
@@ -233,8 +233,8 @@ class IntProColTest : public AverageTestBase<uint8_t>,
233233
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(IntProColTest);
234234
#endif // HAVE_NEON || HAVE_SSE2 || HAVE_MSA
235235

236-
typedef int (*SatdFunc)(const tran_low_t *coeffs, int length);
237-
typedef std::tuple<int, SatdFunc> SatdTestParam;
236+
using SatdFunc = int (*)(const tran_low_t *coeffs, int length);
237+
using SatdTestParam = std::tuple<int, SatdFunc>;
238238

239239
class SatdTest : public ::testing::Test,
240240
public ::testing::WithParamInterface<SatdTestParam> {
@@ -285,9 +285,9 @@ class SatdLowbdTest : public SatdTest {
285285
}
286286
};
287287

288-
typedef int64_t (*BlockErrorFunc)(const tran_low_t *coeff,
289-
const tran_low_t *dqcoeff, int block_size);
290-
typedef std::tuple<int, BlockErrorFunc> BlockErrorTestFPParam;
288+
using BlockErrorFunc = int64_t (*)(const tran_low_t *coeff,
289+
const tran_low_t *dqcoeff, int block_size);
290+
using BlockErrorTestFPParam = std::tuple<int, BlockErrorFunc>;
291291

292292
class BlockErrorTestFP
293293
: public ::testing::Test,

‎test/blockiness_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ class BlockinessTestBase : public ::testing::Test {
139139
};
140140

141141
#if CONFIG_VP9_ENCODER
142-
typedef std::tuple<int, int> BlockinessParam;
142+
using BlockinessParam = std::tuple<int, int>;
143143
class BlockinessVP9Test
144144
: public BlockinessTestBase,
145145
public ::testing::WithParamInterface<BlockinessParam> {

‎test/consistency_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class ConsistencyTestBase : public ::testing::Test {
128128
};
129129

130130
#if CONFIG_VP9_ENCODER
131-
typedef std::tuple<int, int> ConsistencyParam;
131+
using ConsistencyParam = std::tuple<int, int>;
132132
class ConsistencyVP9Test
133133
: public ConsistencyTestBase,
134134
public ::testing::WithParamInterface<ConsistencyParam> {

‎test/convolve_test.cc

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,24 @@ namespace {
3232

3333
static const unsigned int kMaxDimension = 64;
3434

35-
typedef void (*ConvolveFunc)(const uint8_t *src, ptrdiff_t src_stride,
36-
uint8_t *dst, ptrdiff_t dst_stride,
37-
const InterpKernel *filter, int x0_q4,
38-
int x_step_q4, int y0_q4, int y_step_q4, int w,
39-
int h);
35+
using ConvolveFunc = void (*)(const uint8_t *src, ptrdiff_t src_stride,
36+
uint8_t *dst, ptrdiff_t dst_stride,
37+
const InterpKernel *filter, int x0_q4,
38+
int x_step_q4, int y0_q4, int y_step_q4, int w,
39+
int h);
4040
#if !CONFIG_REALTIME_ONLY && CONFIG_VP9_ENCODER
41-
typedef void (*ConvolveFunc12Tap)(const uint8_t *src, ptrdiff_t src_stride,
42-
uint8_t *dst, ptrdiff_t dst_stride,
43-
const InterpKernel12 *filter, int x0_q4,
44-
int x_step_q4, int y0_q4, int y_step_q4,
45-
int w, int h);
41+
using ConvolveFunc12Tap = void (*)(const uint8_t *src, ptrdiff_t src_stride,
42+
uint8_t *dst, ptrdiff_t dst_stride,
43+
const InterpKernel12 *filter, int x0_q4,
44+
int x_step_q4, int y0_q4, int y_step_q4,
45+
int w, int h);
4646
#endif
4747

48-
typedef void (*WrapperFilterBlock2d8Func)(
49-
const uint8_t *src_ptr, const unsigned int src_stride,
50-
const int16_t *hfilter, const int16_t *vfilter, uint8_t *dst_ptr,
51-
unsigned int dst_stride, unsigned int output_width,
52-
unsigned int output_height, int use_highbd);
48+
using WrapperFilterBlock2d8Func =
49+
void (*)(const uint8_t *src_ptr, const unsigned int src_stride,
50+
const int16_t *hfilter, const int16_t *vfilter, uint8_t *dst_ptr,
51+
unsigned int dst_stride, unsigned int output_width,
52+
unsigned int output_height, int use_highbd);
5353

5454
struct ConvolveFunctions {
5555
ConvolveFunctions(ConvolveFunc copy, ConvolveFunc avg, ConvolveFunc h8,
@@ -85,7 +85,7 @@ struct ConvolveFunctions {
8585
int use_highbd_; // 0 if high bitdepth not used, else the actual bit depth.
8686
};
8787

88-
typedef std::tuple<int, int, const ConvolveFunctions *> ConvolveParam;
88+
using ConvolveParam = std::tuple<int, int, const ConvolveFunctions *>;
8989

9090
#if !CONFIG_REALTIME_ONLY && CONFIG_VP9_ENCODER
9191
struct ConvolveFunctions12Tap {
@@ -103,7 +103,7 @@ struct ConvolveFunctions12Tap {
103103
int use_highbd_; // 0 if high bitdepth not used, else the actual bit depth.
104104
};
105105

106-
typedef std::tuple<int, int, const ConvolveFunctions12Tap *> Convolve12TapParam;
106+
using Convolve12TapParam = std::tuple<int, int, const ConvolveFunctions12Tap *>;
107107
#endif
108108

109109
#define ALL_SIZES(convolve_fn) \

‎test/cq_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class CQTest : public ::libvpx_test::EncoderTest,
2828
public ::libvpx_test::CodecTestWithParam<int> {
2929
public:
3030
// maps the cqlevel to the bitrate produced.
31-
typedef std::map<int, uint32_t> BitrateMap;
31+
using BitrateMap = std::map<int, uint32_t>;
3232

3333
static void SetUpTestSuite() { bitrates_.clear(); }
3434

‎test/dct16x16_test.cc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -224,16 +224,16 @@ void reference_16x16_dct_2d(int16_t input[256], double output[256]) {
224224
}
225225
}
226226

227-
typedef void (*FdctFunc)(const int16_t *in, tran_low_t *out, int stride);
228-
typedef void (*IdctFunc)(const tran_low_t *in, uint8_t *out, int stride);
229-
typedef void (*FhtFunc)(const int16_t *in, tran_low_t *out, int stride,
230-
int tx_type);
231-
typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride,
232-
int tx_type);
233-
234-
typedef std::tuple<FdctFunc, IdctFunc, int, vpx_bit_depth_t> Dct16x16Param;
235-
typedef std::tuple<FhtFunc, IhtFunc, int, vpx_bit_depth_t> Ht16x16Param;
236-
typedef std::tuple<IdctFunc, IdctFunc, int, vpx_bit_depth_t> Idct16x16Param;
227+
using FdctFunc = void (*)(const int16_t *in, tran_low_t *out, int stride);
228+
using IdctFunc = void (*)(const tran_low_t *in, uint8_t *out, int stride);
229+
using FhtFunc = void (*)(const int16_t *in, tran_low_t *out, int stride,
230+
int tx_type);
231+
using IhtFunc = void (*)(const tran_low_t *in, uint8_t *out, int stride,
232+
int tx_type);
233+
234+
using Dct16x16Param = std::tuple<FdctFunc, IdctFunc, int, vpx_bit_depth_t>;
235+
using Ht16x16Param = std::tuple<FhtFunc, IhtFunc, int, vpx_bit_depth_t>;
236+
using Idct16x16Param = std::tuple<IdctFunc, IdctFunc, int, vpx_bit_depth_t>;
237237

238238
void fdct16x16_ref(const int16_t *in, tran_low_t *out, int stride,
239239
int /*tx_type*/) {

‎test/dct32x32_test.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,14 @@ void reference_32x32_dct_2d(const int16_t input[kNumCoeffs],
6666
}
6767
}
6868

69-
typedef void (*FwdTxfmFunc)(const int16_t *in, tran_low_t *out, int stride);
70-
typedef void (*InvTxfmFunc)(const tran_low_t *in, uint8_t *out, int stride);
69+
using FwdTxfmFunc = void (*)(const int16_t *in, tran_low_t *out, int stride);
70+
using InvTxfmFunc = void (*)(const tran_low_t *in, uint8_t *out, int stride);
7171

72-
typedef std::tuple<FwdTxfmFunc, InvTxfmFunc, int, vpx_bit_depth_t>
73-
Trans32x32Param;
72+
using Trans32x32Param =
73+
std::tuple<FwdTxfmFunc, InvTxfmFunc, int, vpx_bit_depth_t>;
7474

75-
typedef std::tuple<InvTxfmFunc, InvTxfmFunc, int, vpx_bit_depth_t, int, int>
76-
InvTrans32x32Param;
75+
using InvTrans32x32Param =
76+
std::tuple<InvTxfmFunc, InvTxfmFunc, int, vpx_bit_depth_t, int, int>;
7777

7878
#if CONFIG_VP9_HIGHBITDEPTH
7979
void idct32x32_10(const tran_low_t *in, uint8_t *out, int stride) {

‎test/dct_partial_test.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ using std::make_tuple;
3333
using std::tuple;
3434

3535
namespace {
36-
typedef void (*PartialFdctFunc)(const int16_t *in, tran_low_t *out, int stride);
36+
using PartialFdctFunc = void (*)(const int16_t *in, tran_low_t *out,
37+
int stride);
3738

38-
typedef tuple<PartialFdctFunc, int /* size */, vpx_bit_depth_t>
39-
PartialFdctParam;
39+
using PartialFdctParam = tuple<PartialFdctFunc, int /*size*/, vpx_bit_depth_t>;
4040

4141
tran_low_t partial_fdct_ref(const Buffer<int16_t> &in, int size) {
4242
int64_t sum = 0;

‎test/dct_test.cc

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@ using std::make_tuple;
3434
using std::tuple;
3535

3636
namespace {
37-
typedef void (*FdctFunc)(const int16_t *in, tran_low_t *out, int stride);
38-
typedef void (*IdctFunc)(const tran_low_t *in, uint8_t *out, int stride);
39-
typedef void (*FhtFunc)(const int16_t *in, tran_low_t *out, int stride,
40-
int tx_type);
41-
typedef void (*FhtFuncRef)(const Buffer<int16_t> &in, Buffer<tran_low_t> *out,
42-
int size, int tx_type);
43-
typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride,
44-
int tx_type);
45-
typedef void (*IhtWithBdFunc)(const tran_low_t *in, uint8_t *out, int stride,
46-
int tx_type, int bd);
37+
using FdctFunc = void (*)(const int16_t *in, tran_low_t *out, int stride);
38+
using IdctFunc = void (*)(const tran_low_t *in, uint8_t *out, int stride);
39+
using FhtFunc = void (*)(const int16_t *in, tran_low_t *out, int stride,
40+
int tx_type);
41+
using FhtFuncRef = void (*)(const Buffer<int16_t> &in, Buffer<tran_low_t> *out,
42+
int size, int tx_type);
43+
using IhtFunc = void (*)(const tran_low_t *in, uint8_t *out, int stride,
44+
int tx_type);
45+
using IhtWithBdFunc = void (*)(const tran_low_t *in, uint8_t *out, int stride,
46+
int tx_type, int bd);
4747

4848
template <FdctFunc fn>
4949
void fdct_wrapper(const int16_t *in, tran_low_t *out, int stride, int tx_type) {
@@ -67,11 +67,11 @@ void iht_wrapper(const tran_low_t *in, uint8_t *out, int stride, int tx_type,
6767
}
6868

6969
#if CONFIG_VP9_HIGHBITDEPTH
70-
typedef void (*HighbdIdctFunc)(const tran_low_t *in, uint16_t *out, int stride,
71-
int bd);
70+
using HighbdIdctFunc = void (*)(const tran_low_t *in, uint16_t *out, int stride,
71+
int bd);
7272

73-
typedef void (*HighbdIhtFunc)(const tran_low_t *in, uint16_t *out, int stride,
74-
int tx_type, int bd);
73+
using HighbdIhtFunc = void (*)(const tran_low_t *in, uint16_t *out, int stride,
74+
int tx_type, int bd);
7575

7676
template <HighbdIdctFunc fn>
7777
void highbd_idct_wrapper(const tran_low_t *in, uint8_t *out, int stride,
@@ -95,7 +95,7 @@ struct FuncInfo {
9595
};
9696

9797
/* forward transform, inverse transform, size, transform type, bit depth */
98-
typedef tuple<int, const FuncInfo *, int, vpx_bit_depth_t> DctParam;
98+
using DctParam = tuple<int, const FuncInfo *, int, vpx_bit_depth_t>;
9999

100100
void fdct_ref(const Buffer<int16_t> &in, Buffer<tran_low_t> *out, int size,
101101
int /*tx_type*/) {

0 commit comments

Comments
 (0)