Commit bd9a388a authored by James Zern's avatar James Zern
Browse files

vp9: normalize include guards

Change-Id: If4ddbdcfb3ab387cbca6910b42cf4df8111e6879
parent ccffac2b
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef VP9_COMMON_VP9_COMMON_DSPR2_H_ #ifndef VP9_COMMON_MIPS_DSPR2_VP9_COMMON_DSPR2_H_
#define VP9_COMMON_VP9_COMMON_DSPR2_H_ #define VP9_COMMON_MIPS_DSPR2_VP9_COMMON_DSPR2_H_
#include <assert.h> #include <assert.h>
...@@ -114,4 +114,4 @@ void vp9_convolve2_vert_dspr2(const uint8_t *src, ptrdiff_t src_stride, ...@@ -114,4 +114,4 @@ void vp9_convolve2_vert_dspr2(const uint8_t *src, ptrdiff_t src_stride,
int w, int h); int w, int h);
#endif // #if HAVE_DSPR2 #endif // #if HAVE_DSPR2
#endif // VP9_COMMON_VP9_COMMON_DSPR2_H_ #endif // VP9_COMMON_MIPS_DSPR2_VP9_COMMON_DSPR2_H_
...@@ -29,4 +29,4 @@ extern const TX_SIZE max_txsize_lookup[BLOCK_SIZES]; ...@@ -29,4 +29,4 @@ extern const TX_SIZE max_txsize_lookup[BLOCK_SIZES];
extern const TX_SIZE tx_mode_to_biggest_tx_size[TX_MODES]; extern const TX_SIZE tx_mode_to_biggest_tx_size[TX_MODES];
extern const BLOCK_SIZE ss_size_lookup[BLOCK_SIZES][2][2]; extern const BLOCK_SIZE ss_size_lookup[BLOCK_SIZES][2][2];
#endif // VP9_COMMON_VP9_COMMON_DATA_H #endif // VP9_COMMON_VP9_COMMON_DATA_H_
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef VP9_COMMON_VP9_EXTEND_H_ #ifndef VP9_ENCODER_VP9_EXTEND_H_
#define VP9_COMMON_VP9_EXTEND_H_ #define VP9_ENCODER_VP9_EXTEND_H_
#include "vpx_scale/yv12config.h" #include "vpx_scale/yv12config.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
...@@ -22,4 +22,4 @@ void vp9_copy_and_extend_frame_with_rect(const YV12_BUFFER_CONFIG *src, ...@@ -22,4 +22,4 @@ void vp9_copy_and_extend_frame_with_rect(const YV12_BUFFER_CONFIG *src,
YV12_BUFFER_CONFIG *dst, YV12_BUFFER_CONFIG *dst,
int srcy, int srcx, int srcy, int srcx,
int srch, int srcw); int srch, int srcw);
#endif // VP9_COMMON_VP9_EXTEND_H_ #endif // VP9_ENCODER_VP9_EXTEND_H_
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef VP9_COMMON_VP9_SADMXN_H_ #ifndef VP9_ENCODER_VP9_SADMXN_H_
#define VP9_COMMON_VP9_SADMXN_H_ #define VP9_ENCODER_VP9_SADMXN_H_
#include "./vpx_config.h" #include "./vpx_config.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
...@@ -35,4 +35,4 @@ static INLINE unsigned int sad_mx_n_c(const uint8_t *src_ptr, ...@@ -35,4 +35,4 @@ static INLINE unsigned int sad_mx_n_c(const uint8_t *src_ptr,
return sad; return sad;
} }
#endif // VP9_COMMON_VP9_SADMXN_H_ #endif // VP9_ENCODER_VP9_SADMXN_H_
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
*/ */
#ifndef VP9_DECODER_VP9_SUBEXP_H_ #ifndef VP9_ENCODER_VP9_SUBEXP_H_
#define VP9_DECODER_VP9_SUBEXP_H_ #define VP9_ENCODER_VP9_SUBEXP_H_
void vp9_compute_update_table(); void vp9_compute_update_table();
...@@ -32,4 +32,4 @@ int vp9_prob_diff_update_savings_search_model(const unsigned int *ct, ...@@ -32,4 +32,4 @@ int vp9_prob_diff_update_savings_search_model(const unsigned int *ct,
vp9_prob upd, vp9_prob upd,
int b, int r); int b, int r);
#endif // VP9_DECODER_VP9_SUBEXP_H_ #endif // VP9_ENCODER_VP9_SUBEXP_H_
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
*/ */
#ifndef VP9_ENCODER_VP9_CONFIG_VAQ_H_ #ifndef VP9_ENCODER_VP9_VAQ_H_
#define VP9_ENCODER_VP9_CONFIG_VAQ_H_ #define VP9_ENCODER_VP9_VAQ_H_
#include "vp9/encoder/vp9_onyx_int.h" #include "vp9/encoder/vp9_onyx_int.h"
...@@ -23,4 +23,4 @@ void vp9_vaq_frame_setup(VP9_COMP *cpi); ...@@ -23,4 +23,4 @@ void vp9_vaq_frame_setup(VP9_COMP *cpi);
int vp9_block_energy(VP9_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bs); int vp9_block_energy(VP9_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bs);
#endif // VP9_ENCODER_VP9_CONFIG_VAQ_H_ #endif // VP9_ENCODER_VP9_VAQ_H_
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef VP9_BIT_WRITE_BUFFER_H_ #ifndef VP9_ENCODER_VP9_WRITE_BIT_BUFFER_H_
#define VP9_BIT_WRITE_BUFFER_H_ #define VP9_ENCODER_VP9_WRITE_BIT_BUFFER_H_
#include <limits.h> #include <limits.h>
...@@ -45,4 +45,4 @@ static void vp9_wb_write_literal(struct vp9_write_bit_buffer *wb, ...@@ -45,4 +45,4 @@ static void vp9_wb_write_literal(struct vp9_write_bit_buffer *wb,
} }
#endif // VP9_BIT_WRITE_BUFFER_H_ #endif // VP9_ENCODER_VP9_WRITE_BIT_BUFFER_H_
...@@ -36,5 +36,5 @@ ...@@ -36,5 +36,5 @@
#endif #endif
#endif #endif
#endif #endif // VP9_ENCODER_X86_VP9_MCOMP_X86_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