Skip to content

Commit

Permalink
cosmetics: normalize include guards
Browse files Browse the repository at this point in the history
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
  • Loading branch information
jzern committed Sep 15, 2018
1 parent cb67119 commit 2a5805e
Show file tree
Hide file tree
Showing 266 changed files with 814 additions and 789 deletions.
6 changes: 3 additions & 3 deletions args.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/

#ifndef ARGS_H_
#define ARGS_H_
#ifndef VPX_ARGS_H_
#define VPX_ARGS_H_
#include <stdio.h>

#ifdef __cplusplus
Expand Down Expand Up @@ -60,4 +60,4 @@ int arg_parse_enum_or_int(const struct arg *arg);
} // extern "C"
#endif

#endif // ARGS_H_
#endif // VPX_ARGS_H_
6 changes: 3 additions & 3 deletions examples/svc_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* spatial SVC frame
*/

#ifndef VPX_SVC_CONTEXT_H_
#define VPX_SVC_CONTEXT_H_
#ifndef VPX_EXAMPLES_SVC_CONTEXT_H_
#define VPX_EXAMPLES_SVC_CONTEXT_H_

#include "vpx/vp8cx.h"
#include "vpx/vpx_encoder.h"
Expand Down Expand Up @@ -109,4 +109,4 @@ void vpx_svc_dump_statistics(SvcContext *svc_ctx);
} // extern "C"
#endif

#endif // VPX_SVC_CONTEXT_H_
#endif // VPX_EXAMPLES_SVC_CONTEXT_H_
6 changes: 3 additions & 3 deletions ivfdec.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef IVFDEC_H_
#define IVFDEC_H_
#ifndef VPX_IVFDEC_H_
#define VPX_IVFDEC_H_

#include "./tools_common.h"

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

#endif // IVFDEC_H_
#endif // VPX_IVFDEC_H_
6 changes: 3 additions & 3 deletions ivfenc.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef IVFENC_H_
#define IVFENC_H_
#ifndef VPX_IVFENC_H_
#define VPX_IVFENC_H_

#include "./tools_common.h"

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

#endif // IVFENC_H_
#endif // VPX_IVFENC_H_
6 changes: 3 additions & 3 deletions md5_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
* Still in the public domain.
*/

#ifndef MD5_UTILS_H_
#define MD5_UTILS_H_
#ifndef VPX_MD5_UTILS_H_
#define VPX_MD5_UTILS_H_

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

#endif // MD5_UTILS_H_
#endif // VPX_MD5_UTILS_H_
6 changes: 3 additions & 3 deletions rate_hist.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/

#ifndef RATE_HIST_H_
#define RATE_HIST_H_
#ifndef VPX_RATE_HIST_H_
#define VPX_RATE_HIST_H_

#include "vpx/vpx_encoder.h"

Expand Down Expand Up @@ -37,4 +37,4 @@ void show_rate_histogram(struct rate_hist *hist, const vpx_codec_enc_cfg_t *cfg,
} // extern "C"
#endif

#endif // RATE_HIST_H_
#endif // VPX_RATE_HIST_H_
6 changes: 3 additions & 3 deletions test/acm_random.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/

#ifndef TEST_ACM_RANDOM_H_
#define TEST_ACM_RANDOM_H_
#ifndef VPX_TEST_ACM_RANDOM_H_
#define VPX_TEST_ACM_RANDOM_H_

#include <assert.h>

Expand Down Expand Up @@ -73,4 +73,4 @@ class ACMRandom {

} // namespace libvpx_test

#endif // TEST_ACM_RANDOM_H_
#endif // VPX_TEST_ACM_RANDOM_H_
6 changes: 3 additions & 3 deletions test/bench.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/

#ifndef TEST_BENCH_H_
#define TEST_BENCH_H_
#ifndef VPX_TEST_BENCH_H_
#define VPX_TEST_BENCH_H_

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

#endif // TEST_BENCH_H_
#endif // VPX_TEST_BENCH_H_
6 changes: 3 additions & 3 deletions test/buffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/

#ifndef TEST_BUFFER_H_
#define TEST_BUFFER_H_
#ifndef VPX_TEST_BUFFER_H_
#define VPX_TEST_BUFFER_H_

#include <stdio.h>

Expand Down Expand Up @@ -379,4 +379,4 @@ bool Buffer<T>::BufferSizesMatch(const Buffer<T> &a) const {
return true;
}
} // namespace libvpx_test
#endif // TEST_BUFFER_H_
#endif // VPX_TEST_BUFFER_H_
6 changes: 3 additions & 3 deletions test/clear_system_state.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef TEST_CLEAR_SYSTEM_STATE_H_
#define TEST_CLEAR_SYSTEM_STATE_H_
#ifndef VPX_TEST_CLEAR_SYSTEM_STATE_H_
#define VPX_TEST_CLEAR_SYSTEM_STATE_H_

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

} // namespace libvpx_test
#endif // TEST_CLEAR_SYSTEM_STATE_H_
#endif // VPX_TEST_CLEAR_SYSTEM_STATE_H_
6 changes: 3 additions & 3 deletions test/codec_factory.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef TEST_CODEC_FACTORY_H_
#define TEST_CODEC_FACTORY_H_
#ifndef VPX_TEST_CODEC_FACTORY_H_
#define VPX_TEST_CODEC_FACTORY_H_

#include "./vpx_config.h"
#include "vpx/vpx_decoder.h"
Expand Down Expand Up @@ -263,4 +263,4 @@ const libvpx_test::VP9CodecFactory kVP9;
#endif // CONFIG_VP9

} // namespace libvpx_test
#endif // TEST_CODEC_FACTORY_H_
#endif // VPX_TEST_CODEC_FACTORY_H_
6 changes: 3 additions & 3 deletions test/decode_test_driver.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/

#ifndef TEST_DECODE_TEST_DRIVER_H_
#define TEST_DECODE_TEST_DRIVER_H_
#ifndef VPX_TEST_DECODE_TEST_DRIVER_H_
#define VPX_TEST_DECODE_TEST_DRIVER_H_
#include <cstring>
#include "third_party/googletest/src/include/gtest/gtest.h"
#include "./vpx_config.h"
Expand Down Expand Up @@ -159,4 +159,4 @@ class DecoderTest {

} // namespace libvpx_test

#endif // TEST_DECODE_TEST_DRIVER_H_
#endif // VPX_TEST_DECODE_TEST_DRIVER_H_
6 changes: 3 additions & 3 deletions test/encode_test_driver.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef TEST_ENCODE_TEST_DRIVER_H_
#define TEST_ENCODE_TEST_DRIVER_H_
#ifndef VPX_TEST_ENCODE_TEST_DRIVER_H_
#define VPX_TEST_ENCODE_TEST_DRIVER_H_

#include <string>
#include <vector>
Expand Down Expand Up @@ -289,4 +289,4 @@ class EncoderTest {

} // namespace libvpx_test

#endif // TEST_ENCODE_TEST_DRIVER_H_
#endif // VPX_TEST_ENCODE_TEST_DRIVER_H_
6 changes: 3 additions & 3 deletions test/i420_video_source.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef TEST_I420_VIDEO_SOURCE_H_
#define TEST_I420_VIDEO_SOURCE_H_
#ifndef VPX_TEST_I420_VIDEO_SOURCE_H_
#define VPX_TEST_I420_VIDEO_SOURCE_H_
#include <cstdio>
#include <cstdlib>
#include <string>
Expand All @@ -30,4 +30,4 @@ class I420VideoSource : public YUVVideoSource {

} // namespace libvpx_test

#endif // TEST_I420_VIDEO_SOURCE_H_
#endif // VPX_TEST_I420_VIDEO_SOURCE_H_
6 changes: 3 additions & 3 deletions test/ivf_video_source.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef TEST_IVF_VIDEO_SOURCE_H_
#define TEST_IVF_VIDEO_SOURCE_H_
#ifndef VPX_TEST_IVF_VIDEO_SOURCE_H_
#define VPX_TEST_IVF_VIDEO_SOURCE_H_
#include <cstdio>
#include <cstdlib>
#include <new>
Expand Down Expand Up @@ -103,4 +103,4 @@ class IVFVideoSource : public CompressedVideoSource {

} // namespace libvpx_test

#endif // TEST_IVF_VIDEO_SOURCE_H_
#endif // VPX_TEST_IVF_VIDEO_SOURCE_H_
6 changes: 3 additions & 3 deletions test/md5_helper.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/

#ifndef TEST_MD5_HELPER_H_
#define TEST_MD5_HELPER_H_
#ifndef VPX_TEST_MD5_HELPER_H_
#define VPX_TEST_MD5_HELPER_H_

#include "./md5_utils.h"
#include "vpx/vpx_decoder.h"
Expand Down Expand Up @@ -72,4 +72,4 @@ class MD5 {

} // namespace libvpx_test

#endif // TEST_MD5_HELPER_H_
#endif // VPX_TEST_MD5_HELPER_H_
6 changes: 3 additions & 3 deletions test/register_state_check.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/

#ifndef TEST_REGISTER_STATE_CHECK_H_
#define TEST_REGISTER_STATE_CHECK_H_
#ifndef VPX_TEST_REGISTER_STATE_CHECK_H_
#define VPX_TEST_REGISTER_STATE_CHECK_H_

#include "third_party/googletest/src/include/gtest/gtest.h"
#include "./vpx_config.h"
Expand Down Expand Up @@ -184,4 +184,4 @@ class RegisterStateCheckMMX {
#define API_REGISTER_STATE_CHECK ASM_REGISTER_STATE_CHECK
#endif

#endif // TEST_REGISTER_STATE_CHECK_H_
#endif // VPX_TEST_REGISTER_STATE_CHECK_H_
6 changes: 3 additions & 3 deletions test/svc_test.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/

#ifndef TEST_SVC_TEST_H_
#define TEST_SVC_TEST_H_
#ifndef VPX_TEST_SVC_TEST_H_
#define VPX_TEST_SVC_TEST_H_

#include "./vpx_config.h"
#include "third_party/googletest/src/include/gtest/gtest.h"
Expand Down Expand Up @@ -59,4 +59,4 @@ class OnePassCbrSvc : public ::libvpx_test::EncoderTest {
};
} // namespace svc_test

#endif // TEST_SVC_TEST_H_
#endif // VPX_TEST_SVC_TEST_H_
6 changes: 3 additions & 3 deletions test/test_vectors.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/

#ifndef TEST_TEST_VECTORS_H_
#define TEST_TEST_VECTORS_H_
#ifndef VPX_TEST_TEST_VECTORS_H_
#define VPX_TEST_TEST_VECTORS_H_

#include "./vpx_config.h"

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

} // namespace libvpx_test

#endif // TEST_TEST_VECTORS_H_
#endif // VPX_TEST_TEST_VECTORS_H_
6 changes: 3 additions & 3 deletions test/util.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/

#ifndef TEST_UTIL_H_
#define TEST_UTIL_H_
#ifndef VPX_TEST_UTIL_H_
#define VPX_TEST_UTIL_H_

#include <stdio.h>
#include <math.h>
Expand Down Expand Up @@ -43,4 +43,4 @@ inline double compute_psnr(const vpx_image_t *img1, const vpx_image_t *img2) {
return psnr;
}

#endif // TEST_UTIL_H_
#endif // VPX_TEST_UTIL_H_
6 changes: 3 additions & 3 deletions test/video_source.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef TEST_VIDEO_SOURCE_H_
#define TEST_VIDEO_SOURCE_H_
#ifndef VPX_TEST_VIDEO_SOURCE_H_
#define VPX_TEST_VIDEO_SOURCE_H_

#if defined(_WIN32)
#undef NOMINMAX
Expand Down Expand Up @@ -255,4 +255,4 @@ class CompressedVideoSource {

} // namespace libvpx_test

#endif // TEST_VIDEO_SOURCE_H_
#endif // VPX_TEST_VIDEO_SOURCE_H_
6 changes: 3 additions & 3 deletions test/vpx_scale_test.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/

#ifndef TEST_VPX_SCALE_TEST_H_
#define TEST_VPX_SCALE_TEST_H_
#ifndef VPX_TEST_VPX_SCALE_TEST_H_
#define VPX_TEST_VPX_SCALE_TEST_H_

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

Expand Down Expand Up @@ -198,4 +198,4 @@ class VpxScaleBase {

} // namespace libvpx_test

#endif // TEST_VPX_SCALE_TEST_H_
#endif // VPX_TEST_VPX_SCALE_TEST_H_
6 changes: 3 additions & 3 deletions test/webm_video_source.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef TEST_WEBM_VIDEO_SOURCE_H_
#define TEST_WEBM_VIDEO_SOURCE_H_
#ifndef VPX_TEST_WEBM_VIDEO_SOURCE_H_
#define VPX_TEST_WEBM_VIDEO_SOURCE_H_
#include <cstdarg>
#include <cstdio>
#include <cstdlib>
Expand Down Expand Up @@ -90,4 +90,4 @@ class WebMVideoSource : public CompressedVideoSource {

} // namespace libvpx_test

#endif // TEST_WEBM_VIDEO_SOURCE_H_
#endif // VPX_TEST_WEBM_VIDEO_SOURCE_H_
Loading

0 comments on commit 2a5805e

Please sign in to comment.