diff options
| author | Sai Deng <sdeng@google.com> | 2019-04-23 22:59:34 +0000 |
|---|---|---|
| committer | Sai Deng <sdeng@google.com> | 2019-04-23 23:02:55 +0000 |
| commit | b4da0a527ec8ea56fc7d808dd06380a6ecc72905 (patch) | |
| tree | d172e30177babd6c298f01ba667e62bc3038a9d8 /vp8/encoder/encodeframe.c | |
| parent | 1d8d8f562bf382e47071bb38d13b7ded366820af (diff) | |
| download | libvpx-b4da0a527ec8ea56fc7d808dd06380a6ecc72905.tar libvpx-b4da0a527ec8ea56fc7d808dd06380a6ecc72905.tar.gz libvpx-b4da0a527ec8ea56fc7d808dd06380a6ecc72905.tar.bz2 libvpx-b4da0a527ec8ea56fc7d808dd06380a6ecc72905.zip | |
Revert "Add VPX_TUNE_SSIM and VPX_TUNE_PSNR enums"
This reverts commit 1d8d8f562bf382e47071bb38d13b7ded366820af.
Reason for revert: change the api names will break existing code.
Original change's description:
> Add VPX_TUNE_SSIM and VPX_TUNE_PSNR enums
>
> Change-Id: I3df5af2c60b774e6d395062077542c52db868236
TBR=jingning@google.com,builds@webmproject.org,sdeng@google.com
Change-Id: Ic94c19739f595f4544e8b68892ab9d9c1bbccd79
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Diffstat (limited to 'vp8/encoder/encodeframe.c')
| -rw-r--r-- | vp8/encoder/encodeframe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 624d60c95..2b3d9564c 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -426,7 +426,7 @@ static void encode_mb_row(VP8_COMP *cpi, VP8_COMMON *cm, int mb_row, } #endif - if (cpi->oxcf.tuning == VPX_TUNE_SSIM) vp8_activity_masking(cpi, x); + if (cpi->oxcf.tuning == VP8_TUNE_SSIM) vp8_activity_masking(cpi, x); /* Is segmentation enabled */ /* MB level adjustment to quantizer */ @@ -720,7 +720,7 @@ void vp8_encode_frame(VP8_COMP *cpi) { vp8cx_initialize_me_consts(cpi, cm->base_qindex); - if (cpi->oxcf.tuning == VPX_TUNE_SSIM) { + if (cpi->oxcf.tuning == VP8_TUNE_SSIM) { /* Initialize encode frame context. */ init_encode_frame_mb_context(cpi); @@ -1086,7 +1086,7 @@ int vp8cx_encode_intra_macroblock(VP8_COMP *cpi, MACROBLOCK *x, vp8_pick_intra_mode(x, &rate); } - if (cpi->oxcf.tuning == VPX_TUNE_SSIM) { + if (cpi->oxcf.tuning == VP8_TUNE_SSIM) { adjust_act_zbin(cpi, x); vp8_update_zbin_extra(cpi, x); } @@ -1172,7 +1172,7 @@ int vp8cx_encode_inter_macroblock(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t, x->prediction_error += distortion; x->intra_error += intra_error; - if (cpi->oxcf.tuning == VPX_TUNE_SSIM) { + if (cpi->oxcf.tuning == VP8_TUNE_SSIM) { /* Adjust the zbin based on this MB rate. */ adjust_act_zbin(cpi, x); } |