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

Merge "Refactor: Change cpi->resize_state to enum values."

Browse Source
This commit is contained in:
Jerome Jiang 2017-03-16 16:43:41 +00:00 committed by Gerrit Code Review
commit bf40776aa4
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vp9/encoder/vp9_encoder.c
View File

@ -1673,7 +1673,7 @@ VP9_COMP *vp9_create_compressor(VP9EncoderConfig *oxcf,
(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 @@ static void encode_without_recode_loop(VP9_COMP *cpi, size_t *size,
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 @@ static void encode_without_recode_loop(VP9_COMP *cpi, size_t *size,
// 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;

2
vp9/encoder/vp9_encoder.h
View File

@ -651,7 +651,7 @@ typedef struct VP9_COMP {
#endif
int resize_pending;
int resize_state;
RESIZE_STATE resize_state;
int external_resize;
int resize_scale_num;
int resize_scale_den;

2
vp9/encoder/vp9_speed_features.c
View File

@ -525,7 +525,7 @@ static void set_rt_speed_feature_framesize_independent(
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;