Commit 40aa910c authored by James Zern's avatar James Zern
Browse files

vp9/decoder: add extern "C" to headers

Change-Id: I0e6aa00f220280e22d30d098545265835d0c1079
parent 0940c9cf
...@@ -12,10 +12,18 @@ ...@@ -12,10 +12,18 @@
#ifndef VP9_DECODER_VP9_DECODEFRAME_H_ #ifndef VP9_DECODER_VP9_DECODEFRAME_H_
#define VP9_DECODER_VP9_DECODEFRAME_H_ #define VP9_DECODER_VP9_DECODEFRAME_H_
#ifdef __cplusplus
extern "C" {
#endif
struct VP9Common; struct VP9Common;
struct VP9Decompressor; struct VP9Decompressor;
void vp9_init_dequantizer(struct VP9Common *cm); void vp9_init_dequantizer(struct VP9Common *cm);
int vp9_decode_frame(struct VP9Decompressor *cpi, const uint8_t **p_data_end); int vp9_decode_frame(struct VP9Decompressor *cpi, const uint8_t **p_data_end);
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP9_DECODER_VP9_DECODEFRAME_H_ #endif // VP9_DECODER_VP9_DECODEFRAME_H_
...@@ -14,10 +14,18 @@ ...@@ -14,10 +14,18 @@
#include "vp9/decoder/vp9_onyxd_int.h" #include "vp9/decoder/vp9_onyxd_int.h"
#include "vp9/decoder/vp9_reader.h" #include "vp9/decoder/vp9_reader.h"
#ifdef __cplusplus
extern "C" {
#endif
struct TileInfo; struct TileInfo;
void vp9_read_mode_info(VP9_COMMON *cm, MACROBLOCKD *xd, void vp9_read_mode_info(VP9_COMMON *cm, MACROBLOCKD *xd,
const struct TileInfo *const tile, const struct TileInfo *const tile,
int mi_row, int mi_col, vp9_reader *r); int mi_row, int mi_col, vp9_reader *r);
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP9_DECODER_VP9_DECODEMV_H_ #endif // VP9_DECODER_VP9_DECODEMV_H_
...@@ -15,8 +15,16 @@ ...@@ -15,8 +15,16 @@
#include "vp9/decoder/vp9_onyxd_int.h" #include "vp9/decoder/vp9_onyxd_int.h"
#include "vp9/decoder/vp9_reader.h" #include "vp9/decoder/vp9_reader.h"
#ifdef __cplusplus
extern "C" {
#endif
int vp9_decode_block_tokens(VP9_COMMON *cm, MACROBLOCKD *xd, int vp9_decode_block_tokens(VP9_COMMON *cm, MACROBLOCKD *xd,
int plane, int block, BLOCK_SIZE plane_bsize, int plane, int block, BLOCK_SIZE plane_bsize,
int x, int y, TX_SIZE tx_size, vp9_reader *r); int x, int y, TX_SIZE tx_size, vp9_reader *r);
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP9_DECODER_VP9_DETOKENIZE_H_ #endif // VP9_DECODER_VP9_DETOKENIZE_H_
...@@ -14,6 +14,14 @@ ...@@ -14,6 +14,14 @@
#include "vp9/decoder/vp9_reader.h" #include "vp9/decoder/vp9_reader.h"
#ifdef __cplusplus
extern "C" {
#endif
void vp9_diff_update_prob(vp9_reader *r, vp9_prob* p); void vp9_diff_update_prob(vp9_reader *r, vp9_prob* p);
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP9_DECODER_VP9_DSUBEXP_H_ #endif // VP9_DECODER_VP9_DSUBEXP_H_
...@@ -11,14 +11,14 @@ ...@@ -11,14 +11,14 @@
#ifndef VP9_DECODER_VP9_ONYXD_H_ #ifndef VP9_DECODER_VP9_ONYXD_H_
#define VP9_DECODER_VP9_ONYXD_H_ #define VP9_DECODER_VP9_ONYXD_H_
#ifdef __cplusplus
extern "C" {
#endif
#include "vpx_scale/yv12config.h" #include "vpx_scale/yv12config.h"
#include "vp9/common/vp9_ppflags.h" #include "vp9/common/vp9_ppflags.h"
#include "vpx/vpx_codec.h" #include "vpx/vpx_codec.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef void *VP9D_PTR; typedef void *VP9D_PTR;
typedef struct { typedef struct {
...@@ -63,7 +63,7 @@ VP9D_PTR vp9_create_decompressor(VP9D_CONFIG *oxcf); ...@@ -63,7 +63,7 @@ VP9D_PTR vp9_create_decompressor(VP9D_CONFIG *oxcf);
void vp9_remove_decompressor(VP9D_PTR comp); void vp9_remove_decompressor(VP9D_PTR comp);
#ifdef __cplusplus #ifdef __cplusplus
} } // extern "C"
#endif #endif
#endif // VP9_DECODER_VP9_ONYXD_H_ #endif // VP9_DECODER_VP9_ONYXD_H_
...@@ -17,6 +17,10 @@ ...@@ -17,6 +17,10 @@
#include "vp9/decoder/vp9_onyxd.h" #include "vp9/decoder/vp9_onyxd.h"
#include "vp9/decoder/vp9_thread.h" #include "vp9/decoder/vp9_thread.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct VP9Decompressor { typedef struct VP9Decompressor {
DECLARE_ALIGNED(16, MACROBLOCKD, mb); DECLARE_ALIGNED(16, MACROBLOCKD, mb);
...@@ -53,4 +57,8 @@ typedef struct VP9Decompressor { ...@@ -53,4 +57,8 @@ typedef struct VP9Decompressor {
PARTITION_CONTEXT *above_seg_context; PARTITION_CONTEXT *above_seg_context;
} VP9D_COMP; } VP9D_COMP;
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP9_DECODER_VP9_ONYXD_INT_H_ #endif // VP9_DECODER_VP9_ONYXD_INT_H_
...@@ -15,6 +15,10 @@ ...@@ -15,6 +15,10 @@
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef void (*vp9_rb_error_handler)(void *data, size_t bit_offset); typedef void (*vp9_rb_error_handler)(void *data, size_t bit_offset);
struct vp9_read_bit_buffer { struct vp9_read_bit_buffer {
...@@ -57,4 +61,8 @@ static int vp9_rb_read_signed_literal(struct vp9_read_bit_buffer *rb, ...@@ -57,4 +61,8 @@ static int vp9_rb_read_signed_literal(struct vp9_read_bit_buffer *rb,
return vp9_rb_read_bit(rb) ? -value : value; return vp9_rb_read_bit(rb) ? -value : value;
} }
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP9_DECODER_VP9_READ_BIT_BUFFER_H_ #endif // VP9_DECODER_VP9_READ_BIT_BUFFER_H_
...@@ -20,6 +20,10 @@ ...@@ -20,6 +20,10 @@
#include "vp9/common/vp9_prob.h" #include "vp9/common/vp9_prob.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef size_t BD_VALUE; typedef size_t BD_VALUE;
#define BD_VALUE_SIZE ((int)sizeof(BD_VALUE) * CHAR_BIT) #define BD_VALUE_SIZE ((int)sizeof(BD_VALUE) * CHAR_BIT)
...@@ -100,4 +104,8 @@ static int vp9_read_tree(vp9_reader *r, const vp9_tree_index *tree, ...@@ -100,4 +104,8 @@ static int vp9_read_tree(vp9_reader *r, const vp9_tree_index *tree,
return -i; return -i;
} }
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP9_DECODER_VP9_READER_H_ #endif // VP9_DECODER_VP9_READER_H_
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "./vpx_config.h" #include "./vpx_config.h"
#if defined(__cplusplus) || defined(c_plusplus) #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
...@@ -91,7 +91,7 @@ void vp9_worker_end(VP9Worker* const worker); ...@@ -91,7 +91,7 @@ void vp9_worker_end(VP9Worker* const worker);
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#if defined(__cplusplus) || defined(c_plusplus) #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
......
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