ref: a81a3415576be3ab171cadd58bebb06dabbbaafa
parent: 36e8d4742735060f12d590177035171b6596122c
parent: c87895b14495d199738bc2368f15a2cff6bb6463
author: Jingning Han <jingning@google.com>
date: Tue Aug 21 19:44:28 EDT 2018
Merge "Safely swap the show frame buffer pointer in show_existing mode"
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -4839,8 +4839,10 @@
// current ARF will be directly used as the final reconstructed frame. This is
// an encoder control scheme. One could in principle explore other
// possibilities to arrange the reference frame buffer and their coding order.
- if (cm->show_existing_frame)
- cm->new_fb_idx = cm->ref_frame_map[cpi->alt_fb_idx];
+ if (cm->show_existing_frame) {
+ ref_cnt_fb(cm->buffer_pool->frame_bufs, &cm->new_fb_idx,
+ cm->ref_frame_map[cpi->alt_fb_idx]);
+ }
cpi->last_frame_dropped = 0;
cpi->svc.last_layer_dropped[cpi->svc.spatial_layer_id] = 0;