Commit bb285208 authored by James Zern's avatar James Zern

vp8/encoder: normalize include guards

Change-Id: I82834550503a43ff7ec8422342dc65136453b287
parent 074dc672
......@@ -9,8 +9,8 @@
*/
#ifndef __INC_BITSTREAM_H
#define __INC_BITSTREAM_H
#ifndef VP8_ENCODER_BITSTREAM_H_
#define VP8_ENCODER_BITSTREAM_H_
#if HAVE_EDSP
void vp8cx_pack_tokens_armv5(vp8_writer *w, const TOKENEXTRA *p, int xcount,
......@@ -43,4 +43,4 @@ void vp8_pack_tokens_c(vp8_writer *w, const TOKENEXTRA *p, int xcount);
# define pack_mb_row_tokens(a,b) pack_mb_row_tokens_c(a,b)
#endif
#endif
#endif // VP8_ENCODER_BITSTREAM_H_
......@@ -9,8 +9,8 @@
*/
#ifndef __INC_BLOCK_H
#define __INC_BLOCK_H
#ifndef VP8_ENCODER_BLOCK_H_
#define VP8_ENCODER_BLOCK_H_
#include "vp8/common/onyx.h"
#include "vp8/common/blockd.h"
......@@ -160,4 +160,4 @@ typedef struct macroblock
} MACROBLOCK;
#endif
#endif // VP8_ENCODER_BLOCK_H_
......@@ -16,8 +16,8 @@
* Description : Bool Coder header file.
*
****************************************************************************/
#ifndef __INC_BOOLHUFF_H
#define __INC_BOOLHUFF_H
#ifndef VP8_ENCODER_BOOLHUFF_H_
#define VP8_ENCODER_BOOLHUFF_H_
#include "vpx_ports/mem.h"
#include "vpx/internal/vpx_codec_internal.h"
......@@ -125,4 +125,4 @@ static void vp8_encode_bool(BOOL_CODER *br, int bit, int probability)
br->range = range;
}
#endif
#endif // VP8_ENCODER_BOOLHUFF_H_
......@@ -8,6 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP8_ENCODER_DCT_VALUE_COST_H_
#define VP8_ENCODER_DCT_VALUE_COST_H_
/* Generated file, included by tokenize.c */
/* Values generated by fill_value_tokens() */
......@@ -356,3 +359,5 @@ static const short dct_value_cost[2048*2] =
8134, 8140, 8148, 8170, 8178, 8184, 8192, 8202, 8210, 8216, 8224, 8243,
8251, 8257, 8265, 8275
};
#endif // VP8_ENCODER_DCT_VALUE_COST_H_
......@@ -8,6 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP8_ENCODER_DCT_VALUE_TOKENS_H_
#define VP8_ENCODER_DCT_VALUE_TOKENS_H_
/* Generated file, included by tokenize.c */
/* Values generated by fill_value_tokens() */
......@@ -697,3 +700,5 @@ static const TOKENVALUE dct_value_tokens[2048*2] =
{10, 3942}, {10, 3944}, {10, 3946}, {10, 3948}, {10, 3950}, {10, 3952},
{10, 3954}, {10, 3956}, {10, 3958}, {10, 3960}
};
#endif // VP8_ENCODER_DCT_VALUE_TOKENS_H_
......@@ -8,6 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP8_ENCODER_DEFAULTCOEFCOUNTS_H_
#define VP8_ENCODER_DEFAULTCOEFCOUNTS_H_
/* Generated file, included by entropy.c */
static const unsigned int default_coef_counts[BLOCK_TYPES]
......@@ -221,3 +224,5 @@ static const unsigned int default_coef_counts[BLOCK_TYPES]
},
},
};
#endif // VP8_ENCODER_DEFAULTCOEFCOUNTS_H_
......@@ -39,4 +39,4 @@ void vp8_denoiser_denoise_mb(VP8_DENOISER *denoiser,
int recon_yoffset,
int recon_uvoffset);
#endif /* VP8_ENCODER_DENOISING_H_ */
#endif // VP8_ENCODER_DENOISING_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 ENCODEFRAME_H
#define ENCODEFRAME_H
#ifndef VP8_ENCODER_ENCODEFRAME_H_
#define VP8_ENCODER_ENCODEFRAME_H_
extern void vp8_activity_masking(VP8_COMP *cpi, MACROBLOCK *x);
extern void vp8_build_block_offsets(MACROBLOCK *x);
......@@ -24,4 +24,4 @@ extern int vp8cx_encode_inter_macroblock(VP8_COMP *cpi, MACROBLOCK *x,
extern int vp8cx_encode_intra_macroblock(VP8_COMP *cpi, MACROBLOCK *x,
TOKENEXTRA **t);
#endif
#endif // VP8_ENCODER_ENCODEFRAME_H_
......@@ -9,8 +9,8 @@
*/
#ifndef _ENCODEINTRA_H_
#define _ENCODEINTRA_H_
#ifndef VP8_ENCODER_ENCODEINTRA_H_
#define VP8_ENCODER_ENCODEINTRA_H_
#include "onyx_int.h"
int vp8_encode_intra(VP8_COMP *cpi, MACROBLOCK *x, int use_dc_pred);
......@@ -18,4 +18,4 @@ void vp8_encode_intra16x16mby(MACROBLOCK *x);
void vp8_encode_intra16x16mbuv(MACROBLOCK *x);
void vp8_encode_intra4x4mby(MACROBLOCK *mb);
void vp8_encode_intra4x4block(MACROBLOCK *x, int ib);
#endif
#endif // VP8_ENCODER_ENCODEINTRA_H_
......@@ -9,8 +9,8 @@
*/
#ifndef __INC_ENCODEMB_H
#define __INC_ENCODEMB_H
#ifndef VP8_ENCODER_ENCODEMB_H_
#define VP8_ENCODER_ENCODEMB_H_
#include "onyx_int.h"
void vp8_encode_inter16x16(MACROBLOCK *x);
......@@ -23,4 +23,4 @@ void vp8_transform_intra_mby(MACROBLOCK *x);
void vp8_optimize_mby(MACROBLOCK *x);
void vp8_optimize_mbuv(MACROBLOCK *x);
void vp8_encode_inter16x16y(MACROBLOCK *x);
#endif
#endif // VP8_ENCODER_ENCODEMB_H_
......@@ -9,8 +9,8 @@
*/
#ifndef __INC_ENCODEMV_H
#define __INC_ENCODEMV_H
#ifndef VP8_ENCODER_ENCODEMV_H_
#define VP8_ENCODER_ENCODEMV_H_
#include "onyx_int.h"
......@@ -18,4 +18,4 @@ void vp8_write_mvprobs(VP8_COMP *);
void vp8_encode_motion_vector(vp8_writer *, const MV *, const MV_CONTEXT *);
void vp8_build_component_cost_table(int *mvcost[2], const MV_CONTEXT *mvc, int mvc_flag[2]);
#endif
#endif // VP8_ENCODER_ENCODEMV_H_
......@@ -9,8 +9,8 @@
*/
#if !defined __INC_FIRSTPASS_H
#define __INC_FIRSTPASS_H
#ifndef VP8_ENCODER_FIRSTPASS_H_
#define VP8_ENCODER_FIRSTPASS_H_
extern void vp8_init_first_pass(VP8_COMP *cpi);
extern void vp8_first_pass(VP8_COMP *cpi);
......@@ -21,4 +21,4 @@ extern void vp8_second_pass(VP8_COMP *cpi);
extern void vp8_end_second_pass(VP8_COMP *cpi);
extern size_t vp8_firstpass_stats_sz(unsigned int mb_count);
#endif
#endif // VP8_ENCODER_FIRSTPASS_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 LOOKAHEAD_H
#define LOOKAHEAD_H
#ifndef VP8_ENCODER_LOOKAHEAD_H_
#define VP8_ENCODER_LOOKAHEAD_H_
#include "vpx_scale/yv12config.h"
#include "vpx/vpx_integer.h"
......@@ -106,4 +106,4 @@ unsigned int
vp8_lookahead_depth(struct lookahead_ctx *ctx);
#endif
#endif // VP8_ENCODER_LOOKAHEAD_H_
......@@ -9,8 +9,8 @@
*/
#ifndef __INC_MCOMP_H
#define __INC_MCOMP_H
#ifndef VP8_ENCODER_MCOMP_H_
#define VP8_ENCODER_MCOMP_H_
#include "block.h"
#include "vp8/common/variance.h"
......@@ -104,4 +104,4 @@ typedef int (*vp8_diamond_search_fn_t)
int_mv *center_mv
);
#endif
#endif // VP8_ENCODER_MCOMP_H_
......@@ -9,9 +9,9 @@
*/
#ifndef __INC_MODECOSTS_H
#define __INC_MODECOSTS_H
#ifndef VP8_ENCODER_MODECOSTS_H_
#define VP8_ENCODER_MODECOSTS_H_
void vp8_init_mode_costs(VP8_COMP *x);
#endif
#endif // VP8_ENCODER_MODECOSTS_H_
......@@ -9,12 +9,12 @@
*/
#ifndef __INC_MR_DISSIM_H
#define __INC_MR_DISSIM_H
#ifndef VP8_ENCODER_MR_DISSIM_H_
#define VP8_ENCODER_MR_DISSIM_H_
#include "vpx_config.h"
extern void vp8_cal_low_res_mb_cols(VP8_COMP *cpi);
extern void vp8_cal_dissimilarity(VP8_COMP *cpi);
extern void vp8_store_drop_frame_info(VP8_COMP *cpi);
#endif
#endif // VP8_ENCODER_MR_DISSIM_H_
......@@ -9,8 +9,8 @@
*/
#ifndef __INC_VP8_INT_H
#define __INC_VP8_INT_H
#ifndef VP8_ENCODER_ONYX_INT_H_
#define VP8_ENCODER_ONYX_INT_H_
#include <stdio.h>
#include "vpx_config.h"
......@@ -721,4 +721,4 @@ void vp8_set_speed_features(VP8_COMP *cpi);
"Failed to allocate "#lval);\
} while(0)
#endif
#endif
#endif // VP8_ENCODER_ONYX_INT_H_
......@@ -9,8 +9,8 @@
*/
#ifndef __INC_PICKINTER_H
#define __INC_PICKINTER_H
#ifndef VP8_ENCODER_PICKINTER_H_
#define VP8_ENCODER_PICKINTER_H_
#include "vpx_config.h"
#include "vp8/common/onyxc_int.h"
......@@ -24,4 +24,4 @@ extern int vp8_get_inter_mbpred_error(MACROBLOCK *mb,
const vp8_variance_fn_ptr_t *vfp,
unsigned int *sse,
int_mv this_mv);
#endif
#endif // VP8_ENCODER_PICKINTER_H_
......@@ -9,9 +9,9 @@
*/
#ifndef __INC_PSNR_H
#define __INC_PSNR_H
#ifndef VP8_ENCODER_PSNR_H_
#define VP8_ENCODER_PSNR_H_
extern double vp8_mse2psnr(double Samples, double Peak, double Mse);
#endif
#endif // VP8_ENCODER_PSNR_H_
......@@ -9,8 +9,8 @@
*/
#ifndef __INC_QUANTIZE_H
#define __INC_QUANTIZE_H
#ifndef VP8_ENCODER_QUANTIZE_H_
#define VP8_ENCODER_QUANTIZE_H_
struct VP8_COMP;
struct macroblock;
......@@ -20,4 +20,4 @@ extern void vp8_update_zbin_extra(struct VP8_COMP *cpi, struct macroblock *x);
extern void vp8cx_mb_init_quantizer(struct VP8_COMP *cpi, struct macroblock *x, int ok_to_skip);
extern void vp8cx_init_quantizer(struct VP8_COMP *cpi);
#endif
#endif // VP8_ENCODER_QUANTIZE_H_
......@@ -9,7 +9,8 @@
*/
#if !defined __INC_RATECTRL_H
#ifndef VP8_ENCODER_RATECTRL_H_
#define VP8_ENCODER_RATECTRL_H_
#include "onyx_int.h"
......@@ -25,4 +26,4 @@ extern void vp8_compute_frame_size_bounds(VP8_COMP *cpi, int *frame_under_shoot_
/* return of 0 means drop frame */
extern int vp8_pick_frame_size(VP8_COMP *cpi);
#endif
#endif // VP8_ENCODER_RATECTRL_H_
......@@ -9,8 +9,8 @@
*/
#ifndef __INC_RDOPT_H
#define __INC_RDOPT_H
#ifndef VP8_ENCODER_RDOPT_H_
#define VP8_ENCODER_RDOPT_H_
#define RDCOST(RM,DM,R,D) ( ((128+(R)*(RM)) >> 8) + (DM)*(D) )
......@@ -130,4 +130,4 @@ extern void vp8_mv_pred
);
void vp8_cal_sad(VP8_COMP *cpi, MACROBLOCKD *xd, MACROBLOCK *x, int recon_yoffset, int near_sadidx[]);
#endif
#endif // VP8_ENCODER_RDOPT_H_
......@@ -8,9 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP8_ENCODER_SEGMENTATION_H_
#define VP8_ENCODER_SEGMENTATION_H_
#include "string.h"
#include "vp8/common/blockd.h"
#include "onyx_int.h"
extern void vp8_update_gf_useage_maps(VP8_COMP *cpi, VP8_COMMON *cm, MACROBLOCK *x);
#endif // VP8_ENCODER_SEGMENTATION_H_
......@@ -9,8 +9,8 @@
*/
#ifndef tokenize_h
#define tokenize_h
#ifndef VP8_ENCODER_TOKENIZE_H_
#define VP8_ENCODER_TOKENIZE_H_
#include "vp8/common/entropy.h"
#include "block.h"
......@@ -47,4 +47,4 @@ extern const short *const vp8_dct_value_cost_ptr;
*/
extern const TOKENVALUE *const vp8_dct_value_tokens_ptr;
#endif /* tokenize_h */
#endif // VP8_ENCODER_TOKENIZE_H_
......@@ -9,8 +9,8 @@
*/
#ifndef __INC_TREEWRITER_H
#define __INC_TREEWRITER_H
#ifndef VP8_ENCODER_TREEWRITER_H_
#define VP8_ENCODER_TREEWRITER_H_
/* Trees map alphabets into huffman-like codes suitable for an arithmetic
bit coder. Timothy S Murphy 11 October 2004 */
......@@ -123,4 +123,4 @@ void vp8_cost_tokens2(
int *Costs, const vp8_prob *, vp8_tree, int
);
#endif
#endif // VP8_ENCODER_TREEWRITER_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