Commit 4a4ade6d authored by John Koleszar's avatar John Koleszar Committed by Code Review
Browse files

Merge "bug fix check frame buffer index before copy"

parents 4fb5ce6a 8795b525
......@@ -3103,15 +3103,21 @@ void update_reference_frames(VP8_COMMON *cm)
if (cm->copy_buffer_to_arf == 1)
{
yv12_fb[cm->lst_fb_idx].flags |= VP8_ALT_FLAG;
yv12_fb[cm->alt_fb_idx].flags &= ~VP8_ALT_FLAG;
cm->alt_fb_idx = cm->lst_fb_idx;
if(cm->alt_fb_idx != cm->lst_fb_idx)
{
yv12_fb[cm->lst_fb_idx].flags |= VP8_ALT_FLAG;
yv12_fb[cm->alt_fb_idx].flags &= ~VP8_ALT_FLAG;
cm->alt_fb_idx = cm->lst_fb_idx;
}
}
else /* if (cm->copy_buffer_to_arf == 2) */
{
yv12_fb[cm->gld_fb_idx].flags |= VP8_ALT_FLAG;
yv12_fb[cm->alt_fb_idx].flags &= ~VP8_ALT_FLAG;
cm->alt_fb_idx = cm->gld_fb_idx;
if(cm->alt_fb_idx != cm->gld_fb_idx)
{
yv12_fb[cm->gld_fb_idx].flags |= VP8_ALT_FLAG;
yv12_fb[cm->alt_fb_idx].flags &= ~VP8_ALT_FLAG;
cm->alt_fb_idx = cm->gld_fb_idx;
}
}
}
......@@ -3129,15 +3135,21 @@ void update_reference_frames(VP8_COMMON *cm)
if (cm->copy_buffer_to_gf == 1)
{
yv12_fb[cm->lst_fb_idx].flags |= VP8_GOLD_FLAG;
yv12_fb[cm->gld_fb_idx].flags &= ~VP8_GOLD_FLAG;
cm->gld_fb_idx = cm->lst_fb_idx;
if(cm->gld_fb_idx != cm->lst_fb_idx)
{
yv12_fb[cm->lst_fb_idx].flags |= VP8_GOLD_FLAG;
yv12_fb[cm->gld_fb_idx].flags &= ~VP8_GOLD_FLAG;
cm->gld_fb_idx = cm->lst_fb_idx;
}
}
else /* if (cm->copy_buffer_to_gf == 2) */
{
yv12_fb[cm->alt_fb_idx].flags |= VP8_GOLD_FLAG;
yv12_fb[cm->gld_fb_idx].flags &= ~VP8_GOLD_FLAG;
cm->gld_fb_idx = cm->alt_fb_idx;
if(cm->alt_fb_idx != cm->gld_fb_idx)
{
yv12_fb[cm->alt_fb_idx].flags |= VP8_GOLD_FLAG;
yv12_fb[cm->gld_fb_idx].flags &= ~VP8_GOLD_FLAG;
cm->gld_fb_idx = cm->alt_fb_idx;
}
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment