Skip to content

Commit 2a5805e

Browse files
committed
cosmetics: normalize include guards
use the recommended format [1] of: <PROJECT>_<PATH>_<FILE>_H_ [1] https://google.github.io/styleguide/cppguide.html#The__define_Guard "All header files should have #define guards to prevent multiple inclusion. The format of the symbol name should be <PROJECT>_<PATH>_<FILE>_H_." Change-Id: I2e8ab0b32fb23c30fa43cff5fec12d043c0d2037
1 parent cb67119 commit 2a5805e

File tree

266 files changed

+814
-789
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

266 files changed

+814
-789
lines changed

args.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
* be found in the AUTHORS file in the root of the source tree.
99
*/
1010

11-
#ifndef ARGS_H_
12-
#define ARGS_H_
11+
#ifndef VPX_ARGS_H_
12+
#define VPX_ARGS_H_
1313
#include <stdio.h>
1414

1515
#ifdef __cplusplus
@@ -60,4 +60,4 @@ int arg_parse_enum_or_int(const struct arg *arg);
6060
} // extern "C"
6161
#endif
6262

63-
#endif // ARGS_H_
63+
#endif // VPX_ARGS_H_

examples/svc_context.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
* spatial SVC frame
1414
*/
1515

16-
#ifndef VPX_SVC_CONTEXT_H_
17-
#define VPX_SVC_CONTEXT_H_
16+
#ifndef VPX_EXAMPLES_SVC_CONTEXT_H_
17+
#define VPX_EXAMPLES_SVC_CONTEXT_H_
1818

1919
#include "vpx/vp8cx.h"
2020
#include "vpx/vpx_encoder.h"
@@ -109,4 +109,4 @@ void vpx_svc_dump_statistics(SvcContext *svc_ctx);
109109
} // extern "C"
110110
#endif
111111

112-
#endif // VPX_SVC_CONTEXT_H_
112+
#endif // VPX_EXAMPLES_SVC_CONTEXT_H_

ivfdec.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
* in the file PATENTS. All contributing project authors may
88
* be found in the AUTHORS file in the root of the source tree.
99
*/
10-
#ifndef IVFDEC_H_
11-
#define IVFDEC_H_
10+
#ifndef VPX_IVFDEC_H_
11+
#define VPX_IVFDEC_H_
1212

1313
#include "./tools_common.h"
1414

@@ -25,4 +25,4 @@ int ivf_read_frame(FILE *infile, uint8_t **buffer, size_t *bytes_read,
2525
} /* extern "C" */
2626
#endif
2727

28-
#endif // IVFDEC_H_
28+
#endif // VPX_IVFDEC_H_

ivfenc.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
* in the file PATENTS. All contributing project authors may
88
* be found in the AUTHORS file in the root of the source tree.
99
*/
10-
#ifndef IVFENC_H_
11-
#define IVFENC_H_
10+
#ifndef VPX_IVFENC_H_
11+
#define VPX_IVFENC_H_
1212

1313
#include "./tools_common.h"
1414

@@ -30,4 +30,4 @@ void ivf_write_frame_size(FILE *outfile, size_t frame_size);
3030
} /* extern "C" */
3131
#endif
3232

33-
#endif // IVFENC_H_
33+
#endif // VPX_IVFENC_H_

md5_utils.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
* Still in the public domain.
2121
*/
2222

23-
#ifndef MD5_UTILS_H_
24-
#define MD5_UTILS_H_
23+
#ifndef VPX_MD5_UTILS_H_
24+
#define VPX_MD5_UTILS_H_
2525

2626
#ifdef __cplusplus
2727
extern "C" {
@@ -46,4 +46,4 @@ void MD5Transform(UWORD32 buf[4], UWORD32 const in[16]);
4646
} // extern "C"
4747
#endif
4848

49-
#endif // MD5_UTILS_H_
49+
#endif // VPX_MD5_UTILS_H_

rate_hist.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
* be found in the AUTHORS file in the root of the source tree.
99
*/
1010

11-
#ifndef RATE_HIST_H_
12-
#define RATE_HIST_H_
11+
#ifndef VPX_RATE_HIST_H_
12+
#define VPX_RATE_HIST_H_
1313

1414
#include "vpx/vpx_encoder.h"
1515

@@ -37,4 +37,4 @@ void show_rate_histogram(struct rate_hist *hist, const vpx_codec_enc_cfg_t *cfg,
3737
} // extern "C"
3838
#endif
3939

40-
#endif // RATE_HIST_H_
40+
#endif // VPX_RATE_HIST_H_

test/acm_random.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
* be found in the AUTHORS file in the root of the source tree.
99
*/
1010

11-
#ifndef TEST_ACM_RANDOM_H_
12-
#define TEST_ACM_RANDOM_H_
11+
#ifndef VPX_TEST_ACM_RANDOM_H_
12+
#define VPX_TEST_ACM_RANDOM_H_
1313

1414
#include <assert.h>
1515

@@ -73,4 +73,4 @@ class ACMRandom {
7373

7474
} // namespace libvpx_test
7575

76-
#endif // TEST_ACM_RANDOM_H_
76+
#endif // VPX_TEST_ACM_RANDOM_H_

test/bench.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
* be found in the AUTHORS file in the root of the source tree.
99
*/
1010

11-
#ifndef TEST_BENCH_H_
12-
#define TEST_BENCH_H_
11+
#ifndef VPX_TEST_BENCH_H_
12+
#define VPX_TEST_BENCH_H_
1313

1414
// Number of iterations used to compute median run time.
1515
#define VPX_BENCH_ROBUST_ITER 15
@@ -27,4 +27,4 @@ class AbstractBench {
2727
int times_[VPX_BENCH_ROBUST_ITER];
2828
};
2929

30-
#endif // TEST_BENCH_H_
30+
#endif // VPX_TEST_BENCH_H_

test/buffer.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
* be found in the AUTHORS file in the root of the source tree.
99
*/
1010

11-
#ifndef TEST_BUFFER_H_
12-
#define TEST_BUFFER_H_
11+
#ifndef VPX_TEST_BUFFER_H_
12+
#define VPX_TEST_BUFFER_H_
1313

1414
#include <stdio.h>
1515

@@ -379,4 +379,4 @@ bool Buffer<T>::BufferSizesMatch(const Buffer<T> &a) const {
379379
return true;
380380
}
381381
} // namespace libvpx_test
382-
#endif // TEST_BUFFER_H_
382+
#endif // VPX_TEST_BUFFER_H_

test/clear_system_state.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
* in the file PATENTS. All contributing project authors may
88
* be found in the AUTHORS file in the root of the source tree.
99
*/
10-
#ifndef TEST_CLEAR_SYSTEM_STATE_H_
11-
#define TEST_CLEAR_SYSTEM_STATE_H_
10+
#ifndef VPX_TEST_CLEAR_SYSTEM_STATE_H_
11+
#define VPX_TEST_CLEAR_SYSTEM_STATE_H_
1212

1313
#include "./vpx_config.h"
1414
#include "vpx_ports/system_state.h"
@@ -20,4 +20,4 @@ namespace libvpx_test {
2020
inline void ClearSystemState() { vpx_clear_system_state(); }
2121

2222
} // namespace libvpx_test
23-
#endif // TEST_CLEAR_SYSTEM_STATE_H_
23+
#endif // VPX_TEST_CLEAR_SYSTEM_STATE_H_

test/codec_factory.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
* in the file PATENTS. All contributing project authors may
88
* be found in the AUTHORS file in the root of the source tree.
99
*/
10-
#ifndef TEST_CODEC_FACTORY_H_
11-
#define TEST_CODEC_FACTORY_H_
10+
#ifndef VPX_TEST_CODEC_FACTORY_H_
11+
#define VPX_TEST_CODEC_FACTORY_H_
1212

1313
#include "./vpx_config.h"
1414
#include "vpx/vpx_decoder.h"
@@ -263,4 +263,4 @@ const libvpx_test::VP9CodecFactory kVP9;
263263
#endif // CONFIG_VP9
264264

265265
} // namespace libvpx_test
266-
#endif // TEST_CODEC_FACTORY_H_
266+
#endif // VPX_TEST_CODEC_FACTORY_H_

test/decode_test_driver.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
* be found in the AUTHORS file in the root of the source tree.
99
*/
1010

11-
#ifndef TEST_DECODE_TEST_DRIVER_H_
12-
#define TEST_DECODE_TEST_DRIVER_H_
11+
#ifndef VPX_TEST_DECODE_TEST_DRIVER_H_
12+
#define VPX_TEST_DECODE_TEST_DRIVER_H_
1313
#include <cstring>
1414
#include "third_party/googletest/src/include/gtest/gtest.h"
1515
#include "./vpx_config.h"
@@ -159,4 +159,4 @@ class DecoderTest {
159159

160160
} // namespace libvpx_test
161161

162-
#endif // TEST_DECODE_TEST_DRIVER_H_
162+
#endif // VPX_TEST_DECODE_TEST_DRIVER_H_

test/encode_test_driver.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
* in the file PATENTS. All contributing project authors may
88
* be found in the AUTHORS file in the root of the source tree.
99
*/
10-
#ifndef TEST_ENCODE_TEST_DRIVER_H_
11-
#define TEST_ENCODE_TEST_DRIVER_H_
10+
#ifndef VPX_TEST_ENCODE_TEST_DRIVER_H_
11+
#define VPX_TEST_ENCODE_TEST_DRIVER_H_
1212

1313
#include <string>
1414
#include <vector>
@@ -289,4 +289,4 @@ class EncoderTest {
289289

290290
} // namespace libvpx_test
291291

292-
#endif // TEST_ENCODE_TEST_DRIVER_H_
292+
#endif // VPX_TEST_ENCODE_TEST_DRIVER_H_

test/i420_video_source.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
* in the file PATENTS. All contributing project authors may
88
* be found in the AUTHORS file in the root of the source tree.
99
*/
10-
#ifndef TEST_I420_VIDEO_SOURCE_H_
11-
#define TEST_I420_VIDEO_SOURCE_H_
10+
#ifndef VPX_TEST_I420_VIDEO_SOURCE_H_
11+
#define VPX_TEST_I420_VIDEO_SOURCE_H_
1212
#include <cstdio>
1313
#include <cstdlib>
1414
#include <string>
@@ -30,4 +30,4 @@ class I420VideoSource : public YUVVideoSource {
3030

3131
} // namespace libvpx_test
3232

33-
#endif // TEST_I420_VIDEO_SOURCE_H_
33+
#endif // VPX_TEST_I420_VIDEO_SOURCE_H_

test/ivf_video_source.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
* in the file PATENTS. All contributing project authors may
88
* be found in the AUTHORS file in the root of the source tree.
99
*/
10-
#ifndef TEST_IVF_VIDEO_SOURCE_H_
11-
#define TEST_IVF_VIDEO_SOURCE_H_
10+
#ifndef VPX_TEST_IVF_VIDEO_SOURCE_H_
11+
#define VPX_TEST_IVF_VIDEO_SOURCE_H_
1212
#include <cstdio>
1313
#include <cstdlib>
1414
#include <new>
@@ -103,4 +103,4 @@ class IVFVideoSource : public CompressedVideoSource {
103103

104104
} // namespace libvpx_test
105105

106-
#endif // TEST_IVF_VIDEO_SOURCE_H_
106+
#endif // VPX_TEST_IVF_VIDEO_SOURCE_H_

test/md5_helper.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
* be found in the AUTHORS file in the root of the source tree.
99
*/
1010

11-
#ifndef TEST_MD5_HELPER_H_
12-
#define TEST_MD5_HELPER_H_
11+
#ifndef VPX_TEST_MD5_HELPER_H_
12+
#define VPX_TEST_MD5_HELPER_H_
1313

1414
#include "./md5_utils.h"
1515
#include "vpx/vpx_decoder.h"
@@ -72,4 +72,4 @@ class MD5 {
7272

7373
} // namespace libvpx_test
7474

75-
#endif // TEST_MD5_HELPER_H_
75+
#endif // VPX_TEST_MD5_HELPER_H_

test/register_state_check.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
* be found in the AUTHORS file in the root of the source tree.
99
*/
1010

11-
#ifndef TEST_REGISTER_STATE_CHECK_H_
12-
#define TEST_REGISTER_STATE_CHECK_H_
11+
#ifndef VPX_TEST_REGISTER_STATE_CHECK_H_
12+
#define VPX_TEST_REGISTER_STATE_CHECK_H_
1313

1414
#include "third_party/googletest/src/include/gtest/gtest.h"
1515
#include "./vpx_config.h"
@@ -184,4 +184,4 @@ class RegisterStateCheckMMX {
184184
#define API_REGISTER_STATE_CHECK ASM_REGISTER_STATE_CHECK
185185
#endif
186186

187-
#endif // TEST_REGISTER_STATE_CHECK_H_
187+
#endif // VPX_TEST_REGISTER_STATE_CHECK_H_

test/svc_test.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
* be found in the AUTHORS file in the root of the source tree.
99
*/
1010

11-
#ifndef TEST_SVC_TEST_H_
12-
#define TEST_SVC_TEST_H_
11+
#ifndef VPX_TEST_SVC_TEST_H_
12+
#define VPX_TEST_SVC_TEST_H_
1313

1414
#include "./vpx_config.h"
1515
#include "third_party/googletest/src/include/gtest/gtest.h"
@@ -59,4 +59,4 @@ class OnePassCbrSvc : public ::libvpx_test::EncoderTest {
5959
};
6060
} // namespace svc_test
6161

62-
#endif // TEST_SVC_TEST_H_
62+
#endif // VPX_TEST_SVC_TEST_H_

test/test_vectors.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
* be found in the AUTHORS file in the root of the source tree.
99
*/
1010

11-
#ifndef TEST_TEST_VECTORS_H_
12-
#define TEST_TEST_VECTORS_H_
11+
#ifndef VPX_TEST_TEST_VECTORS_H_
12+
#define VPX_TEST_TEST_VECTORS_H_
1313

1414
#include "./vpx_config.h"
1515

@@ -31,4 +31,4 @@ extern const char *const kVP9TestVectorsResize[];
3131

3232
} // namespace libvpx_test
3333

34-
#endif // TEST_TEST_VECTORS_H_
34+
#endif // VPX_TEST_TEST_VECTORS_H_

test/util.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
* be found in the AUTHORS file in the root of the source tree.
99
*/
1010

11-
#ifndef TEST_UTIL_H_
12-
#define TEST_UTIL_H_
11+
#ifndef VPX_TEST_UTIL_H_
12+
#define VPX_TEST_UTIL_H_
1313

1414
#include <stdio.h>
1515
#include <math.h>
@@ -43,4 +43,4 @@ inline double compute_psnr(const vpx_image_t *img1, const vpx_image_t *img2) {
4343
return psnr;
4444
}
4545

46-
#endif // TEST_UTIL_H_
46+
#endif // VPX_TEST_UTIL_H_

test/video_source.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
* in the file PATENTS. All contributing project authors may
88
* be found in the AUTHORS file in the root of the source tree.
99
*/
10-
#ifndef TEST_VIDEO_SOURCE_H_
11-
#define TEST_VIDEO_SOURCE_H_
10+
#ifndef VPX_TEST_VIDEO_SOURCE_H_
11+
#define VPX_TEST_VIDEO_SOURCE_H_
1212

1313
#if defined(_WIN32)
1414
#undef NOMINMAX
@@ -255,4 +255,4 @@ class CompressedVideoSource {
255255

256256
} // namespace libvpx_test
257257

258-
#endif // TEST_VIDEO_SOURCE_H_
258+
#endif // VPX_TEST_VIDEO_SOURCE_H_

test/vpx_scale_test.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
* be found in the AUTHORS file in the root of the source tree.
99
*/
1010

11-
#ifndef TEST_VPX_SCALE_TEST_H_
12-
#define TEST_VPX_SCALE_TEST_H_
11+
#ifndef VPX_TEST_VPX_SCALE_TEST_H_
12+
#define VPX_TEST_VPX_SCALE_TEST_H_
1313

1414
#include "third_party/googletest/src/include/gtest/gtest.h"
1515

@@ -198,4 +198,4 @@ class VpxScaleBase {
198198

199199
} // namespace libvpx_test
200200

201-
#endif // TEST_VPX_SCALE_TEST_H_
201+
#endif // VPX_TEST_VPX_SCALE_TEST_H_

test/webm_video_source.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
* in the file PATENTS. All contributing project authors may
88
* be found in the AUTHORS file in the root of the source tree.
99
*/
10-
#ifndef TEST_WEBM_VIDEO_SOURCE_H_
11-
#define TEST_WEBM_VIDEO_SOURCE_H_
10+
#ifndef VPX_TEST_WEBM_VIDEO_SOURCE_H_
11+
#define VPX_TEST_WEBM_VIDEO_SOURCE_H_
1212
#include <cstdarg>
1313
#include <cstdio>
1414
#include <cstdlib>
@@ -90,4 +90,4 @@ class WebMVideoSource : public CompressedVideoSource {
9090

9191
} // namespace libvpx_test
9292

93-
#endif // TEST_WEBM_VIDEO_SOURCE_H_
93+
#endif // VPX_TEST_WEBM_VIDEO_SOURCE_H_

0 commit comments

Comments
 (0)