shithub: libvpx

--- a/vp8/common/alloccommon.h

+++ b/vp8/common/alloccommon.h

@@ -9,8 +9,8 @@

*/

-#ifndef __INC_ALLOCCOMMON_H

-#define __INC_ALLOCCOMMON_H

+#ifndef VP8_COMMON_ALLOCCOMMON_H_

+#define VP8_COMMON_ALLOCCOMMON_H_

 #include "onyxc_int.h"

@@ -20,4 +20,4 @@

 int vp8_alloc_frame_buffers(VP8_COMMON *oci, int width, int height);

 void vp8_setup_version(VP8_COMMON *oci);

-#endif

+#endif  // VP8_COMMON_ALLOCCOMMON_H_

--- a/vp8/common/arm/bilinearfilter_arm.h

+++ b/vp8/common/arm/bilinearfilter_arm.h

@@ -9,8 +9,8 @@

*/

-#ifndef BILINEARFILTER_ARM_H

-#define BILINEARFILTER_ARM_H

+#ifndef VP8_COMMON_ARM_BILINEARFILTER_ARM_H_

+#define VP8_COMMON_ARM_BILINEARFILTER_ARM_H_

 extern void vp8_filter_block2d_bil_first_pass_armv6

@@ -32,4 +32,4 @@

     const short         *vp8_filter

);

-#endif /* BILINEARFILTER_ARM_H */

+#endif  // VP8_COMMON_ARM_BILINEARFILTER_ARM_H_

--- a/vp8/common/blockd.h

+++ b/vp8/common/blockd.h

@@ -9,8 +9,8 @@

*/

-#ifndef __INC_BLOCKD_H

-#define __INC_BLOCKD_H

+#ifndef VP8_COMMON_BLOCKD_H_

+#define VP8_COMMON_BLOCKD_H_

 void vpx_log(const char *format, ...);

@@ -297,4 +297,4 @@

 extern void vp8_build_block_doffsets(MACROBLOCKD *x);

 extern void vp8_setup_block_dptrs(MACROBLOCKD *x);

-#endif  /* __INC_BLOCKD_H */

+#endif  // VP8_COMMON_BLOCKD_H_

--- a/vp8/common/coefupdateprobs.h

+++ b/vp8/common/coefupdateprobs.h

@@ -8,6 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

*/

+#ifndef VP8_COMMON_COEFUPDATEPROBS_H_

+#define VP8_COMMON_COEFUPDATEPROBS_H_

 /* Update probabilities for the nodes in the token entropy tree.

    Generated file included by entropy.c */

@@ -183,3 +185,5 @@

},

},

};

+#endif  // VP8_COMMON_COEFUPDATEPROBS_H_

--- a/vp8/common/common.h

+++ b/vp8/common/common.h

@@ -9,8 +9,8 @@

*/

-#ifndef common_h

-#define common_h 1

+#ifndef VP8_COMMON_COMMON_H_

+#define VP8_COMMON_COMMON_H_

 #include <assert.h>

@@ -37,4 +37,4 @@

 #define vp8_zero_array( Dest, N)  vpx_memset( Dest, 0, N * sizeof( *Dest));

-#endif  /* common_h */

+#endif  // VP8_COMMON_COMMON_H_

--- a/vp8/common/default_coef_probs.h

+++ b/vp8/common/default_coef_probs.h

@@ -8,6 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

*/

+#ifndef VP8_COMMON_DEFAULT_COEF_PROBS_H_

+#define VP8_COMMON_DEFAULT_COEF_PROBS_H_

 /*Generated file, included by entropy.c*/

@@ -186,3 +188,5 @@

};

+#endif  // VP8_COMMON_DEFAULT_COEF_PROBS_H_

--- a/vp8/common/entropy.h

+++ b/vp8/common/entropy.h

@@ -9,8 +9,8 @@

*/

-#ifndef __INC_ENTROPY_H

-#define __INC_ENTROPY_H

+#ifndef VP8_COMMON_ENTROPY_H_

+#define VP8_COMMON_ENTROPY_H_

 #include "treecoder.h"

 #include "blockd.h"

@@ -98,4 +98,4 @@

 extern const int vp8_mb_feature_data_bits[MB_LVL_MAX];

 void vp8_coef_tree_initialize(void);

-#endif

+#endif  // VP8_COMMON_ENTROPY_H_

--- a/vp8/common/entropymode.h

+++ b/vp8/common/entropymode.h

@@ -9,8 +9,8 @@

*/

-#ifndef __INC_ENTROPYMODE_H

-#define __INC_ENTROPYMODE_H

+#ifndef VP8_COMMON_ENTROPYMODE_H_

+#define VP8_COMMON_ENTROPYMODE_H_

 #include "onyxc_int.h"

 #include "treecoder.h"

@@ -77,4 +77,4 @@

 void vp8_default_bmode_probs(vp8_prob dest [VP8_BINTRAMODES-1]);

 void vp8_kf_default_bmode_probs(vp8_prob dest [VP8_BINTRAMODES] [VP8_BINTRAMODES] [VP8_BINTRAMODES-1]);

-#endif

+#endif  // VP8_COMMON_ENTROPYMODE_H_

--- a/vp8/common/entropymv.h

+++ b/vp8/common/entropymv.h

@@ -9,8 +9,8 @@

*/

-#ifndef __INC_ENTROPYMV_H

-#define __INC_ENTROPYMV_H

+#ifndef VP8_COMMON_ENTROPYMV_H_

+#define VP8_COMMON_ENTROPYMV_H_

 #include "treecoder.h"

@@ -41,4 +41,4 @@

 extern const MV_CONTEXT vp8_mv_update_probs[2], vp8_default_mv_context[2];

-#endif

+#endif  // VP8_COMMON_ENTROPYMV_H_

--- a/vp8/common/extend.h

+++ b/vp8/common/extend.h

@@ -9,8 +9,8 @@

*/

-#ifndef __INC_EXTEND_H

-#define __INC_EXTEND_H

+#ifndef VP8_COMMON_EXTEND_H_

+#define VP8_COMMON_EXTEND_H_

 #include "vpx_scale/yv12config.h"

@@ -22,4 +22,4 @@

                                          int srcy, int srcx,

                                          int srch, int srcw);

-#endif

+#endif  // VP8_COMMON_EXTEND_H_

--- a/vp8/common/filter.h

+++ b/vp8/common/filter.h

@@ -9,8 +9,8 @@

*/

-#ifndef FILTER_H

-#define FILTER_H

+#ifndef VP8_COMMON_FILTER_H_

+#define VP8_COMMON_FILTER_H_

 #include "vpx_ports/mem.h"

@@ -21,4 +21,4 @@

 extern DECLARE_ALIGNED(16, const short, vp8_bilinear_filters[8][2]);

 extern DECLARE_ALIGNED(16, const short, vp8_sub_pel_filters[8][6]);

-#endif

+#endif  // VP8_COMMON_FILTER_H_

--- a/vp8/common/findnearmv.h

+++ b/vp8/common/findnearmv.h

@@ -9,8 +9,8 @@

*/

-#ifndef __INC_FINDNEARMV_H

-#define __INC_FINDNEARMV_H

+#ifndef VP8_COMMON_FINDNEARMV_H_

+#define VP8_COMMON_FINDNEARMV_H_

 #include "mv.h"

 #include "blockd.h"

@@ -179,4 +179,4 @@

     return (cur_mb->bmi + b - 4)->as_mode;

-#endif

+#endif  // VP8_COMMON_FINDNEARMV_H_

--- a/vp8/common/header.h

+++ b/vp8/common/header.h

@@ -9,8 +9,8 @@

*/

-#ifndef __INC_HEADER_H

-#define __INC_HEADER_H

+#ifndef VP8_COMMON_HEADER_H_

+#define VP8_COMMON_HEADER_H_

 /* 24 bits total */

 typedef struct

@@ -40,4 +40,4 @@

 #endif

-#endif

+#endif  // VP8_COMMON_HEADER_H_

--- a/vp8/common/invtrans.h

+++ b/vp8/common/invtrans.h

@@ -9,8 +9,8 @@

*/

-#ifndef __INC_INVTRANS_H

-#define __INC_INVTRANS_H

+#ifndef VP8_COMMON_INVTRANS_H_

+#define VP8_COMMON_INVTRANS_H_

 #include "vpx_config.h"

 #include "vp8_rtcd.h"

@@ -59,4 +59,4 @@

                      xd->dst.y_buffer,

                      xd->dst.y_stride, xd->eobs);

-#endif

+#endif  // VP8_COMMON_INVTRANS_H_

--- a/vp8/common/loopfilter.h

+++ b/vp8/common/loopfilter.h

@@ -9,8 +9,8 @@

*/

-#ifndef loopfilter_h

-#define loopfilter_h

+#ifndef VP8_COMMON_LOOPFILTER_H_

+#define VP8_COMMON_LOOPFILTER_H_

 #include "vpx_ports/mem.h"

 #include "vpx_config.h"

@@ -102,4 +102,4 @@

                                 int mb_row, int post_ystride, int post_uvstride,

                                 unsigned char *y_ptr, unsigned char *u_ptr,

                                 unsigned char *v_ptr);

-#endif

+#endif  // VP8_COMMON_LOOPFILTER_H_

--- a/vp8/common/modecont.h

+++ b/vp8/common/modecont.h

@@ -9,9 +9,9 @@

*/

-#ifndef __INC_MODECONT_H

-#define __INC_MODECONT_H

+#ifndef VP8_COMMON_MODECONT_H_

+#define VP8_COMMON_MODECONT_H_

 extern const int vp8_mode_contexts[6][4];

-#endif

+#endif  // VP8_COMMON_MODECONT_H_

--- a/vp8/common/mv.h

+++ b/vp8/common/mv.h

@@ -9,8 +9,8 @@

*/

-#ifndef __INC_MV_H

-#define __INC_MV_H

+#ifndef VP8_COMMON_MV_H_

+#define VP8_COMMON_MV_H_

 #include "vpx/vpx_integer.h"

 typedef struct

@@ -25,4 +25,4 @@

     MV        as_mv;

 } int_mv;        /* facilitates faster equality tests and copies */

-#endif

+#endif  // VP8_COMMON_MV_H_

--- a/vp8/common/onyx.h

+++ b/vp8/common/onyx.h

@@ -9,8 +9,8 @@

*/

-#ifndef __INC_VP8_H

-#define __INC_VP8_H

+#ifndef VP8_COMMON_ONYX_H_

+#define VP8_COMMON_ONYX_H_

 #ifdef __cplusplus

 extern "C"

@@ -267,4 +267,4 @@

 #endif

-#endif

+#endif  // VP8_COMMON_ONYX_H_

--- a/vp8/common/onyxc_int.h

+++ b/vp8/common/onyxc_int.h

@@ -9,8 +9,8 @@

*/

-#ifndef __INC_VP8C_INT_H

-#define __INC_VP8C_INT_H

+#ifndef VP8_COMMON_ONYXC_INT_H_

+#define VP8_COMMON_ONYXC_INT_H_

 #include "vpx_config.h"

 #include "vp8_rtcd.h"

@@ -174,4 +174,4 @@

     int cpu_caps;

 } VP8_COMMON;

-#endif

+#endif  // VP8_COMMON_ONYXC_INT_H_

--- a/vp8/common/onyxd.h

+++ b/vp8/common/onyxd.h

@@ -9,8 +9,8 @@

*/

-#ifndef __INC_VP8D_H

-#define __INC_VP8D_H

+#ifndef VP8_COMMON_ONYXD_H_

+#define VP8_COMMON_ONYXD_H_

 /* Create/destroy static data structures. */

@@ -60,4 +60,4 @@

 #endif

-#endif

+#endif  // VP8_COMMON_ONYXD_H_

--- a/vp8/common/postproc.h

+++ b/vp8/common/postproc.h

@@ -9,8 +9,8 @@

*/

-#ifndef POSTPROC_H

-#define POSTPROC_H

+#ifndef VP8_COMMON_POSTPROC_H_

+#define VP8_COMMON_POSTPROC_H_

 #include "vpx_ports/mem.h"

 struct postproc_state

@@ -47,4 +47,4 @@

 #define MFQE_PRECISION 4

 void vp8_multiframe_quality_enhance(struct VP8Common *cm);

-#endif

+#endif  // VP8_COMMON_POSTPROC_H_

--- a/vp8/common/ppflags.h

+++ b/vp8/common/ppflags.h

@@ -9,8 +9,8 @@

*/

-#ifndef __INC_PPFLAGS_H

-#define __INC_PPFLAGS_H

+#ifndef VP8_COMMON_PPFLAGS_H_

+#define VP8_COMMON_PPFLAGS_H_

 enum

     VP8D_NOFILTERING            = 0,

@@ -38,4 +38,4 @@

     int display_mv_flag;

 } vp8_ppflags_t;

-#endif

+#endif  // VP8_COMMON_PPFLAGS_H_

--- a/vp8/common/pragmas.h

+++ b/vp8/common/pragmas.h

@@ -8,9 +8,9 @@

  *  be found in the AUTHORS file in the root of the source tree.

*/

+#ifndef VP8_COMMON_PRAGMAS_H_

+#define VP8_COMMON_PRAGMAS_H_

 #ifdef __INTEL_COMPILER

 #pragma warning(disable:997 1011 170)

 #endif

@@ -17,3 +17,5 @@

 #ifdef _MSC_VER

 #pragma warning(disable:4799)

 #endif

+#endif  // VP8_COMMON_PRAGMAS_H_

--- a/vp8/common/quant_common.h

+++ b/vp8/common/quant_common.h

@@ -8,7 +8,10 @@

  *  be found in the AUTHORS file in the root of the source tree.

*/

+#ifndef VP8_COMMON_QUANT_COMMON_H_

+#define VP8_COMMON_QUANT_COMMON_H_

 #include "string.h"

 #include "blockd.h"

 #include "onyxc_int.h"

@@ -19,3 +22,5 @@

 extern int vp8_ac2quant(int QIndex, int Delta);

 extern int vp8_dc_uv_quant(int QIndex, int Delta);

 extern int vp8_ac_uv_quant(int QIndex, int Delta);

+#endif  // VP8_COMMON_QUANT_COMMON_H_

--- a/vp8/common/reconinter.h

+++ b/vp8/common/reconinter.h

@@ -9,8 +9,8 @@

*/

-#ifndef __INC_RECONINTER_H

-#define __INC_RECONINTER_H

+#ifndef VP8_COMMON_RECONINTER_H_

+#define VP8_COMMON_RECONINTER_H_

 extern void vp8_build_inter_predictors_mb(MACROBLOCKD *x);

 extern void vp8_build_inter16x16_predictors_mb(MACROBLOCKD *x,

@@ -32,4 +32,4 @@

 extern void vp8_build_inter16x16_predictors_mbuv(MACROBLOCKD *x);

 extern void vp8_build_inter4x4_predictors_mbuv(MACROBLOCKD *x);

-#endif

+#endif  // VP8_COMMON_RECONINTER_H_

--- a/vp8/common/reconintra4x4.h

+++ b/vp8/common/reconintra4x4.h

@@ -9,8 +9,8 @@

*/

-#ifndef __INC_RECONINTRA4x4_H

-#define __INC_RECONINTRA4x4_H

+#ifndef VP8_COMMON_RECONINTRA4X4_H_

+#define VP8_COMMON_RECONINTRA4X4_H_

 #include "vp8/common/blockd.h"

 static void intra_prediction_down_copy(MACROBLOCKD *xd,

@@ -29,4 +29,4 @@

     *dst_ptr2 = *src_ptr;

-#endif

+#endif  // VP8_COMMON_RECONINTRA4X4_H_

--- a/vp8/common/setupintrarecon.h

+++ b/vp8/common/setupintrarecon.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

*/

-#ifndef SETUPINTRARECON_H

-#define SETUPINTRARECON_H

+#ifndef VP8_COMMON_SETUPINTRARECON_H_

+#define VP8_COMMON_SETUPINTRARECON_H_

 #include "vpx_scale/yv12config.h"

 extern void vp8_setup_intra_recon(YV12_BUFFER_CONFIG *ybf);

@@ -34,4 +34,4 @@

         v_buffer[uv_stride *i] = (unsigned char) 129;

-#endif

+#endif  // VP8_COMMON_SETUPINTRARECON_H_

--- a/vp8/common/swapyv12buffer.h

+++ b/vp8/common/swapyv12buffer.h

@@ -9,11 +9,11 @@

*/

-#ifndef SWAPYV12_BUFFER_H

-#define SWAPYV12_BUFFER_H

+#ifndef VP8_COMMON_SWAPYV12BUFFER_H_

+#define VP8_COMMON_SWAPYV12BUFFER_H_

 #include "vpx_scale/yv12config.h"

 void vp8_swap_yv12_buffer(YV12_BUFFER_CONFIG *new_frame, YV12_BUFFER_CONFIG *last_frame);

-#endif

+#endif  // VP8_COMMON_SWAPYV12BUFFER_H_

--- a/vp8/common/systemdependent.h

+++ b/vp8/common/systemdependent.h

@@ -8,8 +8,12 @@

  *  be found in the AUTHORS file in the root of the source tree.

*/

+#ifndef VP8_COMMON_SYSTEMDEPENDENT_H_

+#define VP8_COMMON_SYSTEMDEPENDENT_H_

 #include "vpx_config.h"

 struct VP8Common;

 void vp8_machine_specific_config(struct VP8Common *);

+#endif  // VP8_COMMON_SYSTEMDEPENDENT_H_

--- a/vp8/common/threading.h

+++ b/vp8/common/threading.h

@@ -9,8 +9,8 @@

*/

-#ifndef _PTHREAD_EMULATION

-#define _PTHREAD_EMULATION

+#ifndef VP8_COMMON_THREADING_H_

+#define VP8_COMMON_THREADING_H_

 #if CONFIG_OS_SUPPORT && CONFIG_MULTITHREAD

@@ -183,4 +183,4 @@

 #endif /* CONFIG_OS_SUPPORT && CONFIG_MULTITHREAD */

-#endif

+#endif  // VP8_COMMON_THREADING_H_

--- a/vp8/common/treecoder.h

+++ b/vp8/common/treecoder.h

@@ -9,8 +9,8 @@

*/

-#ifndef __INC_TREECODER_H

-#define __INC_TREECODER_H

+#ifndef VP8_COMMON_TREECODER_H_

+#define VP8_COMMON_TREECODER_H_

 typedef unsigned char vp8bc_index_t; /* probability index */

@@ -87,4 +87,4 @@

);

-#endif

+#endif  // VP8_COMMON_TREECODER_H_

--- a/vp8/common/variance.h

+++ b/vp8/common/variance.h

@@ -9,8 +9,8 @@

*/

-#ifndef VARIANCE_H

-#define VARIANCE_H

+#ifndef VP8_COMMON_VARIANCE_H_

+#define VP8_COMMON_VARIANCE_H_

 #include "vpx_config.h"

@@ -112,4 +112,4 @@

 #endif

 } vp8_variance_fn_ptr_t;

-#endif

+#endif  // VP8_COMMON_VARIANCE_H_

--- a/vp8/common/vp8_entropymodedata.h

+++ b/vp8/common/vp8_entropymodedata.h

@@ -8,6 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

*/

+#ifndef VP8_COMMON_VP8_ENTROPYMODEDATA_H_

+#define VP8_COMMON_VP8_ENTROPYMODEDATA_H_

 /*Generated file, included by entropymode.c*/

@@ -240,3 +242,5 @@

         { 112,  19,  12,  61, 195, 128,  48,   4,  24 }

};

+#endif  // VP8_COMMON_VP8_ENTROPYMODEDATA_H_

--- a/vp8/common/x86/filter_x86.h

+++ b/vp8/common/x86/filter_x86.h

@@ -8,8 +8,8 @@

  *  be found in the AUTHORS file in the root of the source tree.

*/

-#ifndef FILTER_X86_H

-#define FILTER_X86_H

+#ifndef VP8_COMMON_X86_FILTER_X86_H_

+#define VP8_COMMON_X86_FILTER_X86_H_

 #include "vpx_ports/mem.h"

@@ -22,4 +22,4 @@

 /* duplicated 8x */

 extern DECLARE_ALIGNED(16, const short, vp8_bilinear_filters_x86_8[8][16]);

-#endif /* FILTER_X86_H */

+#endif  // VP8_COMMON_X86_FILTER_X86_H_