Commit 2dcefd9c authored by Yaowu Xu's avatar Yaowu Xu
Browse files

Correct guard macros in header files

Change-Id: Ifce12a95c1cdc36dc6ac5a72759249a17407da9e
parent 4622af69
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
......@@ -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_
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment