vp8/common: add extern "C" to headers Change-Id: I13b434b1e6621e31962b08831c3587c039368c83
diff --git a/vp8/common/alloccommon.h b/vp8/common/alloccommon.h index 38f89a0..93e99d7 100644 --- a/vp8/common/alloccommon.h +++ b/vp8/common/alloccommon.h
@@ -14,10 +14,18 @@ #include "onyxc_int.h" +#ifdef __cplusplus +extern "C" { +#endif + void vp8_create_common(VP8_COMMON *oci); void vp8_remove_common(VP8_COMMON *oci); void vp8_de_alloc_frame_buffers(VP8_COMMON *oci); int vp8_alloc_frame_buffers(VP8_COMMON *oci, int width, int height); void vp8_setup_version(VP8_COMMON *oci); +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_ALLOCCOMMON_H_
diff --git a/vp8/common/arm/bilinearfilter_arm.h b/vp8/common/arm/bilinearfilter_arm.h index dd3ff14..6b84e6f 100644 --- a/vp8/common/arm/bilinearfilter_arm.h +++ b/vp8/common/arm/bilinearfilter_arm.h
@@ -12,6 +12,10 @@ #ifndef VP8_COMMON_ARM_BILINEARFILTER_ARM_H_ #define VP8_COMMON_ARM_BILINEARFILTER_ARM_H_ +#ifdef __cplusplus +extern "C" { +#endif + extern void vp8_filter_block2d_bil_first_pass_armv6 ( const unsigned char *src_ptr, @@ -32,4 +36,8 @@ const short *vp8_filter ); +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_ARM_BILINEARFILTER_ARM_H_
diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h index c3caee1..ea1a6a4 100644 --- a/vp8/common/blockd.h +++ b/vp8/common/blockd.h
@@ -20,6 +20,10 @@ #include "treecoder.h" #include "vpx_ports/mem.h" +#ifdef __cplusplus +extern "C" { +#endif + /*#define DCPRED 1*/ #define DCPREDSIMTHRESH 0 #define DCPREDCNTTHRESH 3 @@ -297,4 +301,8 @@ extern void vp8_build_block_doffsets(MACROBLOCKD *x); extern void vp8_setup_block_dptrs(MACROBLOCKD *x); +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_BLOCKD_H_
diff --git a/vp8/common/coefupdateprobs.h b/vp8/common/coefupdateprobs.h index 90d290d..d96a19e 100644 --- a/vp8/common/coefupdateprobs.h +++ b/vp8/common/coefupdateprobs.h
@@ -11,6 +11,10 @@ #ifndef VP8_COMMON_COEFUPDATEPROBS_H_ #define VP8_COMMON_COEFUPDATEPROBS_H_ +#ifdef __cplusplus +extern "C" { +#endif + /* Update probabilities for the nodes in the token entropy tree. Generated file included by entropy.c */ @@ -186,4 +190,8 @@ }, }; +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_COEFUPDATEPROBS_H_
diff --git a/vp8/common/common.h b/vp8/common/common.h index 9671da0..ee5b58c 100644 --- a/vp8/common/common.h +++ b/vp8/common/common.h
@@ -18,6 +18,10 @@ #include "vpx_mem/vpx_mem.h" +#ifdef __cplusplus +extern "C" { +#endif + /* Only need this for fixed-size arrays, for structs just assign. */ #define vp8_copy( Dest, Src) { \ @@ -37,4 +41,8 @@ #define vp8_zero_array( Dest, N) vpx_memset( Dest, 0, N * sizeof( *Dest)); +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_COMMON_H_
diff --git a/vp8/common/default_coef_probs.h b/vp8/common/default_coef_probs.h index 8368545..4d69e4b 100644 --- a/vp8/common/default_coef_probs.h +++ b/vp8/common/default_coef_probs.h
@@ -11,6 +11,10 @@ #ifndef VP8_COMMON_DEFAULT_COEF_PROBS_H_ #define VP8_COMMON_DEFAULT_COEF_PROBS_H_ +#ifdef __cplusplus +extern "C" { +#endif + /*Generated file, included by entropy.c*/ @@ -189,4 +193,8 @@ } }; +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_DEFAULT_COEF_PROBS_H_
diff --git a/vp8/common/entropy.h b/vp8/common/entropy.h index 175fa9f..a90bab4 100644 --- a/vp8/common/entropy.h +++ b/vp8/common/entropy.h
@@ -15,6 +15,10 @@ #include "treecoder.h" #include "blockd.h" +#ifdef __cplusplus +extern "C" { +#endif + /* Coefficient token alphabet */ #define ZERO_TOKEN 0 /* 0 Extra Bits 0+0 */ @@ -98,4 +102,8 @@ extern const int vp8_mb_feature_data_bits[MB_LVL_MAX]; void vp8_coef_tree_initialize(void); +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_ENTROPY_H_
diff --git a/vp8/common/entropymode.h b/vp8/common/entropymode.h index 18af8c0..81bdfc4 100644 --- a/vp8/common/entropymode.h +++ b/vp8/common/entropymode.h
@@ -15,6 +15,10 @@ #include "onyxc_int.h" #include "treecoder.h" +#ifdef __cplusplus +extern "C" { +#endif + typedef enum { SUBMVREF_NORMAL, @@ -77,4 +81,8 @@ 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]); +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_ENTROPYMODE_H_
diff --git a/vp8/common/entropymv.h b/vp8/common/entropymv.h index 7d16b98..42840d5 100644 --- a/vp8/common/entropymv.h +++ b/vp8/common/entropymv.h
@@ -14,6 +14,10 @@ #include "treecoder.h" +#ifdef __cplusplus +extern "C" { +#endif + enum { mv_max = 1023, /* max absolute value of a MV component */ @@ -41,4 +45,8 @@ extern const MV_CONTEXT vp8_mv_update_probs[2], vp8_default_mv_context[2]; +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_ENTROPYMV_H_
diff --git a/vp8/common/extend.h b/vp8/common/extend.h index b7e7040..068f4ac 100644 --- a/vp8/common/extend.h +++ b/vp8/common/extend.h
@@ -14,6 +14,10 @@ #include "vpx_scale/yv12config.h" +#ifdef __cplusplus +extern "C" { +#endif + void vp8_extend_mb_row(YV12_BUFFER_CONFIG *ybf, unsigned char *YPtr, unsigned char *UPtr, unsigned char *VPtr); void vp8_copy_and_extend_frame(YV12_BUFFER_CONFIG *src, YV12_BUFFER_CONFIG *dst); @@ -22,4 +26,8 @@ int srcy, int srcx, int srch, int srcw); +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_EXTEND_H_
diff --git a/vp8/common/filter.h b/vp8/common/filter.h index c2048ee..cfba775 100644 --- a/vp8/common/filter.h +++ b/vp8/common/filter.h
@@ -14,6 +14,10 @@ #include "vpx_ports/mem.h" +#ifdef __cplusplus +extern "C" { +#endif + #define BLOCK_HEIGHT_WIDTH 4 #define VP8_FILTER_WEIGHT 128 #define VP8_FILTER_SHIFT 7 @@ -21,4 +25,8 @@ extern DECLARE_ALIGNED(16, const short, vp8_bilinear_filters[8][2]); extern DECLARE_ALIGNED(16, const short, vp8_sub_pel_filters[8][6]); +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_FILTER_H_
diff --git a/vp8/common/findnearmv.h b/vp8/common/findnearmv.h index 1525db2..3c8c050 100644 --- a/vp8/common/findnearmv.h +++ b/vp8/common/findnearmv.h
@@ -17,6 +17,10 @@ #include "modecont.h" #include "treecoder.h" +#ifdef __cplusplus +extern "C" { +#endif + static void mv_bias(int refmb_ref_frame_sign_bias, int refframe, int_mv *mvp, const int *ref_frame_sign_bias) @@ -179,4 +183,8 @@ return (cur_mb->bmi + b - 4)->as_mode; } +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_FINDNEARMV_H_
diff --git a/vp8/common/header.h b/vp8/common/header.h index 61a8f49..e27bca1 100644 --- a/vp8/common/header.h +++ b/vp8/common/header.h
@@ -12,6 +12,10 @@ #ifndef VP8_COMMON_HEADER_H_ #define VP8_COMMON_HEADER_H_ +#ifdef __cplusplus +extern "C" { +#endif + /* 24 bits total */ typedef struct { @@ -40,4 +44,8 @@ #endif +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_HEADER_H_
diff --git a/vp8/common/invtrans.h b/vp8/common/invtrans.h index 0186e6b..affe57e 100644 --- a/vp8/common/invtrans.h +++ b/vp8/common/invtrans.h
@@ -21,6 +21,10 @@ #include "vpx_mem/vpx_mem.h" #endif +#ifdef __cplusplus +extern "C" { +#endif + static void eob_adjust(char *eobs, short *diff) { /* eob adjust.... the idct can only skip if both the dc and eob are zero */ @@ -59,4 +63,8 @@ xd->dst.y_buffer, xd->dst.y_stride, xd->eobs); } +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_INVTRANS_H_
diff --git a/vp8/common/loopfilter.h b/vp8/common/loopfilter.h index 51825ef..20a6bd3 100644 --- a/vp8/common/loopfilter.h +++ b/vp8/common/loopfilter.h
@@ -16,6 +16,10 @@ #include "vpx_config.h" #include "vp8_rtcd.h" +#ifdef __cplusplus +extern "C" { +#endif + #define MAX_LOOP_FILTER 63 /* fraction of total macroblock rows to be used in fast filter level picking */ /* has to be > 2 */ @@ -102,4 +106,8 @@ int mb_row, int post_ystride, int post_uvstride, unsigned char *y_ptr, unsigned char *u_ptr, unsigned char *v_ptr); +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_LOOPFILTER_H_
diff --git a/vp8/common/modecont.h b/vp8/common/modecont.h index 875bc27..ff34c33 100644 --- a/vp8/common/modecont.h +++ b/vp8/common/modecont.h
@@ -12,6 +12,14 @@ #ifndef VP8_COMMON_MODECONT_H_ #define VP8_COMMON_MODECONT_H_ +#ifdef __cplusplus +extern "C" { +#endif + extern const int vp8_mode_contexts[6][4]; +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_MODECONT_H_
diff --git a/vp8/common/mv.h b/vp8/common/mv.h index 1e4b206..111ccd6 100644 --- a/vp8/common/mv.h +++ b/vp8/common/mv.h
@@ -13,6 +13,10 @@ #define VP8_COMMON_MV_H_ #include "vpx/vpx_integer.h" +#ifdef __cplusplus +extern "C" { +#endif + typedef struct { short row; @@ -25,4 +29,8 @@ MV as_mv; } int_mv; /* facilitates faster equality tests and copies */ +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_MV_H_
diff --git a/vp8/common/onyxc_int.h b/vp8/common/onyxc_int.h index 92eb7f9..6d89865 100644 --- a/vp8/common/onyxc_int.h +++ b/vp8/common/onyxc_int.h
@@ -26,6 +26,10 @@ #include "header.h" /*#endif*/ +#ifdef __cplusplus +extern "C" { +#endif + #define MINQ 0 #define MAXQ 127 #define QINDEX_RANGE (MAXQ + 1) @@ -174,4 +178,8 @@ int cpu_caps; } VP8_COMMON; +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_ONYXC_INT_H_
diff --git a/vp8/common/postproc.h b/vp8/common/postproc.h index 10baf6c..33d0a7f 100644 --- a/vp8/common/postproc.h +++ b/vp8/common/postproc.h
@@ -26,6 +26,10 @@ }; #include "onyxc_int.h" #include "ppflags.h" + +#ifdef __cplusplus +extern "C" { +#endif int vp8_post_proc_frame(struct VP8Common *oci, YV12_BUFFER_CONFIG *dest, vp8_ppflags_t *flags); @@ -47,4 +51,8 @@ #define MFQE_PRECISION 4 void vp8_multiframe_quality_enhance(struct VP8Common *cm); +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_POSTPROC_H_
diff --git a/vp8/common/ppflags.h b/vp8/common/ppflags.h index 1fb37e1..768224a 100644 --- a/vp8/common/ppflags.h +++ b/vp8/common/ppflags.h
@@ -11,6 +11,10 @@ #ifndef VP8_COMMON_PPFLAGS_H_ #define VP8_COMMON_PPFLAGS_H_ + +#ifdef __cplusplus +extern "C" { +#endif enum { VP8D_NOFILTERING = 0, @@ -38,4 +42,8 @@ int display_mv_flag; } vp8_ppflags_t; +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_PPFLAGS_H_
diff --git a/vp8/common/pragmas.h b/vp8/common/pragmas.h index be10452..329cc82 100644 --- a/vp8/common/pragmas.h +++ b/vp8/common/pragmas.h
@@ -11,6 +11,10 @@ #ifndef VP8_COMMON_PRAGMAS_H_ #define VP8_COMMON_PRAGMAS_H_ +#ifdef __cplusplus +extern "C" { +#endif + #ifdef __INTEL_COMPILER #pragma warning(disable:997 1011 170) #endif @@ -18,4 +22,8 @@ #pragma warning(disable:4799) #endif +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_PRAGMAS_H_
diff --git a/vp8/common/quant_common.h b/vp8/common/quant_common.h index 4c7457f..700b5e6 100644 --- a/vp8/common/quant_common.h +++ b/vp8/common/quant_common.h
@@ -16,6 +16,10 @@ #include "blockd.h" #include "onyxc_int.h" +#ifdef __cplusplus +extern "C" { +#endif + extern int vp8_ac_yquant(int QIndex); extern int vp8_dc_quant(int QIndex, int Delta); extern int vp8_dc2quant(int QIndex, int Delta); @@ -23,4 +27,8 @@ extern int vp8_dc_uv_quant(int QIndex, int Delta); extern int vp8_ac_uv_quant(int QIndex, int Delta); +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_QUANT_COMMON_H_
diff --git a/vp8/common/reconinter.h b/vp8/common/reconinter.h index 50ebedc..ba979b9 100644 --- a/vp8/common/reconinter.h +++ b/vp8/common/reconinter.h
@@ -12,6 +12,10 @@ #ifndef VP8_COMMON_RECONINTER_H_ #define VP8_COMMON_RECONINTER_H_ +#ifdef __cplusplus +extern "C" { +#endif + extern void vp8_build_inter_predictors_mb(MACROBLOCKD *x); extern void vp8_build_inter16x16_predictors_mb(MACROBLOCKD *x, unsigned char *dst_y, @@ -32,4 +36,8 @@ extern void vp8_build_inter16x16_predictors_mbuv(MACROBLOCKD *x); extern void vp8_build_inter4x4_predictors_mbuv(MACROBLOCKD *x); +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_RECONINTER_H_
diff --git a/vp8/common/reconintra4x4.h b/vp8/common/reconintra4x4.h index cbb06ce..ed59c9e 100644 --- a/vp8/common/reconintra4x4.h +++ b/vp8/common/reconintra4x4.h
@@ -13,6 +13,10 @@ #define VP8_COMMON_RECONINTRA4X4_H_ #include "vp8/common/blockd.h" +#ifdef __cplusplus +extern "C" { +#endif + static void intra_prediction_down_copy(MACROBLOCKD *xd, unsigned char *above_right_src) { @@ -29,4 +33,8 @@ *dst_ptr2 = *src_ptr; } +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_RECONINTRA4X4_H_
diff --git a/vp8/common/setupintrarecon.h b/vp8/common/setupintrarecon.h index 3db507b..608f4a9 100644 --- a/vp8/common/setupintrarecon.h +++ b/vp8/common/setupintrarecon.h
@@ -12,6 +12,10 @@ #define VP8_COMMON_SETUPINTRARECON_H_ #include "vpx_scale/yv12config.h" + +#ifdef __cplusplus +extern "C" { +#endif extern void vp8_setup_intra_recon(YV12_BUFFER_CONFIG *ybf); extern void vp8_setup_intra_recon_top_line(YV12_BUFFER_CONFIG *ybf); @@ -34,4 +38,8 @@ v_buffer[uv_stride *i] = (unsigned char) 129; } +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_SETUPINTRARECON_H_
diff --git a/vp8/common/swapyv12buffer.h b/vp8/common/swapyv12buffer.h index ea8977b..1d66cd3 100644 --- a/vp8/common/swapyv12buffer.h +++ b/vp8/common/swapyv12buffer.h
@@ -14,6 +14,14 @@ #include "vpx_scale/yv12config.h" +#ifdef __cplusplus +extern "C" { +#endif + void vp8_swap_yv12_buffer(YV12_BUFFER_CONFIG *new_frame, YV12_BUFFER_CONFIG *last_frame); +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_SWAPYV12BUFFER_H_
diff --git a/vp8/common/systemdependent.h b/vp8/common/systemdependent.h index 966cc5d..3d44e37 100644 --- a/vp8/common/systemdependent.h +++ b/vp8/common/systemdependent.h
@@ -13,7 +13,15 @@ #include "vpx_config.h" +#ifdef __cplusplus +extern "C" { +#endif + struct VP8Common; void vp8_machine_specific_config(struct VP8Common *); +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_SYSTEMDEPENDENT_H_
diff --git a/vp8/common/threading.h b/vp8/common/threading.h index 8cf6d26..01c82db 100644 --- a/vp8/common/threading.h +++ b/vp8/common/threading.h
@@ -12,6 +12,10 @@ #ifndef VP8_COMMON_THREADING_H_ #define VP8_COMMON_THREADING_H_ +#ifdef __cplusplus +extern "C" { +#endif + #if CONFIG_OS_SUPPORT && CONFIG_MULTITHREAD /* Thread management macros */ @@ -183,4 +187,8 @@ #endif /* CONFIG_OS_SUPPORT && CONFIG_MULTITHREAD */ +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_THREADING_H_
diff --git a/vp8/common/treecoder.h b/vp8/common/treecoder.h index edb4b57..d22b7c5 100644 --- a/vp8/common/treecoder.h +++ b/vp8/common/treecoder.h
@@ -12,6 +12,10 @@ #ifndef VP8_COMMON_TREECODER_H_ #define VP8_COMMON_TREECODER_H_ +#ifdef __cplusplus +extern "C" { +#endif + typedef unsigned char vp8bc_index_t; /* probability index */ @@ -87,4 +91,8 @@ ); +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_TREECODER_H_
diff --git a/vp8/common/variance.h b/vp8/common/variance.h index 12a03d0..89a32a7 100644 --- a/vp8/common/variance.h +++ b/vp8/common/variance.h
@@ -14,6 +14,10 @@ #include "vpx_config.h" +#ifdef __cplusplus +extern "C" { +#endif + typedef unsigned int(*vp8_sad_fn_t)( const unsigned char *src_ptr, int source_stride, @@ -112,4 +116,8 @@ #endif } vp8_variance_fn_ptr_t; +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_VARIANCE_H_
diff --git a/vp8/common/vp8_entropymodedata.h b/vp8/common/vp8_entropymodedata.h index 9881148..c4aed49 100644 --- a/vp8/common/vp8_entropymodedata.h +++ b/vp8/common/vp8_entropymodedata.h
@@ -11,6 +11,10 @@ #ifndef VP8_COMMON_VP8_ENTROPYMODEDATA_H_ #define VP8_COMMON_VP8_ENTROPYMODEDATA_H_ +#ifdef __cplusplus +extern "C" { +#endif + /*Generated file, included by entropymode.c*/ @@ -243,4 +247,8 @@ } }; +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_VP8_ENTROPYMODEDATA_H_
diff --git a/vp8/common/x86/filter_x86.h b/vp8/common/x86/filter_x86.h index 0d537d9..d282841 100644 --- a/vp8/common/x86/filter_x86.h +++ b/vp8/common/x86/filter_x86.h
@@ -13,6 +13,10 @@ #include "vpx_ports/mem.h" +#ifdef __cplusplus +extern "C" { +#endif + /* x86 assembly specific copy of vp8/common/filter.c:vp8_bilinear_filters with * duplicated values */ @@ -22,4 +26,8 @@ /* duplicated 8x */ extern DECLARE_ALIGNED(16, const short, vp8_bilinear_filters_x86_8[8][16]); +#ifdef __cplusplus +} // extern "C" +#endif + #endif // VP8_COMMON_X86_FILTER_X86_H_