diff options
| author | Yaowu Xu <yaowu@google.com> | 2015-08-13 09:25:39 -0700 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2015-08-13 09:25:39 -0700 |
| commit | 2dcefd9c7fdc08f28f8276f2a41df453c1f0a020 (patch) | |
| tree | 3898cb5e764349df233dce980c051fec2c5f076e | |
| parent | 4622af69e61577e8d726d8b252fcfeaefdf65696 (diff) | |
| download | libvpx-2dcefd9c7fdc08f28f8276f2a41df453c1f0a020.tar.gz | |
Correct guard macros in header files
Change-Id: Ifce12a95c1cdc36dc6ac5a72759249a17407da9e
67 files changed, 201 insertions, 201 deletions
diff --git a/vp10/common/alloccommon.h b/vp10/common/alloccommon.h index e2df9e424..35a09c177 100644 --- 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 @@ void vp10_swap_current_and_last_seg_map(struct VP9Common *cm); } // extern "C" #endif -#endif // VP9_COMMON_VP9_ALLOCCOMMON_H_ +#endif // VP10_COMMON_ALLOCCOMMON_H_ diff --git a/vp10/common/blockd.h b/vp10/common/blockd.h index 6173a9625..c9a10262b 100644 --- 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 @@ void vp10_set_contexts(const MACROBLOCKD *xd, struct macroblockd_plane *pd, } // extern "C" #endif -#endif // VP9_COMMON_VP9_BLOCKD_H_ +#endif // VP10_COMMON_BLOCKD_H_ diff --git a/vp10/common/common.h b/vp10/common/common.h index 6cd1c9cf6..e5789727f 100644 --- 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 @@ static INLINE int get_unsigned_bits(unsigned int num_values) { } // extern "C" #endif -#endif // VP9_COMMON_VP9_COMMON_H_ +#endif // VP10_COMMON_COMMON_H_ diff --git a/vp10/common/common_data.h b/vp10/common/common_data.h index 0fe129833..81895181f 100644 --- 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 @@ static const struct { } // extern "C" #endif -#endif // VP9_COMMON_VP9_COMMON_DATA_H_ +#endif // VP10_COMMON_COMMON_DATA_H_ diff --git a/vp10/common/entropy.h b/vp10/common/entropy.h index e95d8c418..7b77855f8 100644 --- 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 @@ static INLINE int get_entropy_context(TX_SIZE tx_size, const ENTROPY_CONTEXT *a, } // extern "C" #endif -#endif // VP9_COMMON_VP9_ENTROPY_H_ +#endif // VP10_COMMON_ENTROPY_H_ diff --git a/vp10/common/entropymode.h b/vp10/common/entropymode.h index 391dcf32f..5fbf14ea2 100644 --- 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 @@ void vp10_tx_counts_to_branch_counts_8x8(const unsigned int *tx_count_8x8p, } // extern "C" #endif -#endif // VP9_COMMON_VP9_ENTROPYMODE_H_ +#endif // VP10_COMMON_ENTROPYMODE_H_ diff --git a/vp10/common/entropymv.h b/vp10/common/entropymv.h index a6c12d14c..4cd27d257 100644 --- 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 @@ void vp10_inc_mv(const MV *mv, nmv_context_counts *mvctx); } // extern "C" #endif -#endif // VP9_COMMON_VP9_ENTROPYMV_H_ +#endif // VP10_COMMON_ENTROPYMV_H_ diff --git a/vp10/common/enums.h b/vp10/common/enums.h index d089f23f9..a226a2d69 100644 --- 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 @@ typedef uint8_t PREDICTION_MODE; } // extern "C" #endif -#endif // VP9_COMMON_VP9_ENUMS_H_ +#endif // VP10_COMMON_ENUMS_H_ diff --git a/vp10/common/filter.h b/vp10/common/filter.h index 983f81788..826cd0386 100644 --- 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 const InterpKernel *vp10_filter_kernels[4]; } // extern "C" #endif -#endif // VP9_COMMON_VP9_FILTER_H_ +#endif // VP10_COMMON_FILTER_H_ diff --git a/vp10/common/frame_buffers.h b/vp10/common/frame_buffers.h index 35d975b89..729ebafb0 100644 --- 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 @@ int vp10_release_frame_buffer(void *cb_priv, vpx_codec_frame_buffer_t *fb); } // extern "C" #endif -#endif // VP9_COMMON_VP9_FRAME_BUFFERS_H_ +#endif // VP10_COMMON_FRAME_BUFFERS_H_ diff --git a/vp10/common/idct.h b/vp10/common/idct.h index 496917ebb..f185657ed 100644 --- 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 @@ void vp10_highbd_iht16x16_add(TX_TYPE tx_type, const tran_low_t *input, } // extern "C" #endif -#endif // VP9_COMMON_VP9_IDCT_H_ +#endif // VP10_COMMON_IDCT_H_ diff --git a/vp10/common/loopfilter.h b/vp10/common/loopfilter.h index a26fe6b65..8129224d8 100644 --- 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 @@ int vp10_loop_filter_worker(LFWorkerData *const lf_data, void *unused); } // extern "C" #endif -#endif // VP9_COMMON_VP9_LOOPFILTER_H_ +#endif // VP10_COMMON_LOOPFILTER_H_ diff --git a/vp10/common/mfqe.h b/vp10/common/mfqe.h index 163c1f161..8da050b1e 100644 --- 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 @@ void vp10_mfqe(struct VP9Common *cm); } // extern "C" #endif -#endif // VP9_COMMON_VP9_MFQE_H_ +#endif // VP10_COMMON_MFQE_H_ diff --git a/vp10/common/mv.h b/vp10/common/mv.h index 62b77b838..b4971a567 100644 --- 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 @@ static INLINE void clamp_mv(MV *mv, int min_col, int max_col, } // extern "C" #endif -#endif // VP9_COMMON_VP9_MV_H_ +#endif // VP10_COMMON_MV_H_ diff --git a/vp10/common/mvref_common.h b/vp10/common/mvref_common.h index cdd0f3c67..9af26e206 100644 --- 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 @@ void vp10_append_sub8x8_mvs_for_idx(VP9_COMMON *cm, MACROBLOCKD *xd, } // extern "C" #endif -#endif // VP9_COMMON_VP9_MVREF_COMMON_H_ +#endif // VP10_COMMON_MVREF_COMMON_H_ diff --git a/vp10/common/onyxc_int.h b/vp10/common/onyxc_int.h index 8d3074c6a..93f021bc0 100644 --- 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 @@ static INLINE int partition_plane_context(const MACROBLOCKD *xd, } // extern "C" #endif -#endif // VP9_COMMON_VP9_ONYXC_INT_H_ +#endif // VP10_COMMON_ONYXC_INT_H_ diff --git a/vp10/common/postproc.h b/vp10/common/postproc.h index 14ef876ad..ddf29fa6c 100644 --- 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 @@ void vp10_deblock(const YV12_BUFFER_CONFIG *src, YV12_BUFFER_CONFIG *dst, int q) } // extern "C" #endif -#endif // VP9_COMMON_VP9_POSTPROC_H_ +#endif // VP10_COMMON_POSTPROC_H_ diff --git a/vp10/common/ppflags.h b/vp10/common/ppflags.h index 4a3ef4125..8592fe906 100644 --- 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 @@ typedef struct { } // extern "C" #endif -#endif // VP9_COMMON_VP9_PPFLAGS_H_ +#endif // VP10_COMMON_PPFLAGS_H_ diff --git a/vp10/common/pred_common.h b/vp10/common/pred_common.h index 69b42e335..ec833420f 100644 --- 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 @@ static INLINE unsigned int *get_tx_counts(TX_SIZE max_tx_size, int ctx, } // extern "C" #endif -#endif // VP9_COMMON_VP9_PRED_COMMON_H_ +#endif // VP10_COMMON_PRED_COMMON_H_ diff --git a/vp10/common/quant_common.h b/vp10/common/quant_common.h index d44b132d0..6813e1734 100644 --- 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 @@ int vp10_get_qindex(const struct segmentation *seg, int segment_id, } // extern "C" #endif -#endif // VP9_COMMON_VP9_QUANT_COMMON_H_ +#endif // VP10_COMMON_QUANT_COMMON_H_ diff --git a/vp10/common/reconinter.h b/vp10/common/reconinter.h index d9f3ab5a8..1595899e6 100644 --- 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 @@ void vp10_setup_pre_planes(MACROBLOCKD *xd, int idx, } // extern "C" #endif -#endif // VP9_COMMON_VP9_RECONINTER_H_ +#endif // VP10_COMMON_RECONINTER_H_ diff --git a/vp10/common/reconintra.h b/vp10/common/reconintra.h index 0b3891a3c..ef551e6d6 100644 --- 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 @@ void vp10_predict_intra_block(const MACROBLOCKD *xd, int bwl_in, } // extern "C" #endif -#endif // VP9_COMMON_VP9_RECONINTRA_H_ +#endif // VP10_COMMON_RECONINTRA_H_ diff --git a/vp10/common/scale.h b/vp10/common/scale.h index 5e5e7d09e..833f6c411 100644 --- 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 @@ static INLINE int valid_ref_frame_size(int ref_width, int ref_height, } // extern "C" #endif -#endif // VP9_COMMON_VP9_SCALE_H_ +#endif // VP10_COMMON_SCALE_H_ diff --git a/vp10/common/scan.h b/vp10/common/scan.h index cf93c09ec..f3c2a042e 100644 --- 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 @@ static INLINE const scan_order *get_scan(const MACROBLOCKD *xd, TX_SIZE tx_size, } // extern "C" #endif -#endif // VP9_COMMON_VP9_SCAN_H_ +#endif // VP10_COMMON_SCAN_H_ diff --git a/vp10/common/seg_common.h b/vp10/common/seg_common.h index 4c6d3eac8..97b875c9c 100644 --- 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 const vpx_tree_index vp10_segment_tree[TREE_SIZE(MAX_SEGMENTS)]; } // extern "C" #endif -#endif // VP9_COMMON_VP9_SEG_COMMON_H_ +#endif // VP10_COMMON_SEG_COMMON_H_ diff --git a/vp10/common/textblit.h b/vp10/common/textblit.h index 179acc12f..c37140d0f 100644 --- 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 @@ void vp10_blit_line(int x0, int x1, int y0, int y1, unsigned char *image, } // extern "C" #endif -#endif // VP9_COMMON_VP9_TEXTBLIT_H_ +#endif // VP10_COMMON_TEXTBLIT_H_ diff --git a/vp10/common/thread_common.h b/vp10/common/thread_common.h index 09f100b10..fe6b10b02 100644 --- 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_loop_filter_frame_mt(YV12_BUFFER_CONFIG *frame, 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_ diff --git a/vp10/common/tile_common.h b/vp10/common/tile_common.h index cd7b84d65..8256f187d 100644 --- 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 @@ void vp10_get_tile_n_bits(int mi_cols, } // extern "C" #endif -#endif // VP9_COMMON_VP9_TILE_COMMON_H_ +#endif // VP10_COMMON_TILE_COMMON_H_ diff --git a/vp10/decoder/decodeframe.h b/vp10/decoder/decodeframe.h index 39a59460e..81c3e2344 100644 --- 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 @@ void vp10_decode_frame(struct VP9Decoder *pbi, } // extern "C" #endif -#endif // VP9_DECODER_VP9_DECODEFRAME_H_ +#endif // VP10_DECODER_DECODEFRAME_H_ diff --git a/vp10/decoder/decodemv.h b/vp10/decoder/decodemv.h index 8734ccc4b..ca6ea9615 100644 --- 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 @@ void vp10_read_mode_info(VP9Decoder *const pbi, MACROBLOCKD *xd, } // extern "C" #endif -#endif // VP9_DECODER_VP9_DECODEMV_H_ +#endif // VP10_DECODER_DECODEMV_H_ diff --git a/vp10/decoder/decoder.h b/vp10/decoder/decoder.h index 462a64ebd..308821b38 100644 --- 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 @@ static INLINE void decrease_ref_count(int idx, RefCntBuffer *const frame_bufs, } // extern "C" #endif -#endif // VP9_DECODER_VP9_DECODER_H_ +#endif // VP10_DECODER_DECODER_H_ diff --git a/vp10/decoder/detokenize.h b/vp10/decoder/detokenize.h index cf752d1d4..c3fd90a72 100644 --- 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 @@ int vp10_decode_block_tokens(MACROBLOCKD *xd, } // extern "C" #endif -#endif // VP9_DECODER_VP9_DETOKENIZE_H_ +#endif // VP10_DECODER_DETOKENIZE_H_ diff --git a/vp10/decoder/dsubexp.h b/vp10/decoder/dsubexp.h index a422f555a..1a7ed9910 100644 --- 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 @@ void vp10_diff_update_prob(vpx_reader *r, vpx_prob* p); } // extern "C" #endif -#endif // VP9_DECODER_VP9_DSUBEXP_H_ +#endif // VP10_DECODER_DSUBEXP_H_ diff --git a/vp10/decoder/dthread.h b/vp10/decoder/dthread.h index 008103507..f08389655 100644 --- 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_broadcast(RefCntBuffer *const buf, int row); void vp10_frameworker_copy_context(VPxWorker *const dst_worker, VPxWorker *const src_worker); -#endif // VP9_DECODER_VP9_DTHREAD_H_ +#endif // VP10_DECODER_DTHREAD_H_ diff --git a/vp10/encoder/aq_complexity.h b/vp10/encoder/aq_complexity.h index 9048da629..51629a48a 100644 --- 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 @@ void vp10_setup_in_frame_q_adj(struct VP9_COMP *cpi); } // extern "C" #endif -#endif // VP9_ENCODER_VP9_AQ_COMPLEXITY_H_ +#endif // VP10_ENCODER_AQ_COMPLEXITY_H_ diff --git a/vp10/encoder/aq_cyclicrefresh.h b/vp10/encoder/aq_cyclicrefresh.h index 3eb6462f9..6316a98e6 100644 --- 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 @@ static INLINE int cyclic_refresh_segment_id(int segment_id) { } // extern "C" #endif -#endif // VP9_ENCODER_VP9_AQ_CYCLICREFRESH_H_ +#endif // VP10_ENCODER_AQ_CYCLICREFRESH_H_ diff --git a/vp10/encoder/aq_variance.h b/vp10/encoder/aq_variance.h index 199493e11..bfb42ecca 100644 --- 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 @@ double vp10_log_block_var(VP9_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bs); } // extern "C" #endif -#endif // VP9_ENCODER_VP9_AQ_VARIANCE_H_ +#endif // VP10_ENCODER_AQ_VARIANCE_H_ diff --git a/vp10/encoder/bitstream.h b/vp10/encoder/bitstream.h index d235c3217..1fb55f369 100644 --- 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 @@ static INLINE int vp10_preserve_existing_gf(VP9_COMP *cpi) { } // extern "C" #endif -#endif // VP9_ENCODER_VP9_BITSTREAM_H_ +#endif // VP10_ENCODER_BITSTREAM_H_ diff --git a/vp10/encoder/block.h b/vp10/encoder/block.h index 423c4d7bd..7008f338c 100644 --- 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 @@ struct macroblock { } // extern "C" #endif -#endif // VP9_ENCODER_VP9_BLOCK_H_ +#endif // VP10_ENCODER_BLOCK_H_ diff --git a/vp10/encoder/context_tree.h b/vp10/encoder/context_tree.h index fd6587000..b58348bb0 100644 --- 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 @@ typedef struct PC_TREE { 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_ */ diff --git a/vp10/encoder/cost.h b/vp10/encoder/cost.h index 3086f7901..b9619c6b1 100644 --- 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 @@ void vp10_cost_tokens_skip(int *costs, const vpx_prob *probs, vpx_tree tree); } // extern "C" #endif -#endif // VP9_ENCODER_VP9_COST_H_ +#endif // VP10_ENCODER_COST_H_ diff --git a/vp10/encoder/encodeframe.h b/vp10/encoder/encodeframe.h index 5d0ea7cc5..3c12e210a 100644 --- 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 @@ void vp10_set_variance_partition_thresholds(struct VP9_COMP *cpi, int q); } // extern "C" #endif -#endif // VP9_ENCODER_VP9_ENCODEFRAME_H_ +#endif // VP10_ENCODER_ENCODEFRAME_H_ diff --git a/vp10/encoder/encodemb.h b/vp10/encoder/encodemb.h index 7914d6fda..4061ef32c 100644 --- 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 @@ void vp10_encode_intra_block_plane(MACROBLOCK *x, BLOCK_SIZE bsize, int plane); } // extern "C" #endif -#endif // VP9_ENCODER_VP9_ENCODEMB_H_ +#endif // VP10_ENCODER_ENCODEMB_H_ diff --git a/vp10/encoder/encodemv.h b/vp10/encoder/encodemv.h index 3ac457281..de148ea05 100644 --- 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 @@ void vp10_update_mv_count(ThreadData *td); } // extern "C" #endif -#endif // VP9_ENCODER_VP9_ENCODEMV_H_ +#endif // VP10_ENCODER_ENCODEMV_H_ diff --git a/vp10/encoder/encoder.h b/vp10/encoder/encoder.h index 472ae8814..c8449c1ab 100644 --- 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 @@ void vp10_new_framerate(VP9_COMP *cpi, double framerate); } // extern "C" #endif -#endif // VP9_ENCODER_VP9_ENCODER_H_ +#endif // VP10_ENCODER_ENCODER_H_ diff --git a/vp10/encoder/ethread.h b/vp10/encoder/ethread.h index 74db03747..1a4ea717e 100644 --- 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 @@ typedef struct EncWorkerData { void vp10_encode_tiles_mt(struct VP9_COMP *cpi); -#endif // VP9_ENCODER_VP9_ETHREAD_H_ +#endif // VP10_ENCODER_ETHREAD_H_ diff --git a/vp10/encoder/extend.h b/vp10/encoder/extend.h index 97f423ef4..6f502ef6a 100644 --- 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 @@ void vp10_copy_and_extend_frame_with_rect(const YV12_BUFFER_CONFIG *src, } // extern "C" #endif -#endif // VP9_ENCODER_VP9_EXTEND_H_ +#endif // VP10_ENCODER_EXTEND_H_ diff --git a/vp10/encoder/firstpass.h b/vp10/encoder/firstpass.h index 17b930a42..174cf7ba1 100644 --- 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 @@ void vp10_calculate_coded_size(struct VP9_COMP *cpi, } // extern "C" #endif -#endif // VP9_ENCODER_VP9_FIRSTPASS_H_ +#endif // VP10_ENCODER_FIRSTPASS_H_ diff --git a/vp10/encoder/lookahead.h b/vp10/encoder/lookahead.h index e7aeb5f90..663b8d86c 100644 --- 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 @@ unsigned int vp10_lookahead_depth(struct lookahead_ctx *ctx); } // extern "C" #endif -#endif // VP9_ENCODER_VP9_LOOKAHEAD_H_ +#endif // VP10_ENCODER_LOOKAHEAD_H_ diff --git a/vp10/encoder/mbgraph.h b/vp10/encoder/mbgraph.h index dda820bd3..f116dd74d 100644 --- 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 @@ void vp10_update_mbgraph_stats(struct VP9_COMP *cpi); } // extern "C" #endif -#endif // VP9_ENCODER_VP9_MBGRAPH_H_ +#endif // VP10_ENCODER_MBGRAPH_H_ diff --git a/vp10/encoder/mcomp.h b/vp10/encoder/mcomp.h index 3fe9f6c95..681698db3 100644 --- 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 @@ int vp10_full_pixel_search(struct VP9_COMP *cpi, MACROBLOCK *x, } // extern "C" #endif -#endif // VP9_ENCODER_VP9_MCOMP_H_ +#endif // VP10_ENCODER_MCOMP_H_ diff --git a/vp10/encoder/picklpf.h b/vp10/encoder/picklpf.h index ad45f7c74..df2b4d786 100644 --- 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 @@ void vp10_pick_filter_level(const struct yv12_buffer_config *sd, } // extern "C" #endif -#endif // VP9_ENCODER_VP9_PICKLPF_H_ +#endif // VP10_ENCODER_PICKLPF_H_ diff --git a/vp10/encoder/pickmode.h b/vp10/encoder/pickmode.h index b15127de8..703c32615 100644 --- 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 @@ void vp10_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x, } // extern "C" #endif -#endif // VP9_ENCODER_VP9_PICKMODE_H_ +#endif // VP10_ENCODER_PICKMODE_H_ diff --git a/vp10/encoder/quantize.h b/vp10/encoder/quantize.h index 462b155d1..7754f8326 100644 --- 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 @@ int vp10_qindex_to_quantizer(int qindex); } // extern "C" #endif -#endif // VP9_ENCODER_VP9_QUANTIZE_H_ +#endif // VP10_ENCODER_QUANTIZE_H_ diff --git a/vp10/encoder/ratectrl.h b/vp10/encoder/ratectrl.h index 28a3d519a..696a05561 100644 --- 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 @@ int vp10_resize_one_pass_cbr(struct VP9_COMP *cpi); } // extern "C" #endif -#endif // VP9_ENCODER_VP9_RATECTRL_H_ +#endif // VP10_ENCODER_RATECTRL_H_ diff --git a/vp10/encoder/rd.h b/vp10/encoder/rd.h index 8f2d20b9a..b343e2452 100644 --- 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 @@ int vp10_get_intra_cost_penalty(int qindex, int qdelta, } // extern "C" #endif -#endif // VP9_ENCODER_VP9_RD_H_ +#endif // VP10_ENCODER_RD_H_ diff --git a/vp10/encoder/rdopt.h b/vp10/encoder/rdopt.h index 8047b93c0..78b0c22d3 100644 --- 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 @@ void vp10_rd_pick_inter_mode_sub8x8(struct VP9_COMP *cpi, } // extern "C" #endif -#endif // VP9_ENCODER_VP9_RDOPT_H_ +#endif // VP10_ENCODER_RDOPT_H_ diff --git a/vp10/encoder/resize.h b/vp10/encoder/resize.h index a0b59dfd3..131fc80ca 100644 --- 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 @@ void vp10_highbd_resize_frame444(const uint8_t *const y, int owidth, int bd); #endif // CONFIG_VP9_HIGHBITDEPTH -#endif // VP9_ENCODER_VP9_RESIZE_H_ +#endif // VP10_ENCODER_RESIZE_H_ diff --git a/vp10/encoder/segmentation.h b/vp10/encoder/segmentation.h index 85e4fe6e9..d30373d3f 100644 --- 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 @@ void vp10_reset_segment_features(struct segmentation *seg); } // extern "C" #endif -#endif // VP9_ENCODER_VP9_SEGMENTATION_H_ +#endif // VP10_ENCODER_SEGMENTATION_H_ diff --git a/vp10/encoder/skin_detection.h b/vp10/encoder/skin_detection.h index acfc8f119..6c8927d36 100644 --- 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 @@ void vp10_compute_skin_map(VP9_COMP *const cpi, FILE *yuv_skinmap_file); } // extern "C" #endif -#endif // VP9_ENCODER_VP9_SKIN_MAP_H_ +#endif // VP10_ENCODER_SKIN_MAP_H_ diff --git a/vp10/encoder/speed_features.h b/vp10/encoder/speed_features.h index 32e8a5d77..15443e3ba 100644 --- 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 @@ void vp10_set_speed_features_framesize_dependent(struct VP9_COMP *cpi); } // extern "C" #endif -#endif // VP9_ENCODER_VP9_SPEED_FEATURES_H_ +#endif // VP10_ENCODER_SPEED_FEATURES_H_ diff --git a/vp10/encoder/subexp.h b/vp10/encoder/subexp.h index 5f4d613db..04b96c0bd 100644 --- 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 @@ int vp10_prob_diff_update_savings_search_model(const unsigned int *ct, } // extern "C" #endif -#endif // VP9_ENCODER_VP9_SUBEXP_H_ +#endif // VP10_ENCODER_SUBEXP_H_ diff --git a/vp10/encoder/svc_layercontext.h b/vp10/encoder/svc_layercontext.h index 41cb9e69b..cf0ee901d 100644 --- 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 @@ int vp10_one_pass_cbr_svc_start_layer(struct VP9_COMP *const cpi); } // extern "C" #endif -#endif // VP9_ENCODER_VP9_SVC_LAYERCONTEXT_ +#endif // VP10_ENCODER_SVC_LAYERCONTEXT_ diff --git a/vp10/encoder/temporal_filter.h b/vp10/encoder/temporal_filter.h index 496662679..9dae7d580 100644 --- 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 @@ void vp10_temporal_filter(VP9_COMP *cpi, int distance); } // extern "C" #endif -#endif // VP9_ENCODER_VP9_TEMPORAL_FILTER_H_ +#endif // VP10_ENCODER_TEMPORAL_FILTER_H_ diff --git a/vp10/encoder/tokenize.h b/vp10/encoder/tokenize.h index 1e8df82a5..e9df3004a 100644 --- 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 @@ static INLINE int16_t vp10_get_token(int v) { } // extern "C" #endif -#endif // VP9_ENCODER_VP9_TOKENIZE_H_ +#endif // VP10_ENCODER_TOKENIZE_H_ diff --git a/vp10/encoder/treewriter.h b/vp10/encoder/treewriter.h index 8c8029e73..6b76a03e4 100644 --- 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 @@ static INLINE void vp10_write_token(vpx_writer *w, const vpx_tree_index *tree, } // extern "C" #endif -#endif // VP9_ENCODER_VP9_TREEWRITER_H_ +#endif // VP10_ENCODER_TREEWRITER_H_ diff --git a/vp10/vp10_iface_common.h b/vp10/vp10_iface_common.h index 58bb7d5d6..4bc34372d 100644 --- 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 @@ static vpx_codec_err_t image2yuvconfig(const vpx_image_t *img, return VPX_CODEC_OK; } -#endif // VP9_VP9_IFACE_COMMON_H_ +#endif // VP10_VP10_IFACE_COMMON_H_ |