diff options
Diffstat (limited to 'vp8/encoder/quantize.h')
-rw-r--r-- | vp8/encoder/quantize.h | 35 |
1 files changed, 31 insertions, 4 deletions
diff --git a/vp8/encoder/quantize.h b/vp8/encoder/quantize.h index d9a041071..f1f0156d8 100644 --- a/vp8/encoder/quantize.h +++ b/vp8/encoder/quantize.h @@ -17,6 +17,11 @@ #define prototype_quantize_block(sym) \ void (sym)(BLOCK *b,BLOCKD *d) +#define prototype_quantize_block_pair(sym) \ + void (sym)(BLOCK *b1, BLOCK *b2, BLOCKD *d1, BLOCKD *d2) + +#define prototype_quantize_mb(sym) \ + void (sym)(MACROBLOCK *x) #if ARCH_X86 || ARCH_X86_64 #include "x86/quantize_x86.h" @@ -31,17 +36,43 @@ #endif extern prototype_quantize_block(vp8_quantize_quantb); +#ifndef vp8_quantize_quantb_pair +#define vp8_quantize_quantb_pair vp8_regular_quantize_b_pair +#endif +extern prototype_quantize_block_pair(vp8_quantize_quantb_pair); + #ifndef vp8_quantize_fastquantb #define vp8_quantize_fastquantb vp8_fast_quantize_b_c #endif extern prototype_quantize_block(vp8_quantize_fastquantb); +#ifndef vp8_quantize_fastquantb_pair +#define vp8_quantize_fastquantb_pair vp8_fast_quantize_b_pair_c +#endif +extern prototype_quantize_block_pair(vp8_quantize_fastquantb_pair); + typedef struct { prototype_quantize_block(*quantb); + prototype_quantize_block_pair(*quantb_pair); prototype_quantize_block(*fastquantb); + prototype_quantize_block_pair(*fastquantb_pair); } vp8_quantize_rtcd_vtable_t; +#ifndef vp8_quantize_mb +#define vp8_quantize_mb vp8_quantize_mb_c +#endif +extern prototype_quantize_mb(vp8_quantize_mb); + +#ifndef vp8_quantize_mbuv +#define vp8_quantize_mbuv vp8_quantize_mbuv_c +#endif +extern prototype_quantize_mb(vp8_quantize_mbuv); + +#ifndef vp8_quantize_mby +#define vp8_quantize_mby vp8_quantize_mby_c +#endif +extern prototype_quantize_mb(vp8_quantize_mby); #if CONFIG_RUNTIME_CPU_DETECT #define QUANTIZE_INVOKE(ctx,fn) (ctx)->fn @@ -51,10 +82,6 @@ typedef struct extern void vp8_strict_quantize_b(BLOCK *b,BLOCKD *d); -extern void vp8_quantize_mb(MACROBLOCK *x); -extern void vp8_quantize_mbuv(MACROBLOCK *x); -extern void vp8_quantize_mby(MACROBLOCK *x); - struct VP8_COMP; extern void vp8_set_quantizer(struct VP8_COMP *cpi, int Q); extern void vp8cx_frame_init_quantizer(struct VP8_COMP *cpi); |