ref: 7bca5619eb275601023db0b93181103cc9a0269d
parent: 534ac8a6178878a6dd69b046f538c1a71db8aa74
parent: 2dcefd9c7fdc08f28f8276f2a41df453c1f0a020
author: Yaowu Xu <yaowu@xuyaowu.com>
date: Thu Aug 13 14:00:02 EDT 2015
Merge "Correct guard macros in header files"
--- a/vp10/common/alloccommon.h
+++ b/vp10/common/alloccommon.h
@@ -9,8 +9,8 @@
*/
-#ifndef VP9_COMMON_VP9_ALLOCCOMMON_H_
-#define VP9_COMMON_VP9_ALLOCCOMMON_H_
+#ifndef VP10_COMMON_ALLOCCOMMON_H_
+#define VP10_COMMON_ALLOCCOMMON_H_
#define INVALID_IDX -1 // Invalid buffer index.
@@ -41,4 +41,4 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_ALLOCCOMMON_H_
+#endif // VP10_COMMON_ALLOCCOMMON_H_
--- a/vp10/common/blockd.h
+++ b/vp10/common/blockd.h
@@ -9,8 +9,8 @@
*/
-#ifndef VP9_COMMON_VP9_BLOCKD_H_
-#define VP9_COMMON_VP9_BLOCKD_H_
+#ifndef VP10_COMMON_BLOCKD_H_
+#define VP10_COMMON_BLOCKD_H_
#include "./vpx_config.h"
@@ -315,4 +315,4 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_BLOCKD_H_
+#endif // VP10_COMMON_BLOCKD_H_
--- a/vp10/common/common.h
+++ b/vp10/common/common.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_COMMON_VP9_COMMON_H_
-#define VP9_COMMON_VP9_COMMON_H_
+#ifndef VP10_COMMON_COMMON_H_
+#define VP10_COMMON_COMMON_H_
/* Interface header for common constant data structures and lookup tables */
@@ -72,4 +72,4 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_COMMON_H_
+#endif // VP10_COMMON_COMMON_H_
--- a/vp10/common/common_data.h
+++ b/vp10/common/common_data.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_COMMON_VP9_COMMON_DATA_H_
-#define VP9_COMMON_VP9_COMMON_DATA_H_
+#ifndef VP10_COMMON_COMMON_DATA_H_
+#define VP10_COMMON_COMMON_DATA_H_
#include "vp10/common/enums.h"
#include "vpx/vpx_integer.h"
@@ -171,4 +171,4 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_COMMON_DATA_H_
+#endif // VP10_COMMON_COMMON_DATA_H_
--- a/vp10/common/entropy.h
+++ b/vp10/common/entropy.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_COMMON_VP9_ENTROPY_H_
-#define VP9_COMMON_VP9_ENTROPY_H_
+#ifndef VP10_COMMON_ENTROPY_H_
+#define VP10_COMMON_ENTROPY_H_
#include "vpx/vpx_integer.h"
#include "vpx_dsp/prob.h"
@@ -212,4 +212,4 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_ENTROPY_H_
+#endif // VP10_COMMON_ENTROPY_H_
--- a/vp10/common/entropymode.h
+++ b/vp10/common/entropymode.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_COMMON_VP9_ENTROPYMODE_H_
-#define VP9_COMMON_VP9_ENTROPYMODE_H_
+#ifndef VP10_COMMON_ENTROPYMODE_H_
+#define VP10_COMMON_ENTROPYMODE_H_
#include "vp10/common/entropy.h"
#include "vp10/common/entropymv.h"
@@ -104,4 +104,4 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_ENTROPYMODE_H_
+#endif // VP10_COMMON_ENTROPYMODE_H_
--- a/vp10/common/entropymv.h
+++ b/vp10/common/entropymv.h
@@ -9,8 +9,8 @@
*/
-#ifndef VP9_COMMON_VP9_ENTROPYMV_H_
-#define VP9_COMMON_VP9_ENTROPYMV_H_
+#ifndef VP10_COMMON_ENTROPYMV_H_
+#define VP10_COMMON_ENTROPYMV_H_
#include "./vpx_config.h"
@@ -130,4 +130,4 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_ENTROPYMV_H_
+#endif // VP10_COMMON_ENTROPYMV_H_
--- a/vp10/common/enums.h
+++ b/vp10/common/enums.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_COMMON_VP9_ENUMS_H_
-#define VP9_COMMON_VP9_ENUMS_H_
+#ifndef VP10_COMMON_ENUMS_H_
+#define VP10_COMMON_ENUMS_H_
#include "./vpx_config.h"
#include "vpx/vpx_integer.h"
@@ -144,4 +144,4 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_ENUMS_H_
+#endif // VP10_COMMON_ENUMS_H_
--- a/vp10/common/filter.h
+++ b/vp10/common/filter.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_COMMON_VP9_FILTER_H_
-#define VP9_COMMON_VP9_FILTER_H_
+#ifndef VP10_COMMON_FILTER_H_
+#define VP10_COMMON_FILTER_H_
#include "./vpx_config.h"
#include "vpx/vpx_integer.h"
@@ -39,4 +39,4 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_FILTER_H_
+#endif // VP10_COMMON_FILTER_H_
--- a/vp10/common/frame_buffers.h
+++ b/vp10/common/frame_buffers.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_COMMON_VP9_FRAME_BUFFERS_H_
-#define VP9_COMMON_VP9_FRAME_BUFFERS_H_
+#ifndef VP10_COMMON_FRAME_BUFFERS_H_
+#define VP10_COMMON_FRAME_BUFFERS_H_
#include "vpx/vpx_frame_buffer.h"
#include "vpx/vpx_integer.h"
@@ -50,4 +50,4 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_FRAME_BUFFERS_H_
+#endif // VP10_COMMON_FRAME_BUFFERS_H_
--- a/vp10/common/idct.h
+++ b/vp10/common/idct.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_COMMON_VP9_IDCT_H_
-#define VP9_COMMON_VP9_IDCT_H_
+#ifndef VP10_COMMON_IDCT_H_
+#define VP10_COMMON_IDCT_H_
#include <assert.h>
@@ -78,4 +78,4 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_IDCT_H_
+#endif // VP10_COMMON_IDCT_H_
--- a/vp10/common/loopfilter.h
+++ b/vp10/common/loopfilter.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_COMMON_VP9_LOOPFILTER_H_
-#define VP9_COMMON_VP9_LOOPFILTER_H_
+#ifndef VP10_COMMON_LOOPFILTER_H_
+#define VP10_COMMON_LOOPFILTER_H_
#include "vpx_ports/mem.h"
#include "./vpx_config.h"
@@ -152,4 +152,4 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_LOOPFILTER_H_
+#endif // VP10_COMMON_LOOPFILTER_H_
--- a/vp10/common/mfqe.h
+++ b/vp10/common/mfqe.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_COMMON_VP9_MFQE_H_
-#define VP9_COMMON_VP9_MFQE_H_
+#ifndef VP10_COMMON_MFQE_H_
+#define VP10_COMMON_MFQE_H_
#ifdef __cplusplus
extern "C" {@@ -28,4 +28,4 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_MFQE_H_
+#endif // VP10_COMMON_MFQE_H_
--- a/vp10/common/mv.h
+++ b/vp10/common/mv.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_COMMON_VP9_MV_H_
-#define VP9_COMMON_VP9_MV_H_
+#ifndef VP10_COMMON_MV_H_
+#define VP10_COMMON_MV_H_
#include "vpx/vpx_integer.h"
@@ -52,4 +52,4 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_MV_H_
+#endif // VP10_COMMON_MV_H_
--- a/vp10/common/mvref_common.h
+++ b/vp10/common/mvref_common.h
@@ -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 VP9_COMMON_VP9_MVREF_COMMON_H_
-#define VP9_COMMON_VP9_MVREF_COMMON_H_
+#ifndef VP10_COMMON_MVREF_COMMON_H_
+#define VP10_COMMON_MVREF_COMMON_H_
#include "vp10/common/onyxc_int.h"
#include "vp10/common/blockd.h"
@@ -229,4 +229,4 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_MVREF_COMMON_H_
+#endif // VP10_COMMON_MVREF_COMMON_H_
--- a/vp10/common/onyxc_int.h
+++ b/vp10/common/onyxc_int.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_COMMON_VP9_ONYXC_INT_H_
-#define VP9_COMMON_VP9_ONYXC_INT_H_
+#ifndef VP10_COMMON_ONYXC_INT_H_
+#define VP10_COMMON_ONYXC_INT_H_
#include "./vpx_config.h"
#include "vpx/internal/vpx_codec_internal.h"
@@ -467,4 +467,4 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_ONYXC_INT_H_
+#endif // VP10_COMMON_ONYXC_INT_H_
--- a/vp10/common/postproc.h
+++ b/vp10/common/postproc.h
@@ -9,8 +9,8 @@
*/
-#ifndef VP9_COMMON_VP9_POSTPROC_H_
-#define VP9_COMMON_VP9_POSTPROC_H_
+#ifndef VP10_COMMON_POSTPROC_H_
+#define VP10_COMMON_POSTPROC_H_
#include "vpx_ports/mem.h"
#include "vpx_scale/yv12config.h"
@@ -50,4 +50,4 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_POSTPROC_H_
+#endif // VP10_COMMON_POSTPROC_H_
--- a/vp10/common/ppflags.h
+++ b/vp10/common/ppflags.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_COMMON_VP9_PPFLAGS_H_
-#define VP9_COMMON_VP9_PPFLAGS_H_
+#ifndef VP10_COMMON_PPFLAGS_H_
+#define VP10_COMMON_PPFLAGS_H_
#ifdef __cplusplus
extern "C" {@@ -40,4 +40,4 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_PPFLAGS_H_
+#endif // VP10_COMMON_PPFLAGS_H_
--- a/vp10/common/pred_common.h
+++ b/vp10/common/pred_common.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_COMMON_VP9_PRED_COMMON_H_
-#define VP9_COMMON_VP9_PRED_COMMON_H_
+#ifndef VP10_COMMON_PRED_COMMON_H_
+#define VP10_COMMON_PRED_COMMON_H_
#include "vp10/common/blockd.h"
#include "vp10/common/onyxc_int.h"
@@ -167,4 +167,4 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_PRED_COMMON_H_
+#endif // VP10_COMMON_PRED_COMMON_H_
--- a/vp10/common/quant_common.h
+++ b/vp10/common/quant_common.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_COMMON_VP9_QUANT_COMMON_H_
-#define VP9_COMMON_VP9_QUANT_COMMON_H_
+#ifndef VP10_COMMON_QUANT_COMMON_H_
+#define VP10_COMMON_QUANT_COMMON_H_
#include "vpx/vpx_codec.h"
#include "vp10/common/seg_common.h"
@@ -33,4 +33,4 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_QUANT_COMMON_H_
+#endif // VP10_COMMON_QUANT_COMMON_H_
--- a/vp10/common/reconinter.h
+++ b/vp10/common/reconinter.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_COMMON_VP9_RECONINTER_H_
-#define VP9_COMMON_VP9_RECONINTER_H_
+#ifndef VP10_COMMON_RECONINTER_H_
+#define VP10_COMMON_RECONINTER_H_
#include "vp10/common/filter.h"
#include "vp10/common/onyxc_int.h"
@@ -192,4 +192,4 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_RECONINTER_H_
+#endif // VP10_COMMON_RECONINTER_H_
--- a/vp10/common/reconintra.h
+++ b/vp10/common/reconintra.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_COMMON_VP9_RECONINTRA_H_
-#define VP9_COMMON_VP9_RECONINTRA_H_
+#ifndef VP10_COMMON_RECONINTRA_H_
+#define VP10_COMMON_RECONINTRA_H_
#include "vpx/vpx_integer.h"
#include "vp10/common/blockd.h"
@@ -29,4 +29,4 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_RECONINTRA_H_
+#endif // VP10_COMMON_RECONINTRA_H_
--- a/vp10/common/scale.h
+++ b/vp10/common/scale.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_COMMON_VP9_SCALE_H_
-#define VP9_COMMON_VP9_SCALE_H_
+#ifndef VP10_COMMON_SCALE_H_
+#define VP10_COMMON_SCALE_H_
#include "vp10/common/mv.h"
#include "vpx_dsp/vpx_convolve.h"
@@ -72,4 +72,4 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_SCALE_H_
+#endif // VP10_COMMON_SCALE_H_
--- a/vp10/common/scan.h
+++ b/vp10/common/scan.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_COMMON_VP9_SCAN_H_
-#define VP9_COMMON_VP9_SCAN_H_
+#ifndef VP10_COMMON_SCAN_H_
+#define VP10_COMMON_SCAN_H_
#include "vpx/vpx_integer.h"
#include "vpx_ports/mem.h"
@@ -54,4 +54,4 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_SCAN_H_
+#endif // VP10_COMMON_SCAN_H_
--- a/vp10/common/seg_common.h
+++ b/vp10/common/seg_common.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_COMMON_VP9_SEG_COMMON_H_
-#define VP9_COMMON_VP9_SEG_COMMON_H_
+#ifndef VP10_COMMON_SEG_COMMON_H_
+#define VP10_COMMON_SEG_COMMON_H_
#include "vpx_dsp/prob.h"
@@ -82,5 +82,5 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_SEG_COMMON_H_
+#endif // VP10_COMMON_SEG_COMMON_H_
--- a/vp10/common/textblit.h
+++ b/vp10/common/textblit.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_COMMON_VP9_TEXTBLIT_H_
-#define VP9_COMMON_VP9_TEXTBLIT_H_
+#ifndef VP10_COMMON_TEXTBLIT_H_
+#define VP10_COMMON_TEXTBLIT_H_
#ifdef __cplusplus
extern "C" {@@ -24,4 +24,4 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_TEXTBLIT_H_
+#endif // VP10_COMMON_TEXTBLIT_H_
--- a/vp10/common/thread_common.h
+++ b/vp10/common/thread_common.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_COMMON_VP9_LOOPFILTER_THREAD_H_
-#define VP9_COMMON_VP9_LOOPFILTER_THREAD_H_
+#ifndef VP10_COMMON_LOOPFILTER_THREAD_H_
+#define VP10_COMMON_LOOPFILTER_THREAD_H_
#include "./vpx_config.h"
#include "vp10/common/loopfilter.h"
#include "vpx_util/vpx_thread.h"
@@ -54,4 +54,4 @@
void vp10_accumulate_frame_counts(struct VP9Common *cm,
struct FRAME_COUNTS *counts, int is_dec);
-#endif // VP9_COMMON_VP9_LOOPFILTER_THREAD_H_
+#endif // VP10_COMMON_LOOPFILTER_THREAD_H_
--- a/vp10/common/tile_common.h
+++ b/vp10/common/tile_common.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_COMMON_VP9_TILE_COMMON_H_
-#define VP9_COMMON_VP9_TILE_COMMON_H_
+#ifndef VP10_COMMON_TILE_COMMON_H_
+#define VP10_COMMON_TILE_COMMON_H_
#ifdef __cplusplus
extern "C" {@@ -37,4 +37,4 @@
} // extern "C"
#endif
-#endif // VP9_COMMON_VP9_TILE_COMMON_H_
+#endif // VP10_COMMON_TILE_COMMON_H_
--- a/vp10/decoder/decodeframe.h
+++ b/vp10/decoder/decodeframe.h
@@ -9,8 +9,8 @@
*/
-#ifndef VP9_DECODER_VP9_DECODEFRAME_H_
-#define VP9_DECODER_VP9_DECODEFRAME_H_
+#ifndef VP10_DECODER_DECODEFRAME_H_
+#define VP10_DECODER_DECODEFRAME_H_
#ifdef __cplusplus
extern "C" {@@ -32,4 +32,4 @@
} // extern "C"
#endif
-#endif // VP9_DECODER_VP9_DECODEFRAME_H_
+#endif // VP10_DECODER_DECODEFRAME_H_
--- a/vp10/decoder/decodemv.h
+++ b/vp10/decoder/decodemv.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_DECODER_VP9_DECODEMV_H_
-#define VP9_DECODER_VP9_DECODEMV_H_
+#ifndef VP10_DECODER_DECODEMV_H_
+#define VP10_DECODER_DECODEMV_H_
#include "vpx_dsp/bitreader.h"
@@ -27,4 +27,4 @@
} // extern "C"
#endif
-#endif // VP9_DECODER_VP9_DECODEMV_H_
+#endif // VP10_DECODER_DECODEMV_H_
--- a/vp10/decoder/decoder.h
+++ b/vp10/decoder/decoder.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_DECODER_VP9_DECODER_H_
-#define VP9_DECODER_VP9_DECODER_H_
+#ifndef VP10_DECODER_DECODER_H_
+#define VP10_DECODER_DECODER_H_
#include "./vpx_config.h"
@@ -138,4 +138,4 @@
} // extern "C"
#endif
-#endif // VP9_DECODER_VP9_DECODER_H_
+#endif // VP10_DECODER_DECODER_H_
--- a/vp10/decoder/detokenize.h
+++ b/vp10/decoder/detokenize.h
@@ -9,8 +9,8 @@
*/
-#ifndef VP9_DECODER_VP9_DETOKENIZE_H_
-#define VP9_DECODER_VP9_DETOKENIZE_H_
+#ifndef VP10_DECODER_DETOKENIZE_H_
+#define VP10_DECODER_DETOKENIZE_H_
#include "vpx_dsp/bitreader.h"
#include "vp10/decoder/decoder.h"
@@ -30,4 +30,4 @@
} // extern "C"
#endif
-#endif // VP9_DECODER_VP9_DETOKENIZE_H_
+#endif // VP10_DECODER_DETOKENIZE_H_
--- a/vp10/decoder/dsubexp.h
+++ b/vp10/decoder/dsubexp.h
@@ -9,8 +9,8 @@
*/
-#ifndef VP9_DECODER_VP9_DSUBEXP_H_
-#define VP9_DECODER_VP9_DSUBEXP_H_
+#ifndef VP10_DECODER_DSUBEXP_H_
+#define VP10_DECODER_DSUBEXP_H_
#include "vpx_dsp/bitreader.h"
@@ -24,4 +24,4 @@
} // extern "C"
#endif
-#endif // VP9_DECODER_VP9_DSUBEXP_H_
+#endif // VP10_DECODER_DSUBEXP_H_
--- a/vp10/decoder/dthread.h
+++ b/vp10/decoder/dthread.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_DECODER_VP9_DTHREAD_H_
-#define VP9_DECODER_VP9_DTHREAD_H_
+#ifndef VP10_DECODER_DTHREAD_H_
+#define VP10_DECODER_DTHREAD_H_
#include "./vpx_config.h"
#include "vpx_util/vpx_thread.h"
@@ -63,4 +63,4 @@
void vp10_frameworker_copy_context(VPxWorker *const dst_worker,
VPxWorker *const src_worker);
-#endif // VP9_DECODER_VP9_DTHREAD_H_
+#endif // VP10_DECODER_DTHREAD_H_
--- a/vp10/encoder/aq_complexity.h
+++ b/vp10/encoder/aq_complexity.h
@@ -9,8 +9,8 @@
*/
-#ifndef VP9_ENCODER_VP9_AQ_COMPLEXITY_H_
-#define VP9_ENCODER_VP9_AQ_COMPLEXITY_H_
+#ifndef VP10_ENCODER_AQ_COMPLEXITY_H_
+#define VP10_ENCODER_AQ_COMPLEXITY_H_
#ifdef __cplusplus
extern "C" {@@ -34,4 +34,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_AQ_COMPLEXITY_H_
+#endif // VP10_ENCODER_AQ_COMPLEXITY_H_
--- a/vp10/encoder/aq_cyclicrefresh.h
+++ b/vp10/encoder/aq_cyclicrefresh.h
@@ -9,8 +9,8 @@
*/
-#ifndef VP9_ENCODER_VP9_AQ_CYCLICREFRESH_H_
-#define VP9_ENCODER_VP9_AQ_CYCLICREFRESH_H_
+#ifndef VP10_ENCODER_AQ_CYCLICREFRESH_H_
+#define VP10_ENCODER_AQ_CYCLICREFRESH_H_
#include "vp10/common/blockd.h"
@@ -95,4 +95,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_AQ_CYCLICREFRESH_H_
+#endif // VP10_ENCODER_AQ_CYCLICREFRESH_H_
--- a/vp10/encoder/aq_variance.h
+++ b/vp10/encoder/aq_variance.h
@@ -9,8 +9,8 @@
*/
-#ifndef VP9_ENCODER_VP9_AQ_VARIANCE_H_
-#define VP9_ENCODER_VP9_AQ_VARIANCE_H_
+#ifndef VP10_ENCODER_AQ_VARIANCE_H_
+#define VP10_ENCODER_AQ_VARIANCE_H_
#include "vp10/encoder/encoder.h"
@@ -28,4 +28,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_AQ_VARIANCE_H_
+#endif // VP10_ENCODER_AQ_VARIANCE_H_
--- a/vp10/encoder/bitstream.h
+++ b/vp10/encoder/bitstream.h
@@ -9,8 +9,8 @@
*/
-#ifndef VP9_ENCODER_VP9_BITSTREAM_H_
-#define VP9_ENCODER_VP9_BITSTREAM_H_
+#ifndef VP10_ENCODER_BITSTREAM_H_
+#define VP10_ENCODER_BITSTREAM_H_
#ifdef __cplusplus
extern "C" {@@ -34,4 +34,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_BITSTREAM_H_
+#endif // VP10_ENCODER_BITSTREAM_H_
--- a/vp10/encoder/block.h
+++ b/vp10/encoder/block.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_ENCODER_VP9_BLOCK_H_
-#define VP9_ENCODER_VP9_BLOCK_H_
+#ifndef VP10_ENCODER_BLOCK_H_
+#define VP10_ENCODER_BLOCK_H_
#include "vp10/common/entropymv.h"
#include "vp10/common/entropy.h"
@@ -147,4 +147,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_BLOCK_H_
+#endif // VP10_ENCODER_BLOCK_H_
--- a/vp10/encoder/context_tree.h
+++ b/vp10/encoder/context_tree.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_ENCODER_VP9_CONTEXT_TREE_H_
-#define VP9_ENCODER_VP9_CONTEXT_TREE_H_
+#ifndef VP10_ENCODER_CONTEXT_TREE_H_
+#define VP10_ENCODER_CONTEXT_TREE_H_
#include "vp10/common/blockd.h"
#include "vp10/encoder/block.h"
@@ -84,4 +84,4 @@
void vp10_setup_pc_tree(struct VP9Common *cm, struct ThreadData *td);
void vp10_free_pc_tree(struct ThreadData *td);
-#endif /* VP9_ENCODER_VP9_CONTEXT_TREE_H_ */
+#endif /* VP10_ENCODER_CONTEXT_TREE_H_ */
--- a/vp10/encoder/cost.h
+++ b/vp10/encoder/cost.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_ENCODER_VP9_COST_H_
-#define VP9_ENCODER_VP9_COST_H_
+#ifndef VP10_ENCODER_COST_H_
+#define VP10_ENCODER_COST_H_
#include "vpx_dsp/prob.h"
@@ -52,4 +52,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_COST_H_
+#endif // VP10_ENCODER_COST_H_
--- a/vp10/encoder/encodeframe.h
+++ b/vp10/encoder/encodeframe.h
@@ -9,8 +9,8 @@
*/
-#ifndef VP9_ENCODER_VP9_ENCODEFRAME_H_
-#define VP9_ENCODER_VP9_ENCODEFRAME_H_
+#ifndef VP10_ENCODER_ENCODEFRAME_H_
+#define VP10_ENCODER_ENCODEFRAME_H_
#include "vpx/vpx_integer.h"
@@ -46,4 +46,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_ENCODEFRAME_H_
+#endif // VP10_ENCODER_ENCODEFRAME_H_
--- a/vp10/encoder/encodemb.h
+++ b/vp10/encoder/encodemb.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_ENCODER_VP9_ENCODEMB_H_
-#define VP9_ENCODER_VP9_ENCODEMB_H_
+#ifndef VP10_ENCODER_ENCODEMB_H_
+#define VP10_ENCODER_ENCODEMB_H_
#include "./vpx_config.h"
#include "vp10/encoder/block.h"
@@ -43,4 +43,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_ENCODEMB_H_
+#endif // VP10_ENCODER_ENCODEMB_H_
--- a/vp10/encoder/encodemv.h
+++ b/vp10/encoder/encodemv.h
@@ -9,8 +9,8 @@
*/
-#ifndef VP9_ENCODER_VP9_ENCODEMV_H_
-#define VP9_ENCODER_VP9_ENCODEMV_H_
+#ifndef VP10_ENCODER_ENCODEMV_H_
+#define VP10_ENCODER_ENCODEMV_H_
#include "vp10/encoder/encoder.h"
@@ -35,4 +35,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_ENCODEMV_H_
+#endif // VP10_ENCODER_ENCODEMV_H_
--- a/vp10/encoder/encoder.h
+++ b/vp10/encoder/encoder.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_ENCODER_VP9_ENCODER_H_
-#define VP9_ENCODER_VP9_ENCODER_H_
+#ifndef VP10_ENCODER_ENCODER_H_
+#define VP10_ENCODER_ENCODER_H_
#include <stdio.h>
@@ -664,4 +664,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_ENCODER_H_
+#endif // VP10_ENCODER_ENCODER_H_
--- a/vp10/encoder/ethread.h
+++ b/vp10/encoder/ethread.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_ENCODER_VP9_ETHREAD_H_
-#define VP9_ENCODER_VP9_ETHREAD_H_
+#ifndef VP10_ENCODER_ETHREAD_H_
+#define VP10_ENCODER_ETHREAD_H_
struct VP9_COMP;
struct ThreadData;
@@ -22,4 +22,4 @@
void vp10_encode_tiles_mt(struct VP9_COMP *cpi);
-#endif // VP9_ENCODER_VP9_ETHREAD_H_
+#endif // VP10_ENCODER_ETHREAD_H_
--- a/vp10/encoder/extend.h
+++ b/vp10/encoder/extend.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_ENCODER_VP9_EXTEND_H_
-#define VP9_ENCODER_VP9_EXTEND_H_
+#ifndef VP10_ENCODER_EXTEND_H_
+#define VP10_ENCODER_EXTEND_H_
#include "vpx_scale/yv12config.h"
#include "vpx/vpx_integer.h"
@@ -30,4 +30,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_EXTEND_H_
+#endif // VP10_ENCODER_EXTEND_H_
--- a/vp10/encoder/firstpass.h
+++ b/vp10/encoder/firstpass.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_ENCODER_VP9_FIRSTPASS_H_
-#define VP9_ENCODER_VP9_FIRSTPASS_H_
+#ifndef VP10_ENCODER_FIRSTPASS_H_
+#define VP10_ENCODER_FIRSTPASS_H_
#include "vp10/encoder/lookahead.h"
#include "vp10/encoder/ratectrl.h"
@@ -163,4 +163,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_FIRSTPASS_H_
+#endif // VP10_ENCODER_FIRSTPASS_H_
--- a/vp10/encoder/lookahead.h
+++ b/vp10/encoder/lookahead.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_ENCODER_VP9_LOOKAHEAD_H_
-#define VP9_ENCODER_VP9_LOOKAHEAD_H_
+#ifndef VP10_ENCODER_LOOKAHEAD_H_
+#define VP10_ENCODER_LOOKAHEAD_H_
#include "vpx_scale/yv12config.h"
#include "vpx/vpx_integer.h"
@@ -121,4 +121,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_LOOKAHEAD_H_
+#endif // VP10_ENCODER_LOOKAHEAD_H_
--- a/vp10/encoder/mbgraph.h
+++ b/vp10/encoder/mbgraph.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_ENCODER_VP9_MBGRAPH_H_
-#define VP9_ENCODER_VP9_MBGRAPH_H_
+#ifndef VP10_ENCODER_MBGRAPH_H_
+#define VP10_ENCODER_MBGRAPH_H_
#ifdef __cplusplus
extern "C" {@@ -37,4 +37,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_MBGRAPH_H_
+#endif // VP10_ENCODER_MBGRAPH_H_
--- a/vp10/encoder/mcomp.h
+++ b/vp10/encoder/mcomp.h
@@ -9,8 +9,8 @@
*/
-#ifndef VP9_ENCODER_VP9_MCOMP_H_
-#define VP9_ENCODER_VP9_MCOMP_H_
+#ifndef VP10_ENCODER_MCOMP_H_
+#define VP10_ENCODER_MCOMP_H_
#include "vp10/encoder/block.h"
#include "vpx_dsp/variance.h"
@@ -162,4 +162,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_MCOMP_H_
+#endif // VP10_ENCODER_MCOMP_H_
--- a/vp10/encoder/picklpf.h
+++ b/vp10/encoder/picklpf.h
@@ -9,8 +9,8 @@
*/
-#ifndef VP9_ENCODER_VP9_PICKLPF_H_
-#define VP9_ENCODER_VP9_PICKLPF_H_
+#ifndef VP10_ENCODER_PICKLPF_H_
+#define VP10_ENCODER_PICKLPF_H_
#ifdef __cplusplus
extern "C" {@@ -27,4 +27,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_PICKLPF_H_
+#endif // VP10_ENCODER_PICKLPF_H_
--- a/vp10/encoder/pickmode.h
+++ b/vp10/encoder/pickmode.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_ENCODER_VP9_PICKMODE_H_
-#define VP9_ENCODER_VP9_PICKMODE_H_
+#ifndef VP10_ENCODER_PICKMODE_H_
+#define VP10_ENCODER_PICKMODE_H_
#include "vp10/encoder/encoder.h"
@@ -35,4 +35,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_PICKMODE_H_
+#endif // VP10_ENCODER_PICKMODE_H_
--- a/vp10/encoder/quantize.h
+++ b/vp10/encoder/quantize.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_ENCODER_VP9_QUANTIZE_H_
-#define VP9_ENCODER_VP9_QUANTIZE_H_
+#ifndef VP10_ENCODER_QUANTIZE_H_
+#define VP10_ENCODER_QUANTIZE_H_
#include "./vpx_config.h"
#include "vp10/encoder/block.h"
@@ -59,4 +59,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_QUANTIZE_H_
+#endif // VP10_ENCODER_QUANTIZE_H_
--- a/vp10/encoder/ratectrl.h
+++ b/vp10/encoder/ratectrl.h
@@ -9,8 +9,8 @@
*/
-#ifndef VP9_ENCODER_VP9_RATECTRL_H_
-#define VP9_ENCODER_VP9_RATECTRL_H_
+#ifndef VP10_ENCODER_RATECTRL_H_
+#define VP10_ENCODER_RATECTRL_H_
#include "vpx/vpx_codec.h"
#include "vpx/vpx_integer.h"
@@ -260,4 +260,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_RATECTRL_H_
+#endif // VP10_ENCODER_RATECTRL_H_
--- a/vp10/encoder/rd.h
+++ b/vp10/encoder/rd.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_ENCODER_VP9_RD_H_
-#define VP9_ENCODER_VP9_RD_H_
+#ifndef VP10_ENCODER_RD_H_
+#define VP10_ENCODER_RD_H_
#include <limits.h>
@@ -185,4 +185,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_RD_H_
+#endif // VP10_ENCODER_RD_H_
--- a/vp10/encoder/rdopt.h
+++ b/vp10/encoder/rdopt.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_ENCODER_VP9_RDOPT_H_
-#define VP9_ENCODER_VP9_RDOPT_H_
+#ifndef VP10_ENCODER_RDOPT_H_
+#define VP10_ENCODER_RDOPT_H_
#include "vp10/common/blockd.h"
@@ -71,4 +71,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_RDOPT_H_
+#endif // VP10_ENCODER_RDOPT_H_
--- a/vp10/encoder/resize.h
+++ b/vp10/encoder/resize.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_ENCODER_VP9_RESIZE_H_
-#define VP9_ENCODER_VP9_RESIZE_H_
+#ifndef VP10_ENCODER_RESIZE_H_
+#define VP10_ENCODER_RESIZE_H_
#include <stdio.h>
#include "vpx/vpx_integer.h"
@@ -121,4 +121,4 @@
int owidth,
int bd);
#endif // CONFIG_VP9_HIGHBITDEPTH
-#endif // VP9_ENCODER_VP9_RESIZE_H_
+#endif // VP10_ENCODER_RESIZE_H_
--- a/vp10/encoder/segmentation.h
+++ b/vp10/encoder/segmentation.h
@@ -9,8 +9,8 @@
*/
-#ifndef VP9_ENCODER_VP9_SEGMENTATION_H_
-#define VP9_ENCODER_VP9_SEGMENTATION_H_
+#ifndef VP10_ENCODER_SEGMENTATION_H_
+#define VP10_ENCODER_SEGMENTATION_H_
#include "vp10/common/blockd.h"
#include "vp10/encoder/encoder.h"
@@ -50,4 +50,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_SEGMENTATION_H_
+#endif // VP10_ENCODER_SEGMENTATION_H_
--- a/vp10/encoder/skin_detection.h
+++ b/vp10/encoder/skin_detection.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_ENCODER_VP9_SKIN_MAP_H_
-#define VP9_ENCODER_VP9_SKIN_MAP_H_
+#ifndef VP10_ENCODER_SKIN_MAP_H_
+#define VP10_ENCODER_SKIN_MAP_H_
#include "vp10/common/blockd.h"
@@ -32,4 +32,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_SKIN_MAP_H_
+#endif // VP10_ENCODER_SKIN_MAP_H_
--- a/vp10/encoder/speed_features.h
+++ b/vp10/encoder/speed_features.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_ENCODER_VP9_SPEED_FEATURES_H_
-#define VP9_ENCODER_VP9_SPEED_FEATURES_H_
+#ifndef VP10_ENCODER_SPEED_FEATURES_H_
+#define VP10_ENCODER_SPEED_FEATURES_H_
#include "vp10/common/enums.h"
@@ -429,4 +429,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_SPEED_FEATURES_H_
+#endif // VP10_ENCODER_SPEED_FEATURES_H_
--- a/vp10/encoder/subexp.h
+++ b/vp10/encoder/subexp.h
@@ -9,8 +9,8 @@
*/
-#ifndef VP9_ENCODER_VP9_SUBEXP_H_
-#define VP9_ENCODER_VP9_SUBEXP_H_
+#ifndef VP10_ENCODER_SUBEXP_H_
+#define VP10_ENCODER_SUBEXP_H_
#ifdef __cplusplus
extern "C" {@@ -41,4 +41,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_SUBEXP_H_
+#endif // VP10_ENCODER_SUBEXP_H_
--- a/vp10/encoder/svc_layercontext.h
+++ b/vp10/encoder/svc_layercontext.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_ENCODER_VP9_SVC_LAYERCONTEXT_H_
-#define VP9_ENCODER_VP9_SVC_LAYERCONTEXT_H_
+#ifndef VP10_ENCODER_SVC_LAYERCONTEXT_H_
+#define VP10_ENCODER_SVC_LAYERCONTEXT_H_
#include "vpx/vpx_encoder.h"
@@ -119,4 +119,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_SVC_LAYERCONTEXT_
+#endif // VP10_ENCODER_SVC_LAYERCONTEXT_
--- a/vp10/encoder/temporal_filter.h
+++ b/vp10/encoder/temporal_filter.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_ENCODER_VP9_TEMPORAL_FILTER_H_
-#define VP9_ENCODER_VP9_TEMPORAL_FILTER_H_
+#ifndef VP10_ENCODER_TEMPORAL_FILTER_H_
+#define VP10_ENCODER_TEMPORAL_FILTER_H_
#ifdef __cplusplus
extern "C" {@@ -22,4 +22,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_TEMPORAL_FILTER_H_
+#endif // VP10_ENCODER_TEMPORAL_FILTER_H_
--- a/vp10/encoder/tokenize.h
+++ b/vp10/encoder/tokenize.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_ENCODER_VP9_TOKENIZE_H_
-#define VP9_ENCODER_VP9_TOKENIZE_H_
+#ifndef VP10_ENCODER_TOKENIZE_H_
+#define VP10_ENCODER_TOKENIZE_H_
#include "vp10/common/entropy.h"
@@ -109,4 +109,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_TOKENIZE_H_
+#endif // VP10_ENCODER_TOKENIZE_H_
--- a/vp10/encoder/treewriter.h
+++ b/vp10/encoder/treewriter.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef VP9_ENCODER_VP9_TREEWRITER_H_
-#define VP9_ENCODER_VP9_TREEWRITER_H_
+#ifndef VP10_ENCODER_TREEWRITER_H_
+#define VP10_ENCODER_TREEWRITER_H_
#include "vpx_dsp/bitwriter.h"
@@ -48,4 +48,4 @@
} // extern "C"
#endif
-#endif // VP9_ENCODER_VP9_TREEWRITER_H_
+#endif // VP10_ENCODER_TREEWRITER_H_
--- a/vp10/vp10_iface_common.h
+++ b/vp10/vp10_iface_common.h
@@ -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 VP9_VP9_IFACE_COMMON_H_
-#define VP9_VP9_IFACE_COMMON_H_
+#ifndef VP10_VP10_IFACE_COMMON_H_
+#define VP10_VP10_IFACE_COMMON_H_
#include "vpx_ports/mem.h"
@@ -127,4 +127,4 @@
return VPX_CODEC_OK;
}
-#endif // VP9_VP9_IFACE_COMMON_H_
+#endif // VP10_VP10_IFACE_COMMON_H_