diff options
author | Jerome Jiang <jianj@google.com> | 2017-05-12 15:57:23 -0700 |
---|---|---|
committer | Jerome Jiang <jianj@google.com> | 2017-05-12 15:57:23 -0700 |
commit | 1fcd5cca3c810d37b8d81c69b6ebfe04c9f4cd4c (patch) | |
tree | c2300b20e1fb9aa210d2659212221eaa10348d25 /vp9/encoder/vp9_speed_features.c | |
parent | 0d88e15454b632d92404dd6a7181c58d9985e2a2 (diff) | |
download | libvpx-1fcd5cca3c810d37b8d81c69b6ebfe04c9f4cd4c.tar libvpx-1fcd5cca3c810d37b8d81c69b6ebfe04c9f4cd4c.tar.gz libvpx-1fcd5cca3c810d37b8d81c69b6ebfe04c9f4cd4c.tar.bz2 libvpx-1fcd5cca3c810d37b8d81c69b6ebfe04c9f4cd4c.zip |
vp9: speed 8: Fix seg fault in partition copy when drop frames.
BUG=webm:1433
Change-Id: I4f3984ef28660d3218d48007d7c977bdbdaf8af6
Diffstat (limited to 'vp9/encoder/vp9_speed_features.c')
-rw-r--r-- | vp9/encoder/vp9_speed_features.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c index 0884b8405..7917c63bf 100644 --- a/vp9/encoder/vp9_speed_features.c +++ b/vp9/encoder/vp9_speed_features.c @@ -565,8 +565,9 @@ 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 == ORIG && - !cpi->external_resize && cpi->oxcf.resize_mode == RESIZE_NONE) { + if (!cpi->last_frame_dropped && !cpi->use_svc && !cpi->resize_pending && + cpi->resize_state == ORIG && !cpi->external_resize && + cpi->oxcf.resize_mode == RESIZE_NONE) { sf->copy_partition_flag = 1; cpi->max_copied_frame = 4; } |