diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-02-10 17:29:40 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-02-10 17:29:40 -0800 |
| commit | 7e7ae66f74bd8593e9c4651f861abc3c5fb16c34 (patch) | |
| tree | d0bd6e2312fe3dd29da92d73b990d970142a7d11 | |
| parent | 4d6cd41b711a4b45a72a8eb33c49a458c180dfdb (diff) | |
| parent | 1a30a8743b968258c8fa41f1c3f37dcf4c0620e4 (diff) | |
| download | libvpx-7e7ae66f74bd8593e9c4651f861abc3c5fb16c34.tar libvpx-7e7ae66f74bd8593e9c4651f861abc3c5fb16c34.tar.gz libvpx-7e7ae66f74bd8593e9c4651f861abc3c5fb16c34.tar.bz2 libvpx-7e7ae66f74bd8593e9c4651f861abc3c5fb16c34.zip | |
Merge "Making vp9_activity_masking() static."
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 4 | ||||
| -rw-r--r-- | vp9/encoder/vp9_onyx_int.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index a8f5c85a9..791245d94 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -319,7 +319,7 @@ static void build_activity_map(VP9_COMP *cpi) { } // 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 x->rdmult += *(x->mb_activity_ptr) * (x->rdmult >> 2); 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) - vp9_activity_masking(cpi, x); + activity_masking(cpi, x); if (cpi->oxcf.aq_mode == VARIANCE_AQ) { vp9_clear_system_state(); // __asm emms; diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h index 075229089..90ed606f6 100644 --- a/vp9/encoder/vp9_onyx_int.h +++ b/vp9/encoder/vp9_onyx_int.h @@ -692,8 +692,6 @@ void vp9_encode_frame(VP9_COMP *cpi); 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); int vp9_calc_ss_err(const YV12_BUFFER_CONFIG *source, |