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

Making vp9_activity_masking() static.

Browse Source 
Change-Id: Ic6a733f1fe92458da89c8459c5686ba1e08b92bf
This commit is contained in:
Dmitry Kovalev
2014-02-08 19:41:37 -08:00
parent 7c8a66664c
commit 1a30a8743b
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vp9/encoder/vp9_encodeframe.c
View File

@@ -319,7 +319,7 @@ static void build_activity_map(VP9_COMP *cpi) {
} }
// Macroblock activity masking // Macroblock activity masking
void vp9_activity_masking(VP9_COMP *cpi, MACROBLOCK *x) { static void activity_masking(VP9_COMP *cpi, MACROBLOCK *x) {
#if USE_ACT_INDEX #if USE_ACT_INDEX
x->rdmult += *(x->mb_activity_ptr) * (x->rdmult >> 2); x->rdmult += *(x->mb_activity_ptr) * (x->rdmult >> 2);
x->errorperbit = x->rdmult * 100 / (110 * x->rddiv); x->errorperbit = x->rdmult * 100 / (110 * x->rddiv);
@@ -673,7 +673,7 @@ static void rd_pick_sb_modes(VP9_COMP *cpi, const TileInfo *const tile,
} }
if (cpi->oxcf.tuning == VP8_TUNE_SSIM) if (cpi->oxcf.tuning == VP8_TUNE_SSIM)
vp9_activity_masking(cpi, x); activity_masking(cpi, x);
if (cpi->oxcf.aq_mode == VARIANCE_AQ) { if (cpi->oxcf.aq_mode == VARIANCE_AQ) {
vp9_clear_system_state(); // __asm emms; vp9_clear_system_state(); // __asm emms;

2
vp9/encoder/vp9_onyx_int.h
View File

@@ -691,8 +691,6 @@ void vp9_encode_frame(VP9_COMP *cpi);
void vp9_pack_bitstream(VP9_COMP *cpi, uint8_t *dest, size_t *size); void vp9_pack_bitstream(VP9_COMP *cpi, uint8_t *dest, size_t *size);
void vp9_activity_masking(VP9_COMP *cpi, MACROBLOCK *x);
void vp9_set_speed_features(VP9_COMP *cpi); void vp9_set_speed_features(VP9_COMP *cpi);
int vp9_calc_ss_err(const YV12_BUFFER_CONFIG *source, int vp9_calc_ss_err(const YV12_BUFFER_CONFIG *source,