generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fix the CONFIG_ALPHA build."

Browse Source
This commit is contained in:
Alex Converse 2014-04-22 12:49:28 -07:00 committed by Gerrit Code Review
commit 9926f1566e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vp9/encoder/vp9_quantize.c
View File

@ -242,10 +242,10 @@ void vp9_init_plane_quantizers(VP9_COMP *cpi, MACROBLOCK *x) {
} }
#if CONFIG_ALPHA #if CONFIG_ALPHA
x->plane[3].quant = cpi->a_quant[qindex]; x->plane[3].quant = quants->a_quant[qindex];
x->plane[3].quant_shift = cpi->a_quant_shift[qindex]; x->plane[3].quant_shift = quants->a_quant_shift[qindex];
x->plane[3].zbin = cpi->a_zbin[qindex]; x->plane[3].zbin = quants->a_zbin[qindex];
x->plane[3].round = cpi->a_round[qindex]; x->plane[3].round = quants->a_round[qindex];
x->plane[3].zbin_extra = (int16_t)((cm->a_dequant[qindex][1] * zbin) >> 7); x->plane[3].zbin_extra = (int16_t)((cm->a_dequant[qindex][1] * zbin) >> 7);
xd->plane[3].dequant = cm->a_dequant[qindex]; xd->plane[3].dequant = cm->a_dequant[qindex];
#endif #endif

1
vp9/encoder/vp9_quantize.h
View File

@ -11,6 +11,7 @@
#ifndef VP9_ENCODER_VP9_QUANTIZE_H_ #ifndef VP9_ENCODER_VP9_QUANTIZE_H_
#define VP9_ENCODER_VP9_QUANTIZE_H_ #define VP9_ENCODER_VP9_QUANTIZE_H_
#include "./vpx_config.h"
#include "vp9/encoder/vp9_block.h" #include "vp9/encoder/vp9_block.h"
#ifdef __cplusplus #ifdef __cplusplus