ref: c77c5413e06e4cb71bf918ee3a2a62297c108df6
parent: 2b6e0fe01032b39476674f2cbacb4c30837ab24f
parent: 3246692ebc5dee78aab0a63a363c1d50fe41ace7
author: Adrian Grange <agrange@google.com>
date: Wed Jan 22 03:34:48 EST 2014
Merge "Force show_frame=1 when show_existing_frame=1"
--- a/vp9/decoder/vp9_decodeframe.c
+++ b/vp9/decoder/vp9_decodeframe.c
@@ -1129,11 +1129,12 @@
cm->show_existing_frame = vp9_rb_read_bit(rb);
if (cm->show_existing_frame) {
- // show an existing frame directly
+ // Show an existing frame directly.
int frame_to_show = cm->ref_frame_map[vp9_rb_read_literal(rb, 3)];
ref_cnt_fb(cm->fb_idx_ref_cnt, &cm->new_fb_idx, frame_to_show);
pbi->refresh_frame_flags = 0;
cm->lf.filter_level = 0;
+ cm->show_frame = 1;
return 0;
}
--
⑨