ref: bf40776aa4e089caf286159ff376caa7efc01a59
parent: ec73bf53a5d5d7d33ba74e7b799c1bd69c16ce9e
parent: b5f7f7737a016f793c8b558608d5eae4e46bccfb
author: Jerome Jiang <jianj@google.com>
date: Thu Mar 16 12:43:41 EDT 2017
Merge "Refactor: Change cpi->resize_state to enum values."
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -1673,7 +1673,7 @@
(FRAME_CONTEXT *)vpx_calloc(FRAME_CONTEXTS, sizeof(*cm->frame_contexts)));
cpi->use_svc = 0;
- cpi->resize_state = 0;
+ cpi->resize_state = ORIG;
cpi->external_resize = 0;
cpi->resize_avg_qp = 0;
cpi->resize_buffer_underflow = 0;
@@ -3170,7 +3170,7 @@
vp9_update_noise_estimate(cpi);
if (cpi->oxcf.pass == 0 && cpi->oxcf.mode == REALTIME &&
- cpi->oxcf.speed >= 5 && cpi->resize_state == 0 &&
+ cpi->oxcf.speed >= 5 && cpi->resize_state == ORIG &&
(cpi->oxcf.content == VP9E_CONTENT_SCREEN ||
cpi->oxcf.rc_mode == VPX_VBR || compute_source_sad) &&
cm->show_frame)
@@ -3223,7 +3223,7 @@
// Check if we should drop this frame because of high overshoot.
// Only for frames where high temporal-source SAD is detected.
if (cpi->oxcf.pass == 0 && cpi->oxcf.rc_mode == VPX_CBR &&
- cpi->resize_state == 0 && cm->frame_type != KEY_FRAME &&
+ cpi->resize_state == ORIG && cm->frame_type != KEY_FRAME &&
cpi->oxcf.content == VP9E_CONTENT_SCREEN &&
cpi->rc.high_source_sad == 1) {int frame_size = 0;
--- a/vp9/encoder/vp9_encoder.h
+++ b/vp9/encoder/vp9_encoder.h
@@ -651,7 +651,7 @@
#endif
int resize_pending;
- int resize_state;
+ RESIZE_STATE resize_state;
int external_resize;
int resize_scale_num;
int resize_scale_den;
--- a/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@ -525,7 +525,7 @@
if (speed >= 8) {sf->adaptive_rd_thresh = 4;
// Enable partition copy
- if (!cpi->use_svc && !cpi->resize_pending && !cpi->resize_state &&
+ if (!cpi->use_svc && !cpi->resize_pending && cpi->resize_state != ORIG &&
!cpi->external_resize && cpi->oxcf.resize_mode == RESIZE_NONE)
sf->copy_partition_flag = 1;
--
⑨