Commit 982deebb authored by Ronald S. Bultje's avatar Ronald S. Bultje

Change name of common top-level structures from VP8 to VP9.

This change encompasses VP8_PTR, VP8_COMP, VP8D_COMP, VP8_COMMON,
VP8Decompressor and VP8Common.

Change-Id: I514ef4ad4e682370f36d656af1c09ee20da216ad
parent 43da8f14
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
extern void vp8_init_scan_order_mask(); extern void vp8_init_scan_order_mask();
void vp9_update_mode_info_border(VP8_COMMON *cpi, MODE_INFO *mi_base) { void vp9_update_mode_info_border(VP9_COMMON *cpi, MODE_INFO *mi_base) {
int stride = cpi->mode_info_stride; int stride = cpi->mode_info_stride;
int i; int i;
...@@ -34,7 +34,7 @@ void vp9_update_mode_info_border(VP8_COMMON *cpi, MODE_INFO *mi_base) { ...@@ -34,7 +34,7 @@ void vp9_update_mode_info_border(VP8_COMMON *cpi, MODE_INFO *mi_base) {
} }
} }
void vp9_update_mode_info_in_image(VP8_COMMON *cpi, MODE_INFO *mi) { void vp9_update_mode_info_in_image(VP9_COMMON *cpi, MODE_INFO *mi) {
int i, j; int i, j;
// For each in image mode_info element set the in image flag to 1 // For each in image mode_info element set the in image flag to 1
...@@ -48,7 +48,7 @@ void vp9_update_mode_info_in_image(VP8_COMMON *cpi, MODE_INFO *mi) { ...@@ -48,7 +48,7 @@ void vp9_update_mode_info_in_image(VP8_COMMON *cpi, MODE_INFO *mi) {
} }
} }
void vp9_de_alloc_frame_buffers(VP8_COMMON *oci) { void vp9_de_alloc_frame_buffers(VP9_COMMON *oci) {
int i; int i;
for (i = 0; i < NUM_YV12_BUFFERS; i++) for (i = 0; i < NUM_YV12_BUFFERS; i++)
...@@ -67,7 +67,7 @@ void vp9_de_alloc_frame_buffers(VP8_COMMON *oci) { ...@@ -67,7 +67,7 @@ void vp9_de_alloc_frame_buffers(VP8_COMMON *oci) {
} }
int vp9_alloc_frame_buffers(VP8_COMMON *oci, int width, int height) { int vp9_alloc_frame_buffers(VP9_COMMON *oci, int width, int height) {
int i; int i;
vp9_de_alloc_frame_buffers(oci); vp9_de_alloc_frame_buffers(oci);
...@@ -145,7 +145,7 @@ int vp9_alloc_frame_buffers(VP8_COMMON *oci, int width, int height) { ...@@ -145,7 +145,7 @@ int vp9_alloc_frame_buffers(VP8_COMMON *oci, int width, int height) {
return 0; return 0;
} }
void vp9_setup_version(VP8_COMMON *cm) { void vp9_setup_version(VP9_COMMON *cm) {
if (cm->version & 0x4) { if (cm->version & 0x4) {
if (!CONFIG_EXPERIMENTAL) if (!CONFIG_EXPERIMENTAL)
vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM, vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM,
...@@ -183,7 +183,7 @@ void vp9_setup_version(VP8_COMMON *cm) { ...@@ -183,7 +183,7 @@ void vp9_setup_version(VP8_COMMON *cm) {
// break; // break;
} }
} }
void vp9_create_common(VP8_COMMON *oci) { void vp9_create_common(VP9_COMMON *oci) {
vp9_machine_specific_config(oci); vp9_machine_specific_config(oci);
vp9_init_mbmode_probs(oci); vp9_init_mbmode_probs(oci);
...@@ -209,7 +209,7 @@ void vp9_create_common(VP8_COMMON *oci) { ...@@ -209,7 +209,7 @@ void vp9_create_common(VP8_COMMON *oci) {
oci->kf_ymode_probs_update = 0; oci->kf_ymode_probs_update = 0;
} }
void vp9_remove_common(VP8_COMMON *oci) { void vp9_remove_common(VP9_COMMON *oci) {
vp9_de_alloc_frame_buffers(oci); vp9_de_alloc_frame_buffers(oci);
} }
......
...@@ -14,13 +14,13 @@ ...@@ -14,13 +14,13 @@
#include "onyxc_int.h" #include "onyxc_int.h"
void vp9_create_common(VP8_COMMON *oci); void vp9_create_common(VP9_COMMON *oci);
void vp9_remove_common(VP8_COMMON *oci); void vp9_remove_common(VP9_COMMON *oci);
void vp9_de_alloc_frame_buffers(VP8_COMMON *oci); void vp9_de_alloc_frame_buffers(VP9_COMMON *oci);
int vp9_alloc_frame_buffers(VP8_COMMON *oci, int width, int height); int vp9_alloc_frame_buffers(VP9_COMMON *oci, int width, int height);
void vp9_setup_version(VP8_COMMON *oci); void vp9_setup_version(VP9_COMMON *oci);
void vp9_update_mode_info_border(VP8_COMMON *cpi, MODE_INFO *mi_base); void vp9_update_mode_info_border(VP9_COMMON *cpi, MODE_INFO *mi_base);
void vp9_update_mode_info_in_image(VP8_COMMON *cpi, MODE_INFO *mi); void vp9_update_mode_info_in_image(VP9_COMMON *cpi, MODE_INFO *mi);
#endif #endif
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
#include "vp8/common/idct.h" #include "vp8/common/idct.h"
#include "vp8/common/onyxc_int.h" #include "vp8/common/onyxc_int.h"
void vp8_arch_arm_common_init(VP8_COMMON *ctx) { void vp8_arch_arm_common_init(VP9_COMMON *ctx) {
#if CONFIG_RUNTIME_CPU_DETECT #if CONFIG_RUNTIME_CPU_DETECT
VP8_COMMON_RTCD *rtcd = &ctx->rtcd; VP9_COMMON_RTCD *rtcd = &ctx->rtcd;
int flags = arm_cpu_caps(); int flags = arm_cpu_caps();
rtcd->flags = flags; rtcd->flags = flags;
......
...@@ -370,7 +370,7 @@ typedef struct macroblockd { ...@@ -370,7 +370,7 @@ typedef struct macroblockd {
#endif #endif
#if CONFIG_RUNTIME_CPU_DETECT #if CONFIG_RUNTIME_CPU_DETECT
struct VP8_COMMON_RTCD *rtcd; struct VP9_COMMON_RTCD *rtcd;
#endif #endif
int mb_index; // Index of the MB in the SB (0..3) int mb_index; // Index of the MB in the SB (0..3)
......
...@@ -202,7 +202,7 @@ vp8_extra_bit_struct vp9_extra_bits[12] = { ...@@ -202,7 +202,7 @@ vp8_extra_bit_struct vp9_extra_bits[12] = {
#include "default_coef_probs.h" #include "default_coef_probs.h"
void vp9_default_coef_probs(VP8_COMMON *pc) { void vp9_default_coef_probs(VP9_COMMON *pc) {
vpx_memcpy(pc->fc.coef_probs, default_coef_probs, vpx_memcpy(pc->fc.coef_probs, default_coef_probs,
sizeof(pc->fc.coef_probs)); sizeof(pc->fc.coef_probs));
vpx_memcpy(pc->fc.hybrid_coef_probs, default_hybrid_coef_probs, vpx_memcpy(pc->fc.hybrid_coef_probs, default_hybrid_coef_probs,
...@@ -234,7 +234,7 @@ void vp9_coef_tree_initialize() { ...@@ -234,7 +234,7 @@ void vp9_coef_tree_initialize() {
#define COEF_COUNT_SAT_AFTER_KEY 24 #define COEF_COUNT_SAT_AFTER_KEY 24
#define COEF_MAX_UPDATE_FACTOR_AFTER_KEY 128 #define COEF_MAX_UPDATE_FACTOR_AFTER_KEY 128
void vp9_adapt_coef_probs(VP8_COMMON *cm) { void vp9_adapt_coef_probs(VP9_COMMON *cm) {
int t, i, j, k, count; int t, i, j, k, count;
unsigned int branch_ct[ENTROPY_NODES][2]; unsigned int branch_ct[ENTROPY_NODES][2];
vp8_prob coef_probs[ENTROPY_NODES]; vp8_prob coef_probs[ENTROPY_NODES];
......
...@@ -100,8 +100,8 @@ extern DECLARE_ALIGNED(16, const int, vp9_coef_bands_16x16[256]); ...@@ -100,8 +100,8 @@ extern DECLARE_ALIGNED(16, const int, vp9_coef_bands_16x16[256]);
extern DECLARE_ALIGNED(16, const unsigned char, vp9_prev_token_class[MAX_ENTROPY_TOKENS]); extern DECLARE_ALIGNED(16, const unsigned char, vp9_prev_token_class[MAX_ENTROPY_TOKENS]);
struct VP8Common; struct VP9Common;
void vp9_default_coef_probs(struct VP8Common *); void vp9_default_coef_probs(struct VP9Common *);
extern DECLARE_ALIGNED(16, const int, vp9_default_zig_zag1d[16]); extern DECLARE_ALIGNED(16, const int, vp9_default_zig_zag1d[16]);
extern DECLARE_ALIGNED(16, const int, vp9_col_scan[16]); extern DECLARE_ALIGNED(16, const int, vp9_col_scan[16]);
...@@ -112,6 +112,6 @@ extern DECLARE_ALIGNED(64, const int, vp9_default_zig_zag1d_8x8[64]); ...@@ -112,6 +112,6 @@ extern DECLARE_ALIGNED(64, const int, vp9_default_zig_zag1d_8x8[64]);
void vp9_coef_tree_initialize(void); void vp9_coef_tree_initialize(void);
extern DECLARE_ALIGNED(16, const int, vp9_default_zig_zag1d_16x16[256]); extern DECLARE_ALIGNED(16, const int, vp9_default_zig_zag1d_16x16[256]);
void vp9_adapt_coef_probs(struct VP8Common *); void vp9_adapt_coef_probs(struct VP9Common *);
#endif #endif
...@@ -260,7 +260,7 @@ struct vp8_token_struct vp9_sub_mv_ref_encoding_array [VP8_SUBMVREFS]; ...@@ -260,7 +260,7 @@ struct vp8_token_struct vp9_sub_mv_ref_encoding_array [VP8_SUBMVREFS];
void vp9_init_mbmode_probs(VP8_COMMON *x) { void vp9_init_mbmode_probs(VP9_COMMON *x) {
unsigned int bct [VP8_YMODES] [2]; /* num Ymodes > num UV modes */ unsigned int bct [VP8_YMODES] [2]; /* num Ymodes > num UV modes */
vp9_tree_probs_from_distribution(VP8_YMODES, vp9_ymode_encodings, vp9_tree_probs_from_distribution(VP8_YMODES, vp9_ymode_encodings,
...@@ -387,7 +387,7 @@ void vp9_entropy_mode_init() { ...@@ -387,7 +387,7 @@ void vp9_entropy_mode_init() {
vp9_sub_mv_ref_tree, LEFT4X4); vp9_sub_mv_ref_tree, LEFT4X4);
} }
void vp9_init_mode_contexts(VP8_COMMON *pc) { void vp9_init_mode_contexts(VP9_COMMON *pc) {
vpx_memset(pc->fc.mv_ref_ct, 0, sizeof(pc->fc.mv_ref_ct)); vpx_memset(pc->fc.mv_ref_ct, 0, sizeof(pc->fc.mv_ref_ct));
vpx_memset(pc->fc.mv_ref_ct_a, 0, sizeof(pc->fc.mv_ref_ct_a)); vpx_memset(pc->fc.mv_ref_ct_a, 0, sizeof(pc->fc.mv_ref_ct_a));
...@@ -400,7 +400,7 @@ void vp9_init_mode_contexts(VP8_COMMON *pc) { ...@@ -400,7 +400,7 @@ void vp9_init_mode_contexts(VP8_COMMON *pc) {
} }
void vp9_accum_mv_refs(VP8_COMMON *pc, void vp9_accum_mv_refs(VP9_COMMON *pc,
MB_PREDICTION_MODE m, MB_PREDICTION_MODE m,
const int ct[4]) { const int ct[4]) {
int (*mv_ref_ct)[4][2]; int (*mv_ref_ct)[4][2];
...@@ -434,7 +434,7 @@ void vp9_accum_mv_refs(VP8_COMMON *pc, ...@@ -434,7 +434,7 @@ void vp9_accum_mv_refs(VP8_COMMON *pc,
#define MVREF_COUNT_SAT 20 #define MVREF_COUNT_SAT 20
#define MVREF_MAX_UPDATE_FACTOR 144 #define MVREF_MAX_UPDATE_FACTOR 144
void vp9_update_mode_context(VP8_COMMON *pc) { void vp9_update_mode_context(VP9_COMMON *pc) {
int i, j; int i, j;
int (*mv_ref_ct)[4][2]; int (*mv_ref_ct)[4][2];
int (*mode_context)[4]; int (*mode_context)[4];
...@@ -467,7 +467,7 @@ void vp9_update_mode_context(VP8_COMMON *pc) { ...@@ -467,7 +467,7 @@ void vp9_update_mode_context(VP8_COMMON *pc) {
#ifdef MODE_STATS #ifdef MODE_STATS
#include "vp8/common/modecont.h" #include "vp8/common/modecont.h"
void print_mode_contexts(VP8_COMMON *pc) { void print_mode_contexts(VP9_COMMON *pc) {
int j, i; int j, i;
printf("\n====================\n"); printf("\n====================\n");
for (j = 0; j < 6; j++) { for (j = 0; j < 6; j++) {
...@@ -489,7 +489,7 @@ void print_mode_contexts(VP8_COMMON *pc) { ...@@ -489,7 +489,7 @@ void print_mode_contexts(VP8_COMMON *pc) {
// #define MODE_COUNT_TESTING // #define MODE_COUNT_TESTING
#define MODE_COUNT_SAT 20 #define MODE_COUNT_SAT 20
#define MODE_MAX_UPDATE_FACTOR 144 #define MODE_MAX_UPDATE_FACTOR 144
void vp9_adapt_mode_probs(VP8_COMMON *cm) { void vp9_adapt_mode_probs(VP9_COMMON *cm) {
int i, t, count, factor; int i, t, count, factor;
unsigned int branch_ct[32][2]; unsigned int branch_ct[32][2];
vp8_prob ymode_probs[VP8_YMODES - 1]; vp8_prob ymode_probs[VP8_YMODES - 1];
......
...@@ -63,18 +63,18 @@ extern struct vp8_token_struct vp9_sub_mv_ref_encoding_array [VP8_SUBMVREFS]; ...@@ -63,18 +63,18 @@ extern struct vp8_token_struct vp9_sub_mv_ref_encoding_array [VP8_SUBMVREFS];
void vp9_entropy_mode_init(void); void vp9_entropy_mode_init(void);
struct VP8Common; struct VP9Common;
void vp9_init_mbmode_probs(struct VP8Common *x); void vp9_init_mbmode_probs(struct VP9Common *x);
extern void vp9_init_mode_contexts(struct VP8Common *pc); extern void vp9_init_mode_contexts(struct VP9Common *pc);
extern void vp9_update_mode_context(struct VP8Common *pc);; extern void vp9_update_mode_context(struct VP9Common *pc);;
extern void vp9_accum_mv_refs(struct VP8Common *pc, extern void vp9_accum_mv_refs(struct VP9Common *pc,
MB_PREDICTION_MODE m, MB_PREDICTION_MODE m,
const int ct[4]); const int ct[4]);
void vp9_default_bmode_probs(vp8_prob dest [VP8_BINTRAMODES - 1]); void vp9_default_bmode_probs(vp8_prob dest [VP8_BINTRAMODES - 1]);
void vp9_kf_default_bmode_probs(vp8_prob dest [VP8_BINTRAMODES] [VP8_BINTRAMODES] [VP8_BINTRAMODES - 1]); void vp9_kf_default_bmode_probs(vp8_prob dest [VP8_BINTRAMODES] [VP8_BINTRAMODES] [VP8_BINTRAMODES - 1]);
void vp9_adapt_mode_probs(struct VP8Common *); void vp9_adapt_mode_probs(struct VP9Common *);
#define VP8_SWITCHABLE_FILTERS 2 /* number of switchable filters */ #define VP8_SWITCHABLE_FILTERS 2 /* number of switchable filters */
extern const INTERPOLATIONFILTERTYPE vp9_switchable_interp extern const INTERPOLATIONFILTERTYPE vp9_switchable_interp
......
...@@ -308,7 +308,7 @@ void vp9_counts_to_nmv_context( ...@@ -308,7 +308,7 @@ void vp9_counts_to_nmv_context(
} }
} }
void vp9_adapt_nmv_probs(VP8_COMMON *cm, int usehp) { void vp9_adapt_nmv_probs(VP9_COMMON *cm, int usehp) {
int i, j, k; int i, j, k;
nmv_context prob; nmv_context prob;
unsigned int branch_ct_joint[MV_JOINTS - 1][2]; unsigned int branch_ct_joint[MV_JOINTS - 1][2];
...@@ -460,6 +460,6 @@ void vp9_entropy_mv_init() { ...@@ -460,6 +460,6 @@ void vp9_entropy_mv_init() {
vp9_tokens_from_tree(vp9_mv_fp_encodings, vp9_mv_fp_tree); vp9_tokens_from_tree(vp9_mv_fp_encodings, vp9_mv_fp_tree);
} }
void vp9_init_mv_probs(VP8_COMMON *cm) { void vp9_init_mv_probs(VP9_COMMON *cm) {
vpx_memcpy(&cm->fc.nmvc, &vp9_default_nmv_context, sizeof(nmv_context)); vpx_memcpy(&cm->fc.nmvc, &vp9_default_nmv_context, sizeof(nmv_context));
} }
...@@ -16,13 +16,13 @@ ...@@ -16,13 +16,13 @@
#include "vpx_config.h" #include "vpx_config.h"
#include "blockd.h" #include "blockd.h"
struct VP8Common; struct VP9Common;
void vp9_entropy_mv_init(); void vp9_entropy_mv_init();
void vp9_init_mv_probs(struct VP8Common *cm); void vp9_init_mv_probs(struct VP9Common *cm);
void vp8_adapt_mv_probs(struct VP8Common *cm); void vp8_adapt_mv_probs(struct VP9Common *cm);
void vp9_adapt_nmv_probs(struct VP8Common *cm, int usehp); void vp9_adapt_nmv_probs(struct VP9Common *cm, int usehp);
void vp8_lower_mv_precision(MV *mv); void vp8_lower_mv_precision(MV *mv);
int vp9_use_nmv_hp(const MV *ref); int vp9_use_nmv_hp(const MV *ref);
......
...@@ -157,7 +157,7 @@ void vp9_find_near_mvs ...@@ -157,7 +157,7 @@ void vp9_find_near_mvs
vp8_clamp_mv2(best_mv, xd); vp8_clamp_mv2(best_mv, xd);
} }
vp8_prob *vp9_mv_ref_probs(VP8_COMMON *pc, vp8_prob *vp9_mv_ref_probs(VP9_COMMON *pc,
vp8_prob p[VP8_MVREFS - 1], const int near_mv_ref_ct[4] vp8_prob p[VP8_MVREFS - 1], const int near_mv_ref_ct[4]
) { ) {
p[0] = pc->fc.vp8_mode_contexts [near_mv_ref_ct[0]] [0]; p[0] = pc->fc.vp8_mode_contexts [near_mv_ref_ct[0]] [0];
......
...@@ -96,7 +96,7 @@ void vp9_find_near_mvs ...@@ -96,7 +96,7 @@ void vp9_find_near_mvs
int *ref_frame_sign_bias int *ref_frame_sign_bias
); );
vp8_prob *vp9_mv_ref_probs(VP8_COMMON *pc, vp8_prob *vp9_mv_ref_probs(VP9_COMMON *pc,
vp8_prob p[VP8_MVREFS - 1], const int near_mv_ref_ct[4] vp8_prob p[VP8_MVREFS - 1], const int near_mv_ref_ct[4]
); );
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
#include "vp8/common/idct.h" #include "vp8/common/idct.h"
#include "vp8/common/onyxc_int.h" #include "vp8/common/onyxc_int.h"
extern void vp9_arch_x86_common_init(VP8_COMMON *ctx); extern void vp9_arch_x86_common_init(VP9_COMMON *ctx);
extern void vp8_arch_arm_common_init(VP8_COMMON *ctx); extern void vp8_arch_arm_common_init(VP9_COMMON *ctx);
void vp9_machine_specific_config(VP8_COMMON *ctx) { void vp9_machine_specific_config(VP9_COMMON *ctx) {
#if CONFIG_RUNTIME_CPU_DETECT #if CONFIG_RUNTIME_CPU_DETECT
VP8_COMMON_RTCD *rtcd = &ctx->rtcd; VP9_COMMON_RTCD *rtcd = &ctx->rtcd;
rtcd->idct.idct1 = vp9_short_idct4x4llm_1_c; rtcd->idct.idct1 = vp9_short_idct4x4llm_1_c;
rtcd->idct.idct16 = vp9_short_idct4x4llm_c; rtcd->idct.idct16 = vp9_short_idct4x4llm_c;
......
...@@ -94,7 +94,7 @@ void merge(item *labels, int u, int v) { ...@@ -94,7 +94,7 @@ void merge(item *labels, int u, int v) {
} }
void segment_via_mode_info(VP8_COMMON *oci, int how) { void segment_via_mode_info(VP9_COMMON *oci, int how) {
MODE_INFO *mi = oci->mi; MODE_INFO *mi = oci->mi;
int i, j; int i, j;
int mb_index = 0; int mb_index = 0;
......
...@@ -84,7 +84,7 @@ void vp9_loop_filter_update_sharpness(loop_filter_info_n *lfi, ...@@ -84,7 +84,7 @@ void vp9_loop_filter_update_sharpness(loop_filter_info_n *lfi,
} }
} }
void vp9_loop_filter_init(VP8_COMMON *cm) { void vp9_loop_filter_init(VP9_COMMON *cm) {
loop_filter_info_n *lfi = &cm->lf_info; loop_filter_info_n *lfi = &cm->lf_info;
int i; int i;
...@@ -101,7 +101,7 @@ void vp9_loop_filter_init(VP8_COMMON *cm) { ...@@ -101,7 +101,7 @@ void vp9_loop_filter_init(VP8_COMMON *cm) {
} }
} }
void vp9_loop_filter_frame_init(VP8_COMMON *cm, void vp9_loop_filter_frame_init(VP9_COMMON *cm,
MACROBLOCKD *xd, MACROBLOCKD *xd,
int default_filt_lvl) { int default_filt_lvl) {
int seg, /* segment number */ int seg, /* segment number */
...@@ -180,7 +180,7 @@ void vp9_loop_filter_frame_init(VP8_COMMON *cm, ...@@ -180,7 +180,7 @@ void vp9_loop_filter_frame_init(VP8_COMMON *cm,
void vp9_loop_filter_frame void vp9_loop_filter_frame
( (
VP8_COMMON *cm, VP9_COMMON *cm,
MACROBLOCKD *xd MACROBLOCKD *xd
) { ) {
YV12_BUFFER_CONFIG *post = cm->frame_to_show; YV12_BUFFER_CONFIG *post = cm->frame_to_show;
...@@ -318,7 +318,7 @@ void vp9_loop_filter_frame ...@@ -318,7 +318,7 @@ void vp9_loop_filter_frame
void vp9_loop_filter_frame_yonly void vp9_loop_filter_frame_yonly
( (
VP8_COMMON *cm, VP9_COMMON *cm,
MACROBLOCKD *xd, MACROBLOCKD *xd,
int default_filt_lvl int default_filt_lvl
) { ) {
...@@ -424,7 +424,7 @@ void vp9_loop_filter_frame_yonly ...@@ -424,7 +424,7 @@ void vp9_loop_filter_frame_yonly
void vp9_loop_filter_partial_frame void vp9_loop_filter_partial_frame
( (
VP8_COMMON *cm, VP9_COMMON *cm,
MACROBLOCKD *xd, MACROBLOCKD *xd,
int default_filt_lvl int default_filt_lvl
) { ) {
......
...@@ -80,22 +80,22 @@ typedef void loop_filter_uvfunction ...@@ -80,22 +80,22 @@ typedef void loop_filter_uvfunction
); );
/* assorted loopfilter functions which get used elsewhere */ /* assorted loopfilter functions which get used elsewhere */
struct VP8Common; struct VP9Common;
struct macroblockd; struct macroblockd;
void vp9_loop_filter_init(struct VP8Common *cm); void vp9_loop_filter_init(struct VP9Common *cm);
void vp9_loop_filter_frame_init(struct VP8Common *cm, void vp9_loop_filter_frame_init(struct VP9Common *cm,
struct macroblockd *mbd, struct macroblockd *mbd,
int default_filt_lvl); int default_filt_lvl);
void vp9_loop_filter_frame(struct VP8Common *cm, struct macroblockd *mbd); void vp9_loop_filter_frame(struct VP9Common *cm, struct macroblockd *mbd);
void vp9_loop_filter_partial_frame(struct VP8Common *cm, void vp9_loop_filter_partial_frame(struct VP9Common *cm,
struct macroblockd *mbd, struct macroblockd *mbd,
int default_filt_lvl); int default_filt_lvl);
void vp9_loop_filter_frame_yonly(struct VP8Common *cm, void vp9_loop_filter_frame_yonly(struct VP9Common *cm,
struct macroblockd *mbd, struct macroblockd *mbd,
int default_filt_lvl); int default_filt_lvl);
......
...@@ -22,7 +22,7 @@ extern "C" ...@@ -22,7 +22,7 @@ extern "C"
#include "vpx_scale/yv12config.h" #include "vpx_scale/yv12config.h"
#include "type_aliases.h" #include "type_aliases.h"
#include "ppflags.h" #include "ppflags.h"
typedef int *VP8_PTR; typedef int *VP9_PTR;
/* Create/destroy static data structures. */ /* Create/destroy static data structures. */
...@@ -174,50 +174,50 @@ extern "C" ...@@ -174,50 +174,50 @@ extern "C"
void vp9_initialize_enc(); void vp9_initialize_enc();
VP8_PTR vp9_create_compressor(VP8_CONFIG *oxcf); VP9_PTR vp9_create_compressor(VP8_CONFIG *oxcf);
void vp9_remove_compressor(VP8_PTR *comp); void vp9_remove_compressor(VP9_PTR *comp);
void vp8_init_config(VP8_PTR onyx, VP8_CONFIG *oxcf); void vp8_init_config(VP9_PTR onyx, VP8_CONFIG *oxcf);
void vp9_change_config(VP8_PTR onyx, VP8_CONFIG *oxcf); void vp9_change_config(VP9_PTR onyx, VP8_CONFIG *oxcf);
// receive a frames worth of data caller can assume that a copy of this frame is made // receive a frames worth of data caller can assume that a copy of this frame is made
// and not just a copy of the pointer.. // and not just a copy of the pointer..
int vp9_receive_raw_frame(VP8_PTR comp, unsigned int frame_flags, int vp9_receive_raw_frame(VP9_PTR comp, unsigned int frame_flags,
YV12_BUFFER_CONFIG *sd, int64_t time_stamp, YV12_BUFFER_CONFIG *sd, int64_t time_stamp,
int64_t end_time_stamp); int64_t end_time_stamp);
int vp9_get_compressed_data(VP8_PTR comp, unsigned int *frame_flags, int vp9_get_compressed_data(VP9_PTR comp, unsigned int *frame_flags,
unsigned long *size, unsigned char *dest, unsigned long *size, unsigned char *dest,
int64_t *time_stamp, int64_t *time_end, int64_t *time_stamp, int64_t *time_end,
int flush); int flush);
int vp9_get_preview_raw_frame(VP8_PTR comp, YV12_BUFFER_CONFIG *dest, int vp9_get_preview_raw_frame(VP9_PTR comp, YV12_BUFFER_CONFIG *dest,
vp8_ppflags_t *flags); vp8_ppflags_t *flags);
int vp9_use_as_reference(VP8_PTR comp, int ref_frame_flags); int vp9_use_as_reference(VP9_PTR comp, int ref_frame_flags);
int vp9_update_reference(VP8_PTR comp, int ref_frame_flags); int vp9_update_reference(VP9_PTR comp, int ref_frame_flags);
int vp9_get_reference_enc(VP8_PTR comp, VP8_REFFRAME ref_frame_flag, int vp9_get_reference_enc(VP9_PTR comp, VP8_REFFRAME ref_frame_flag,
YV12_BUFFER_CONFIG *sd); YV12_BUFFER_CONFIG *sd);