Commit 513fae3e authored by James Zern's avatar James Zern

vp8/encoder: add extern "C" to headers

Change-Id: I252f5f8a5d5ada65da08699774a7bb1eb2bd5b2e
parent 14ae5fd8
......@@ -12,6 +12,10 @@
#ifndef VP8_ENCODER_BITSTREAM_H_
#define VP8_ENCODER_BITSTREAM_H_
#ifdef __cplusplus
extern "C" {
#endif
#if HAVE_EDSP
void vp8cx_pack_tokens_armv5(vp8_writer *w, const TOKENEXTRA *p, int xcount,
const vp8_token *,
......@@ -43,4 +47,8 @@ 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
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP8_ENCODER_BITSTREAM_H_
......@@ -18,6 +18,10 @@
#include "vp8/common/entropy.h"
#include "vpx_ports/mem.h"
#ifdef __cplusplus
extern "C" {
#endif
#define MAX_MODES 20
#define MAX_ERROR_BINS 1024
......@@ -160,4 +164,8 @@ typedef struct macroblock
} MACROBLOCK;
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP8_ENCODER_BLOCK_H_
......@@ -22,6 +22,10 @@
#include "vpx_ports/mem.h"
#include "vpx/internal/vpx_codec_internal.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct
{
unsigned int lowvalue;
......@@ -125,4 +129,8 @@ static void vp8_encode_bool(BOOL_CODER *br, int bit, int probability)
br->range = range;
}
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP8_ENCODER_BOOLHUFF_H_
......@@ -11,6 +11,10 @@
#ifndef VP8_ENCODER_DCT_VALUE_COST_H_
#define VP8_ENCODER_DCT_VALUE_COST_H_
#ifdef __cplusplus
extern "C" {
#endif
/* Generated file, included by tokenize.c */
/* Values generated by fill_value_tokens() */
......@@ -360,4 +364,8 @@ static const short dct_value_cost[2048*2] =
8251, 8257, 8265, 8275
};
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP8_ENCODER_DCT_VALUE_COST_H_
......@@ -11,6 +11,10 @@
#ifndef VP8_ENCODER_DCT_VALUE_TOKENS_H_
#define VP8_ENCODER_DCT_VALUE_TOKENS_H_
#ifdef __cplusplus
extern "C" {
#endif
/* Generated file, included by tokenize.c */
/* Values generated by fill_value_tokens() */
......@@ -701,4 +705,8 @@ static const TOKENVALUE dct_value_tokens[2048*2] =
{10, 3954}, {10, 3956}, {10, 3958}, {10, 3960}
};
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP8_ENCODER_DCT_VALUE_TOKENS_H_
......@@ -11,6 +11,10 @@
#ifndef VP8_ENCODER_DEFAULTCOEFCOUNTS_H_
#define VP8_ENCODER_DEFAULTCOEFCOUNTS_H_
#ifdef __cplusplus
extern "C" {
#endif
/* Generated file, included by entropy.c */
static const unsigned int default_coef_counts[BLOCK_TYPES]
......@@ -225,4 +229,8 @@ static const unsigned int default_coef_counts[BLOCK_TYPES]
},
};
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP8_ENCODER_DEFAULTCOEFCOUNTS_H_
......@@ -13,6 +13,10 @@
#include "block.h"
#ifdef __cplusplus
extern "C" {
#endif
#define SUM_DIFF_THRESHOLD (16 * 16 * 2)
#define MOTION_MAGNITUDE_THRESHOLD (8*3)
......@@ -39,4 +43,8 @@ void vp8_denoiser_denoise_mb(VP8_DENOISER *denoiser,
int recon_yoffset,
int recon_uvoffset);
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP8_ENCODER_DENOISING_H_
......@@ -9,6 +9,10 @@
*/
#ifndef VP8_ENCODER_ENCODEFRAME_H_
#define VP8_ENCODER_ENCODEFRAME_H_
#ifdef __cplusplus
extern "C" {
#endif
extern void vp8_activity_masking(VP8_COMP *cpi, MACROBLOCK *x);
extern void vp8_build_block_offsets(MACROBLOCK *x);
......@@ -24,4 +28,8 @@ extern int vp8cx_encode_inter_macroblock(VP8_COMP *cpi, MACROBLOCK *x,
extern int vp8cx_encode_intra_macroblock(VP8_COMP *cpi, MACROBLOCK *x,
TOKENEXTRA **t);
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP8_ENCODER_ENCODEFRAME_H_
......@@ -13,9 +13,17 @@
#define VP8_ENCODER_ENCODEINTRA_H_
#include "onyx_int.h"
#ifdef __cplusplus
extern "C" {
#endif
int vp8_encode_intra(VP8_COMP *cpi, MACROBLOCK *x, int use_dc_pred);
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);
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP8_ENCODER_ENCODEINTRA_H_
......@@ -13,6 +13,10 @@
#define VP8_ENCODER_ENCODEMB_H_
#include "onyx_int.h"
#ifdef __cplusplus
extern "C" {
#endif
void vp8_encode_inter16x16(MACROBLOCK *x);
void vp8_build_dcblock(MACROBLOCK *b);
......@@ -23,4 +27,8 @@ 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);
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP8_ENCODER_ENCODEMB_H_
......@@ -14,8 +14,16 @@
#include "onyx_int.h"
#ifdef __cplusplus
extern "C" {
#endif
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]);
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP8_ENCODER_ENCODEMV_H_
......@@ -12,6 +12,10 @@
#ifndef VP8_ENCODER_FIRSTPASS_H_
#define VP8_ENCODER_FIRSTPASS_H_
#ifdef __cplusplus
extern "C" {
#endif
extern void vp8_init_first_pass(VP8_COMP *cpi);
extern void vp8_first_pass(VP8_COMP *cpi);
extern void vp8_end_first_pass(VP8_COMP *cpi);
......@@ -21,4 +25,8 @@ 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);
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP8_ENCODER_FIRSTPASS_H_
......@@ -12,6 +12,10 @@
#include "vpx_scale/yv12config.h"
#include "vpx/vpx_integer.h"
#ifdef __cplusplus
extern "C" {
#endif
struct lookahead_entry
{
YV12_BUFFER_CONFIG img;
......@@ -106,4 +110,8 @@ unsigned int
vp8_lookahead_depth(struct lookahead_ctx *ctx);
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP8_ENCODER_LOOKAHEAD_H_
......@@ -15,6 +15,10 @@
#include "block.h"
#include "vp8/common/variance.h"
#ifdef __cplusplus
extern "C" {
#endif
#ifdef VP8_ENTROPY_STATS
extern void init_mv_ref_counts();
extern void accum_mv_refs(MB_PREDICTION_MODE, const int near_mv_ref_cts[4]);
......@@ -104,4 +108,8 @@ typedef int (*vp8_diamond_search_fn_t)
int_mv *center_mv
);
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP8_ENCODER_MCOMP_H_
......@@ -12,6 +12,14 @@
#ifndef VP8_ENCODER_MODECOSTS_H_
#define VP8_ENCODER_MODECOSTS_H_
#ifdef __cplusplus
extern "C" {
#endif
void vp8_init_mode_costs(VP8_COMP *x);
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP8_ENCODER_MODECOSTS_H_
......@@ -13,8 +13,16 @@
#define VP8_ENCODER_MR_DISSIM_H_
#include "vpx_config.h"
#ifdef __cplusplus
extern "C" {
#endif
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);
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP8_ENCODER_MR_DISSIM_H_
......@@ -33,6 +33,10 @@
#include "vp8/encoder/denoising.h"
#endif
#ifdef __cplusplus
extern "C" {
#endif
#define MIN_GF_INTERVAL 4
#define DEFAULT_GF_INTERVAL 7
......@@ -721,4 +725,8 @@ void vp8_set_speed_features(VP8_COMP *cpi);
"Failed to allocate "#lval);\
} while(0)
#endif
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP8_ENCODER_ONYX_INT_H_
......@@ -14,6 +14,10 @@
#include "vpx_config.h"
#include "vp8/common/onyxc_int.h"
#ifdef __cplusplus
extern "C" {
#endif
extern void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
int recon_uvoffset, int *returnrate,
int *returndistortion, int *returnintra,
......@@ -24,4 +28,8 @@ extern int vp8_get_inter_mbpred_error(MACROBLOCK *mb,
const vp8_variance_fn_ptr_t *vfp,
unsigned int *sse,
int_mv this_mv);
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP8_ENCODER_PICKINTER_H_
......@@ -12,6 +12,14 @@
#ifndef VP8_ENCODER_PSNR_H_
#define VP8_ENCODER_PSNR_H_
#ifdef __cplusplus
extern "C" {
#endif
extern double vp8_mse2psnr(double Samples, double Peak, double Mse);
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP8_ENCODER_PSNR_H_
......@@ -12,6 +12,10 @@
#ifndef VP8_ENCODER_QUANTIZE_H_
#define VP8_ENCODER_QUANTIZE_H_
#ifdef __cplusplus
extern "C" {
#endif
struct VP8_COMP;
struct macroblock;
extern void vp8_set_quantizer(struct VP8_COMP *cpi, int Q);
......@@ -20,4 +24,8 @@ 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);
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP8_ENCODER_QUANTIZE_H_
......@@ -14,6 +14,10 @@
#include "onyx_int.h"
#ifdef __cplusplus
extern "C" {
#endif
extern void vp8_save_coding_context(VP8_COMP *cpi);
extern void vp8_restore_coding_context(VP8_COMP *cpi);
......@@ -26,4 +30,8 @@ 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);
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP8_ENCODER_RATECTRL_H_
......@@ -12,6 +12,10 @@
#ifndef VP8_ENCODER_RDOPT_H_
#define VP8_ENCODER_RDOPT_H_
#ifdef __cplusplus
extern "C" {
#endif
#define RDCOST(RM,DM,R,D) ( ((128+(R)*(RM)) >> 8) + (DM)*(D) )
static void insertsortmv(int arr[], int len)
......@@ -130,4 +134,8 @@ extern void vp8_mv_pred
);
void vp8_cal_sad(VP8_COMP *cpi, MACROBLOCKD *xd, MACROBLOCK *x, int recon_yoffset, int near_sadidx[]);
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP8_ENCODER_RDOPT_H_
......@@ -15,6 +15,14 @@
#include "vp8/common/blockd.h"
#include "onyx_int.h"
#ifdef __cplusplus
extern "C" {
#endif
extern void vp8_update_gf_useage_maps(VP8_COMP *cpi, VP8_COMMON *cm, MACROBLOCK *x);
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP8_ENCODER_SEGMENTATION_H_
......@@ -15,6 +15,10 @@
#include "vp8/common/entropy.h"
#include "block.h"
#ifdef __cplusplus
extern "C" {
#endif
void vp8_tokenize_initialize();
typedef struct
......@@ -47,4 +51,8 @@ extern const short *const vp8_dct_value_cost_ptr;
*/
extern const TOKENVALUE *const vp8_dct_value_tokens_ptr;
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP8_ENCODER_TOKENIZE_H_
......@@ -19,6 +19,10 @@
#include "boolhuff.h" /* for now */
#ifdef __cplusplus
extern "C" {
#endif
typedef BOOL_CODER vp8_writer;
#define vp8_write vp8_encode_bool
......@@ -123,4 +127,8 @@ void vp8_cost_tokens2(
int *Costs, const vp8_prob *, vp8_tree, int
);
#ifdef __cplusplus
} // extern "C"
#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