diff options
| author | John Koleszar <jkoleszar@google.com> | 2013-01-22 08:31:55 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-01-22 08:31:55 -0800 |
| commit | bed59eb8de198ca9ab1230011e5a6d54d1c9765e (patch) | |
| tree | 397e857179f211092032482a2da4a7e2f5a659e4 /vp9/encoder/vp9_firstpass.c | |
| parent | b95ed6883a3ade47044fbf6b2ee6470f1bac53ed (diff) | |
| parent | 2f24ad9e85e4db0d9d5b265a6d4c1f4b7db6babb (diff) | |
| download | libvpx-bed59eb8de198ca9ab1230011e5a6d54d1c9765e.tar libvpx-bed59eb8de198ca9ab1230011e5a6d54d1c9765e.tar.gz libvpx-bed59eb8de198ca9ab1230011e5a6d54d1c9765e.tar.bz2 libvpx-bed59eb8de198ca9ab1230011e5a6d54d1c9765e.zip | |
Merge changes Ia82cef79,I7324a75a,I7b66daad,I73344451,I91dc210f,I5945b5ce into experimental
* changes:
Use alt-ref frame context for keyframes
Preserve the previous golden frame on golden updates
Generalize and increase frame coding contexts
Start to anonymize reference frames
Update encoder to use fb_idx_ref_cnt
Remove buffer-to-buffer copy logic
Diffstat (limited to 'vp9/encoder/vp9_firstpass.c')
| -rw-r--r-- | vp9/encoder/vp9_firstpass.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index db981754e..0a407dfdb 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -435,9 +435,11 @@ void vp9_first_pass(VP9_COMP *cpi) { MACROBLOCKD *const xd = &x->e_mbd; int recon_yoffset, recon_uvoffset; - YV12_BUFFER_CONFIG *lst_yv12 = &cm->yv12_fb[cm->lst_fb_idx]; + YV12_BUFFER_CONFIG *lst_yv12 = + &cm->yv12_fb[cm->active_ref_idx[cpi->lst_fb_idx]]; YV12_BUFFER_CONFIG *new_yv12 = &cm->yv12_fb[cm->new_fb_idx]; - YV12_BUFFER_CONFIG *gld_yv12 = &cm->yv12_fb[cm->gld_fb_idx]; + YV12_BUFFER_CONFIG *gld_yv12 = + &cm->yv12_fb[cm->active_ref_idx[cpi->gld_fb_idx]]; int recon_y_stride = lst_yv12->y_stride; int recon_uv_stride = lst_yv12->uv_stride; int64_t intra_error = 0; |