Commit 0d53fc26 authored by Ronald S. Bultje's avatar Ronald S. Bultje
Browse files

Change decoder vp8_ and vp8dx_ public symbol prefixes to vp9_.

Change-Id: Iedb4c3b4171d8640cc525727b4c3658e2bb400db
parent d115dbc2
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
%include "vpx_config.asm" %include "vpx_config.asm"
%define program_name vpx %define program_name vp9
%define UNIX64 0 %define UNIX64 0
......
...@@ -43,21 +43,21 @@ extern "C" ...@@ -43,21 +43,21 @@ extern "C"
VP8D_OK = 0 VP8D_OK = 0
} VP8D_SETTING; } VP8D_SETTING;
void vp8dx_initialize(void); void vp9dx_initialize(void);
void vp8dx_set_setting(VP8D_PTR comp, VP8D_SETTING oxst, int x); void vp8dx_set_setting(VP8D_PTR comp, VP8D_SETTING oxst, int x);
int vp8dx_get_setting(VP8D_PTR comp, VP8D_SETTING oxst); int vp8dx_get_setting(VP8D_PTR comp, VP8D_SETTING oxst);
int vp8dx_receive_compressed_data(VP8D_PTR comp, unsigned long size, const unsigned char *dest, int64_t time_stamp); int vp9dx_receive_compressed_data(VP8D_PTR comp, unsigned long size, const unsigned char *dest, int64_t time_stamp);
int vp8dx_get_raw_frame(VP8D_PTR comp, YV12_BUFFER_CONFIG *sd, int64_t *time_stamp, int64_t *time_end_stamp, vp8_ppflags_t *flags); int vp9dx_get_raw_frame(VP8D_PTR comp, YV12_BUFFER_CONFIG *sd, int64_t *time_stamp, int64_t *time_end_stamp, vp8_ppflags_t *flags);
vpx_codec_err_t vp8dx_get_reference(VP8D_PTR comp, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd); vpx_codec_err_t vp9dx_get_reference(VP8D_PTR comp, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd);
vpx_codec_err_t vp8dx_set_reference(VP8D_PTR comp, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd); vpx_codec_err_t vp9dx_set_reference(VP8D_PTR comp, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd);
VP8D_PTR vp8dx_create_decompressor(VP8D_CONFIG *oxcf); VP8D_PTR vp9dx_create_decompressor(VP8D_CONFIG *oxcf);
void vp8dx_remove_decompressor(VP8D_PTR comp); void vp9dx_remove_decompressor(VP8D_PTR comp);
#ifdef __cplusplus #ifdef __cplusplus
} }
......
...@@ -37,38 +37,38 @@ fi ...@@ -37,38 +37,38 @@ fi
# #
# Dequant # Dequant
# #
prototype void vp8_dequantize_b "struct blockd *x" prototype void vp9_dequantize_b "struct blockd *x"
specialize vp8_dequantize_b mmx specialize vp9_dequantize_b mmx
prototype void vp8_dequantize_b_2x2 "struct blockd *x" prototype void vp9_dequantize_b_2x2 "struct blockd *x"
specialize vp8_dequantize_b_2x2 specialize vp9_dequantize_b_2x2
prototype void vp8_dequant_dc_idct_add_y_block_8x8 "short *q, short *dq, unsigned char *pre, unsigned char *dst, int stride, char *eobs, short *dc, struct macroblockd *xd" prototype void vp9_dequant_dc_idct_add_y_block_8x8 "short *q, short *dq, unsigned char *pre, unsigned char *dst, int stride, char *eobs, short *dc, struct macroblockd *xd"
specialize vp8_dequant_dc_idct_add_y_block_8x8 specialize vp9_dequant_dc_idct_add_y_block_8x8
prototype void vp8_dequant_idct_add_y_block_8x8 "short *q, short *dq, unsigned char *pre, unsigned char *dst, int stride, char *eobs, struct macroblockd *xd" prototype void vp9_dequant_idct_add_y_block_8x8 "short *q, short *dq, unsigned char *pre, unsigned char *dst, int stride, char *eobs, struct macroblockd *xd"
specialize vp8_dequant_idct_add_y_block_8x8 specialize vp9_dequant_idct_add_y_block_8x8
prototype void vp8_dequant_idct_add_uv_block_8x8 "short *q, short *dq, unsigned char *pre, unsigned char *dstu, unsigned char *dstv, int stride, char *eobs, struct macroblockd *xd" prototype void vp9_dequant_idct_add_uv_block_8x8 "short *q, short *dq, unsigned char *pre, unsigned char *dstu, unsigned char *dstv, int stride, char *eobs, struct macroblockd *xd"
specialize vp8_dequant_idct_add_uv_block_8x8 specialize vp9_dequant_idct_add_uv_block_8x8
prototype void vp8_dequant_idct_add_16x16 "short *input, short *dq, unsigned char *pred, unsigned char *dest, int pitch, int stride" prototype void vp9_dequant_idct_add_16x16 "short *input, short *dq, unsigned char *pred, unsigned char *dest, int pitch, int stride"
specialize vp8_dequant_idct_add_16x16 specialize vp9_dequant_idct_add_16x16
prototype void vp8_dequant_idct_add "short *input, short *dq, unsigned char *pred, unsigned char *dest, int pitch, int stride" prototype void vp9_dequant_idct_add "short *input, short *dq, unsigned char *pred, unsigned char *dest, int pitch, int stride"
specialize vp8_dequant_idct_add specialize vp9_dequant_idct_add
prototype void vp8_dequant_dc_idct_add "short *input, short *dq, unsigned char *pred, unsigned char *dest, int pitch, int stride, int Dc" prototype void vp9_dequant_dc_idct_add "short *input, short *dq, unsigned char *pred, unsigned char *dest, int pitch, int stride, int Dc"
specialize vp8_dequant_dc_idct_add specialize vp9_dequant_dc_idct_add
prototype void vp8_dequant_dc_idct_add_y_block "short *q, short *dq, unsigned char *pre, unsigned char *dst, int stride, char *eobs, short *dc" prototype void vp9_dequant_dc_idct_add_y_block "short *q, short *dq, unsigned char *pre, unsigned char *dst, int stride, char *eobs, short *dc"
specialize vp8_dequant_dc_idct_add_y_block mmx specialize vp9_dequant_dc_idct_add_y_block mmx
prototype void vp8_dequant_idct_add_y_block "short *q, short *dq, unsigned char *pre, unsigned char *dst, int stride, char *eobs" prototype void vp9_dequant_idct_add_y_block "short *q, short *dq, unsigned char *pre, unsigned char *dst, int stride, char *eobs"
specialize vp8_dequant_idct_add_y_block mmx specialize vp9_dequant_idct_add_y_block mmx
prototype void vp8_dequant_idct_add_uv_block "short *q, short *dq, unsigned char *pre, unsigned char *dstu, unsigned char *dstv, int stride, char *eobs" prototype void vp9_dequant_idct_add_uv_block "short *q, short *dq, unsigned char *pre, unsigned char *dstu, unsigned char *dstv, int stride, char *eobs"
specialize vp8_dequant_idct_add_uv_block mmx specialize vp9_dequant_idct_add_uv_block mmx
# #
# RECON # RECON
......
...@@ -20,22 +20,22 @@ ...@@ -20,22 +20,22 @@
*/ */
#if HAVE_MMX #if HAVE_MMX
extern prototype_idct(vpx_short_idct4x4llm_1_mmx); extern prototype_idct(vp9_short_idct4x4llm_1_mmx);
extern prototype_idct(vpx_short_idct4x4llm_mmx); extern prototype_idct(vp9_short_idct4x4llm_mmx);
extern prototype_idct_scalar_add(vpx_dc_only_idct_add_mmx); extern prototype_idct_scalar_add(vp9_dc_only_idct_add_mmx);
extern prototype_second_order(vp8_short_inv_walsh4x4_mmx); extern prototype_second_order(vp8_short_inv_walsh4x4_mmx);
extern prototype_second_order(vp8_short_inv_walsh4x4_1_mmx); extern prototype_second_order(vp8_short_inv_walsh4x4_1_mmx);
#if !CONFIG_RUNTIME_CPU_DETECT #if !CONFIG_RUNTIME_CPU_DETECT
#undef vp8_idct_idct1 #undef vp8_idct_idct1
#define vp8_idct_idct1 vpx_short_idct4x4llm_1_mmx #define vp8_idct_idct1 vp9_short_idct4x4llm_1_mmx
#undef vp8_idct_idct16 #undef vp8_idct_idct16
#define vp8_idct_idct16 vpx_short_idct4x4llm_mmx #define vp8_idct_idct16 vp9_short_idct4x4llm_mmx
#undef vp8_idct_idct1_scalar_add #undef vp8_idct_idct1_scalar_add
#define vp8_idct_idct1_scalar_add vpx_dc_only_idct_add_mmx #define vp8_idct_idct1_scalar_add vp9_dc_only_idct_add_mmx
#undef vp8_idct_iwalsh16 #undef vp8_idct_iwalsh16
#define vp8_idct_iwalsh16 vp8_short_inv_walsh4x4_mmx #define vp8_idct_iwalsh16 vp8_short_inv_walsh4x4_mmx
......
...@@ -34,9 +34,9 @@ void vp8_arch_x86_common_init(VP8_COMMON *ctx) { ...@@ -34,9 +34,9 @@ void vp8_arch_x86_common_init(VP8_COMMON *ctx) {
#if HAVE_MMX #if HAVE_MMX
// The commented functions need to be re-written for vpx. // The commented functions need to be re-written for vpx.
if (flags & HAS_MMX) { if (flags & HAS_MMX) {
rtcd->idct.idct1 = vpx_short_idct4x4llm_1_mmx; rtcd->idct.idct1 = vp9_short_idct4x4llm_1_mmx;
rtcd->idct.idct16 = vpx_short_idct4x4llm_mmx; rtcd->idct.idct16 = vp9_short_idct4x4llm_mmx;
rtcd->idct.idct1_scalar_add = vpx_dc_only_idct_add_mmx; rtcd->idct.idct1_scalar_add = vp9_dc_only_idct_add_mmx;
// rtcd->idct.iwalsh16 = vp8_short_inv_walsh4x4_mmx; // rtcd->idct.iwalsh16 = vp8_short_inv_walsh4x4_mmx;
// rtcd->idct.iwalsh1 = vp8_short_inv_walsh4x4_1_mmx; // rtcd->idct.iwalsh1 = vp8_short_inv_walsh4x4_1_mmx;
......
...@@ -15,30 +15,30 @@ ...@@ -15,30 +15,30 @@
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#if HAVE_ARMV7 #if HAVE_ARMV7
extern void vp8_dequantize_b_loop_neon(short *Q, short *DQC, short *DQ); extern void vp9_dequantize_b_loop_neon(short *Q, short *DQC, short *DQ);
#endif #endif
#if HAVE_ARMV6 #if HAVE_ARMV6
extern void vp8_dequantize_b_loop_v6(short *Q, short *DQC, short *DQ); extern void vp9_dequantize_b_loop_v6(short *Q, short *DQC, short *DQ);
#endif #endif
#if HAVE_ARMV7 #if HAVE_ARMV7
void vp8_dequantize_b_neon(BLOCKD *d) { void vp9_dequantize_b_neon(BLOCKD *d) {
short *DQ = d->dqcoeff; short *DQ = d->dqcoeff;
short *Q = d->qcoeff; short *Q = d->qcoeff;
short *DQC = d->dequant; short *DQC = d->dequant;
vp8_dequantize_b_loop_neon(Q, DQC, DQ); vp9_dequantize_b_loop_neon(Q, DQC, DQ);
} }
#endif #endif
#if HAVE_ARMV6 #if HAVE_ARMV6
void vp8_dequantize_b_v6(BLOCKD *d) { void vp9_dequantize_b_v6(BLOCKD *d) {
short *DQ = d->dqcoeff; short *DQ = d->dqcoeff;
short *Q = d->qcoeff; short *Q = d->qcoeff;
short *DQC = d->dequant; short *DQC = d->dequant;
vp8_dequantize_b_loop_v6(Q, DQC, DQ); vp9_dequantize_b_loop_v6(Q, DQC, DQ);
} }
#endif #endif
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
int vp8dx_start_decode(BOOL_DECODER *br, int vp9dx_start_decode(BOOL_DECODER *br,
const unsigned char *source, const unsigned char *source,
unsigned int source_sz) { unsigned int source_sz) {
br->user_buffer_end = source + source_sz; br->user_buffer_end = source + source_sz;
...@@ -26,13 +26,13 @@ int vp8dx_start_decode(BOOL_DECODER *br, ...@@ -26,13 +26,13 @@ int vp8dx_start_decode(BOOL_DECODER *br,
return 1; return 1;
/* Populate the buffer */ /* Populate the buffer */
vp8dx_bool_decoder_fill(br); vp9dx_bool_decoder_fill(br);
return 0; return 0;
} }
void vp8dx_bool_decoder_fill(BOOL_DECODER *br) { void vp9dx_bool_decoder_fill(BOOL_DECODER *br) {
const unsigned char *bufptr; const unsigned char *bufptr;
const unsigned char *bufend; const unsigned char *bufend;
VP8_BD_VALUE value; VP8_BD_VALUE value;
...@@ -66,7 +66,7 @@ int vp9_inv_recenter_nonneg(int v, int m) { ...@@ -66,7 +66,7 @@ int vp9_inv_recenter_nonneg(int v, int m) {
else return m - ((v + 1) >> 1); else return m - ((v + 1) >> 1);
} }
int vp8_decode_uniform(BOOL_DECODER *br, int n) { int vp9_decode_uniform(BOOL_DECODER *br, int n) {
int v; int v;
int l = get_unsigned_bits(n); int l = get_unsigned_bits(n);
int m = (1 << l) - n; int m = (1 << l) - n;
...@@ -78,13 +78,13 @@ int vp8_decode_uniform(BOOL_DECODER *br, int n) { ...@@ -78,13 +78,13 @@ int vp8_decode_uniform(BOOL_DECODER *br, int n) {
return (v << 1) - m + vp8_decode_value(br, 1); return (v << 1) - m + vp8_decode_value(br, 1);
} }
int vp8_decode_term_subexp(BOOL_DECODER *br, int k, int num_syms) { int vp9_decode_term_subexp(BOOL_DECODER *br, int k, int num_syms) {
int i = 0, mk = 0, word; int i = 0, mk = 0, word;
while (1) { while (1) {
int b = (i ? k + i - 1 : k); int b = (i ? k + i - 1 : k);
int a = (1 << b); int a = (1 << b);
if (num_syms <= mk + 3 * a) { if (num_syms <= mk + 3 * a) {
word = vp8_decode_uniform(br, num_syms - mk) + mk; word = vp9_decode_uniform(br, num_syms - mk) + mk;
break; break;
} else { } else {
if (vp8_decode_value(br, 1)) { if (vp8_decode_value(br, 1)) {
......
...@@ -35,14 +35,14 @@ typedef struct { ...@@ -35,14 +35,14 @@ typedef struct {
DECLARE_ALIGNED(16, extern const unsigned char, vp8_norm[256]); DECLARE_ALIGNED(16, extern const unsigned char, vp8_norm[256]);
int vp8dx_start_decode(BOOL_DECODER *br, int vp9dx_start_decode(BOOL_DECODER *br,
const unsigned char *source, const unsigned char *source,
unsigned int source_sz); unsigned int source_sz);
void vp8dx_bool_decoder_fill(BOOL_DECODER *br); void vp9dx_bool_decoder_fill(BOOL_DECODER *br);
int vp8_decode_uniform(BOOL_DECODER *br, int n); int vp9_decode_uniform(BOOL_DECODER *br, int n);
int vp8_decode_term_subexp(BOOL_DECODER *br, int k, int num_syms); int vp9_decode_term_subexp(BOOL_DECODER *br, int k, int num_syms);
int vp9_inv_recenter_nonneg(int v, int m); int vp9_inv_recenter_nonneg(int v, int m);
/*The refill loop is used in several places, so define it in a macro to make /*The refill loop is used in several places, so define it in a macro to make
...@@ -87,7 +87,7 @@ static int vp8dx_decode_bool(BOOL_DECODER *br, int probability) { ...@@ -87,7 +87,7 @@ static int vp8dx_decode_bool(BOOL_DECODER *br, int probability) {
split = 1 + (((br->range - 1) * probability) >> 8); split = 1 + (((br->range - 1) * probability) >> 8);
if (br->count < 0) if (br->count < 0)
vp8dx_bool_decoder_fill(br); vp9dx_bool_decoder_fill(br);
value = br->value; value = br->value;
count = br->count; count = br->count;
......
...@@ -1174,7 +1174,7 @@ static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, ...@@ -1174,7 +1174,7 @@ static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
} }
} }
void vpx_decode_mode_mvs_init(VP8D_COMP *pbi, BOOL_DECODER* const bc) { void vp9_decode_mode_mvs_init(VP8D_COMP *pbi, BOOL_DECODER* const bc) {
VP8_COMMON *cm = &pbi->common; VP8_COMMON *cm = &pbi->common;
vpx_memset(cm->mbskip_pred_probs, 0, sizeof(cm->mbskip_pred_probs)); vpx_memset(cm->mbskip_pred_probs, 0, sizeof(cm->mbskip_pred_probs));
...@@ -1186,7 +1186,7 @@ void vpx_decode_mode_mvs_init(VP8D_COMP *pbi, BOOL_DECODER* const bc) { ...@@ -1186,7 +1186,7 @@ void vpx_decode_mode_mvs_init(VP8D_COMP *pbi, BOOL_DECODER* const bc) {
mb_mode_mv_init(pbi, bc); mb_mode_mv_init(pbi, bc);
} }
void vpx_decode_mb_mode_mv(VP8D_COMP *pbi, void vp9_decode_mb_mode_mv(VP8D_COMP *pbi,
MACROBLOCKD *xd, MACROBLOCKD *xd,
int mb_row, int mb_row,
int mb_col, int mb_col,
......
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
#include "onyxd_int.h" #include "onyxd_int.h"
void vpx_decode_mb_mode_mv(VP8D_COMP* const pbi, void vp9_decode_mb_mode_mv(VP8D_COMP* const pbi,
MACROBLOCKD* const xd, MACROBLOCKD* const xd,
int mb_row, int mb_row,
int mb_col, int mb_col,
BOOL_DECODER* const bc); BOOL_DECODER* const bc);
void vpx_decode_mode_mvs_init(VP8D_COMP* const pbi, BOOL_DECODER* const bc); void vp9_decode_mode_mvs_init(VP8D_COMP* const pbi, BOOL_DECODER* const bc);
...@@ -68,11 +68,11 @@ static int inv_remap_prob(int v, int m) { ...@@ -68,11 +68,11 @@ static int inv_remap_prob(int v, int m) {
} }
static vp8_prob read_prob_diff_update(vp8_reader *const bc, int oldp) { static vp8_prob read_prob_diff_update(vp8_reader *const bc, int oldp) {
int delp = vp8_decode_term_subexp(bc, SUBEXP_PARAM, 255); int delp = vp9_decode_term_subexp(bc, SUBEXP_PARAM, 255);
return (vp8_prob)inv_remap_prob(delp, oldp); return (vp8_prob)inv_remap_prob(delp, oldp);
} }
void vp8cx_init_de_quantizer(VP8D_COMP *pbi) { void vp9cx_init_de_quantizer(VP8D_COMP *pbi) {
int i; int i;
int Q; int Q;
VP8_COMMON *const pc = &pbi->common; VP8_COMMON *const pc = &pbi->common;
...@@ -127,29 +127,29 @@ static void mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd) { ...@@ -127,29 +127,29 @@ static void mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd) {
pbi->common.rtcd.idct.idct1_scalar_add = vp8_dc_only_inv_walsh_add_c; pbi->common.rtcd.idct.idct1_scalar_add = vp8_dc_only_inv_walsh_add_c;
pbi->common.rtcd.idct.iwalsh1 = vp8_short_inv_walsh4x4_1_lossless_c; pbi->common.rtcd.idct.iwalsh1 = vp8_short_inv_walsh4x4_1_lossless_c;
pbi->common.rtcd.idct.iwalsh16 = vp8_short_inv_walsh4x4_lossless_c; pbi->common.rtcd.idct.iwalsh16 = vp8_short_inv_walsh4x4_lossless_c;
pbi->idct_add = vp8_dequant_idct_add_lossless_c; pbi->idct_add = vp9_dequant_idct_add_lossless_c;
pbi->dc_idct_add = vp8_dequant_dc_idct_add_lossless_c; pbi->dc_idct_add = vp9_dequant_dc_idct_add_lossless_c;
pbi->dc_idct_add_y_block = vp8_dequant_dc_idct_add_y_block_lossless_c; pbi->dc_idct_add_y_block = vp9_dequant_dc_idct_add_y_block_lossless_c;
pbi->idct_add_y_block = vp8_dequant_idct_add_y_block_lossless_c; pbi->idct_add_y_block = vp9_dequant_idct_add_y_block_lossless_c;
pbi->idct_add_uv_block = vp8_dequant_idct_add_uv_block_lossless_c; pbi->idct_add_uv_block = vp9_dequant_idct_add_uv_block_lossless_c;
} else { } else {
pbi->common.rtcd.idct.idct1 = vp8_short_idct4x4llm_1_c; pbi->common.rtcd.idct.idct1 = vp8_short_idct4x4llm_1_c;
pbi->common.rtcd.idct.idct16 = vp8_short_idct4x4llm_c; pbi->common.rtcd.idct.idct16 = vp8_short_idct4x4llm_c;
pbi->common.rtcd.idct.idct1_scalar_add = vp8_dc_only_idct_add_c; pbi->common.rtcd.idct.idct1_scalar_add = vp8_dc_only_idct_add_c;
pbi->common.rtcd.idct.iwalsh1 = vp8_short_inv_walsh4x4_1_c; pbi->common.rtcd.idct.iwalsh1 = vp8_short_inv_walsh4x4_1_c;
pbi->common.rtcd.idct.iwalsh16 = vp8_short_inv_walsh4x4_c; pbi->common.rtcd.idct.iwalsh16 = vp8_short_inv_walsh4x4_c;
pbi->idct_add = vp8_dequant_idct_add; pbi->idct_add = vp9_dequant_idct_add;
pbi->dc_idct_add = vp8_dequant_dc_idct_add; pbi->dc_idct_add = vp9_dequant_dc_idct_add;
pbi->dc_idct_add_y_block = vp8_dequant_dc_idct_add_y_block; pbi->dc_idct_add_y_block = vp9_dequant_dc_idct_add_y_block;
pbi->idct_add_y_block = vp8_dequant_idct_add_y_block; pbi->idct_add_y_block = vp9_dequant_idct_add_y_block;
pbi->idct_add_uv_block = vp8_dequant_idct_add_uv_block; pbi->idct_add_uv_block = vp9_dequant_idct_add_uv_block;
} }
#else #else
pbi->idct_add = vp8_dequant_idct_add; pbi->idct_add = vp9_dequant_idct_add;
pbi->dc_idct_add = vp8_dequant_dc_idct_add; pbi->dc_idct_add = vp9_dequant_dc_idct_add;
pbi->dc_idct_add_y_block = vp8_dequant_dc_idct_add_y_block; pbi->dc_idct_add_y_block = vp9_dequant_dc_idct_add_y_block;
pbi->idct_add_y_block = vp8_dequant_idct_add_y_block; pbi->idct_add_y_block = vp9_dequant_idct_add_y_block;
pbi->idct_add_uv_block = vp8_dequant_idct_add_uv_block; pbi->idct_add_uv_block = vp9_dequant_idct_add_uv_block;
#endif #endif
for (i = 16; i < 24; i++) { for (i = 16; i < 24; i++) {
...@@ -226,7 +226,7 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, ...@@ -226,7 +226,7 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
mode = xd->mode_info_context->mbmi.mode; mode = xd->mode_info_context->mbmi.mode;
if (xd->mode_info_context->mbmi.mb_skip_coeff) { if (xd->mode_info_context->mbmi.mb_skip_coeff) {
vp8_reset_mb_tokens_context(xd); vp9_reset_mb_tokens_context(xd);
#if CONFIG_SUPERBLOCKS #if CONFIG_SUPERBLOCKS
if (xd->mode_info_context->mbmi.encoded_as_sb && if (xd->mode_info_context->mbmi.encoded_as_sb &&
(mb_col < pc->mb_cols - 1 || mb_row < pc->mb_rows - 1)) { (mb_col < pc->mb_cols - 1 || mb_row < pc->mb_rows - 1)) {
...@@ -234,7 +234,7 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, ...@@ -234,7 +234,7 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
xd->above_context++; xd->above_context++;
if (mb_row < pc->mb_rows - 1) if (mb_row < pc->mb_rows - 1)
xd->left_context++; xd->left_context++;
vp8_reset_mb_tokens_context(xd); vp9_reset_mb_tokens_context(xd);
if (mb_col < pc->mb_cols - 1) if (mb_col < pc->mb_cols - 1)
xd->above_context--; xd->above_context--;
if (mb_row < pc->mb_rows - 1) if (mb_row < pc->mb_rows - 1)
...@@ -247,11 +247,11 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, ...@@ -247,11 +247,11 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
xd->eobs[i] = 0; xd->eobs[i] = 0;
} }
if (tx_size == TX_16X16) { if (tx_size == TX_16X16) {
eobtotal = vp8_decode_mb_tokens_16x16(pbi, xd, bc); eobtotal = vp9_decode_mb_tokens_16x16(pbi, xd, bc);
} else if (tx_size == TX_8X8) { } else if (tx_size == TX_8X8) {
eobtotal = vp8_decode_mb_tokens_8x8(pbi, xd, bc); eobtotal = vp9_decode_mb_tokens_8x8(pbi, xd, bc);
} else { } else {
eobtotal = vp8_decode_mb_tokens(pbi, xd, bc); eobtotal = vp9_decode_mb_tokens(pbi, xd, bc);
} }
} }
...@@ -330,16 +330,16 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, ...@@ -330,16 +330,16 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
if (xd->mode_info_context->mbmi.txfm_size == TX_8X8) { if (xd->mode_info_context->mbmi.txfm_size == TX_8X8) {
tx_type = get_tx_type(xd, &xd->block[idx]); tx_type = get_tx_type(xd, &xd->block[idx]);
if (tx_type != DCT_DCT) { if (tx_type != DCT_DCT) {
vp8_ht_dequant_idct_add_8x8_c(tx_type, vp9_ht_dequant_idct_add_8x8_c(tx_type,
q, dq, pre, dst, 16, stride); q, dq, pre, dst, 16, stride);
} else { } else {
vp8_dequant_idct_add_8x8_c(q, dq, pre, dst, 16, stride); vp9_dequant_idct_add_8x8_c(q, dq, pre, dst, 16, stride);
} }
q += 64; q += 64;
} else { } else {
for (j = 0; j < 4; j++) { for (j = 0; j < 4; j++) {
b = &xd->block[ib + iblock[j]]; b = &xd->block[ib + iblock[j]];
vp8_dequant_idct_add(b->qcoeff, b->dequant, b->predictor, vp9_dequant_idct_add(b->qcoeff, b->dequant, b->predictor,
*(b->base_dst) + b->dst, 16, b->dst_stride); *(b->base_dst) + b->dst, 16, b->dst_stride);
} }
} }
...@@ -370,17 +370,17 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, ...@@ -370,17 +370,17 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
tx_type = get_tx_type(xd, b); tx_type = get_tx_type(xd, b);
if (tx_type != DCT_DCT) { if (tx_type != DCT_DCT) {
vp8_ht_dequant_idct_add_c(tx_type, b->qcoeff, vp9_ht_dequant_idct_add_c(tx_type, b->qcoeff,
b->dequant, b->predictor, b->dequant, b->predictor,
*(b->base_dst) + b->dst, 16, b->dst_stride); *(b->base_dst) + b->dst, 16, b->dst_stride);
} else { } else {
vp8_dequant_idct_add(b->qcoeff, b->dequant, b->predictor, vp9_dequant_idct_add(b->qcoeff, b->dequant, b->predictor,
*(b->base_dst) + b->dst, 16, b->dst_stride); *(b->base_dst) + b->dst, 16, b->dst_stride);
} }
} }
} else if (mode == SPLITMV) { } else if (mode == SPLITMV) {
if (tx_size == TX_8X8) { if (tx_size == TX_8X8) {
vp8_dequant_idct_add_y_block_8x8(xd->qcoeff, xd->block[0].dequant, vp9_dequant_idct_add_y_block_8x8(xd->qcoeff, xd->block[0].dequant,
xd->predictor, xd->dst.y_buffer, xd->predictor, xd->dst.y_buffer,
xd->dst.y_stride, xd->eobs, xd); xd->dst.y_stride, xd->eobs, xd);
} else { } else {
...@@ -395,11 +395,11 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, ...@@ -395,11 +395,11 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
BLOCKD *bd = &xd->block[0]; BLOCKD *bd = &xd->block[0];
tx_type = get_tx_type(xd, bd); tx_type = get_tx_type(xd, bd);
if (tx_type != DCT_DCT) { if (tx_type != DCT_DCT) {
vp8_ht_dequant_idct_add_16x16_c(tx_type, xd->qcoeff, vp9_ht_dequant_idct_add_16x16_c(tx_type, xd->qcoeff,
xd->block[0].dequant, xd->predictor, xd->block[0].dequant, xd->predictor,
xd->dst.y_buffer, 16, xd->dst.y_stride); xd->dst.y_buffer, 16, xd->dst.y_stride);
} else { } else {
vp8_dequant_idct_add_16x16(xd->qcoeff, xd->block[0].dequant, vp9_dequant_idct_add_16x16(xd->qcoeff, xd->block[0].dequant,