ref: f97f2b1bb6c08661b88324ef15354505dad4a041
parent: edcf74c6add3b64fe7bd931194bcb9ebbfa3413a
parent: 1942eeb8860bd1350e66a250cd684fa7705fb68c
author: John Koleszar <jkoleszar@google.com>
date: Tue Jan 18 07:54:57 EST 2011
Merge "fix last frame buffer copy logic regression"
--- a/vp8/decoder/onyxd_if.c
+++ b/vp8/decoder/onyxd_if.c
@@ -254,13 +254,8 @@
/* If any buffer copy / swapping is signalled it should be done here. */
static int swap_frame_buffers (VP8_COMMON *cm)
{- int fb_to_update_with, err = 0;
+ int err = 0;
- if (cm->refresh_last_frame)
- fb_to_update_with = cm->lst_fb_idx;
- else
- fb_to_update_with = cm->new_fb_idx;
-
/* The alternate reference frame or golden frame can be updated
* using the new, last, or golden/alt ref frame. If it
* is updated using the newly decoded frame it is a refresh.
@@ -271,7 +266,7 @@
int new_fb = 0;
if (cm->copy_buffer_to_arf == 1)
- new_fb = fb_to_update_with;
+ new_fb = cm->lst_fb_idx;
else if (cm->copy_buffer_to_arf == 2)
new_fb = cm->gld_fb_idx;
else
@@ -285,7 +280,7 @@
int new_fb = 0;
if (cm->copy_buffer_to_gf == 1)
- new_fb = fb_to_update_with;
+ new_fb = cm->lst_fb_idx;
else if (cm->copy_buffer_to_gf == 2)
new_fb = cm->alt_fb_idx;
else