diff options
| author | John Koleszar <jkoleszar@google.com> | 2013-02-22 11:22:03 -0800 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2013-02-27 08:22:40 -0800 |
| commit | 800ad0b886ce6776712c1835878e500ffd43af64 (patch) | |
| tree | a253967bc6d9a753e16c9c25dc6a238387e5ac52 /vp9/encoder/vp9_mbgraph.c | |
| parent | b683eecf6dfe9fc947394df6f0e047e2fcbea43e (diff) | |
| download | libvpx-800ad0b886ce6776712c1835878e500ffd43af64.tar libvpx-800ad0b886ce6776712c1835878e500ffd43af64.tar.gz libvpx-800ad0b886ce6776712c1835878e500ffd43af64.tar.bz2 libvpx-800ad0b886ce6776712c1835878e500ffd43af64.zip | |
Use ref_frame_map vice active_ref_idx on the encoder
This patch makes the encoder's use of ref_frame_map and active_ref_idx
consistent with the decoder. ref_frame_map[] maps a reference buffer
index to its actual location in the yv12_fb array, since many
references may share an underlying buffer. active_ref_idx[] mirrors
cpi->{lst,gld,alt}_fb_idx, holding the active references in each
slot.
This also fixes a bug in setup_buffer_inter() where the incorrect
reference was used to populate the scaling factors.
Change-Id: Id3728f6d77cffcd27c248903bf51f9c3e594287e
Diffstat (limited to 'vp9/encoder/vp9_mbgraph.c')
| -rw-r--r-- | vp9/encoder/vp9_mbgraph.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_mbgraph.c b/vp9/encoder/vp9_mbgraph.c index bc06c9458..d6644c2aa 100644 --- a/vp9/encoder/vp9_mbgraph.c +++ b/vp9/encoder/vp9_mbgraph.c @@ -445,7 +445,7 @@ void vp9_update_mbgraph_stats VP9_COMMON *const cm = &cpi->common; int i, n_frames = vp9_lookahead_depth(cpi->lookahead); YV12_BUFFER_CONFIG *golden_ref = - &cm->yv12_fb[cm->active_ref_idx[cpi->gld_fb_idx]]; + &cm->yv12_fb[cm->ref_frame_map[cpi->gld_fb_idx]]; // we need to look ahead beyond where the ARF transitions into // being a GF - so exit if we don't look ahead beyond that |