diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2013-04-23 10:22:13 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-04-23 10:22:13 -0700 |
| commit | e3167b8c238a96c1c38a9bed95a24787700b2522 (patch) | |
| tree | 8445c35e75bfdf63983cad87b0150852d82daae7 /vp9/common | |
| parent | 0defc2ddb3518f5395acf446fc0861dd1a4b5050 (diff) | |
| parent | 9662531d77d6a47e7d7cdc6b0c5d9f3388507c8f (diff) | |
| download | libvpx-e3167b8c238a96c1c38a9bed95a24787700b2522.tar libvpx-e3167b8c238a96c1c38a9bed95a24787700b2522.tar.gz libvpx-e3167b8c238a96c1c38a9bed95a24787700b2522.tar.bz2 libvpx-e3167b8c238a96c1c38a9bed95a24787700b2522.zip | |
Merge "Eliminated prev_mip memsets/memcpys" into experimental
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_alloccommon.c | 3 | ||||
| -rw-r--r-- | vp9/common/vp9_entropymode.c | 3 | ||||
| -rw-r--r-- | vp9/common/vp9_onyxc_int.h | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/vp9/common/vp9_alloccommon.c b/vp9/common/vp9_alloccommon.c index e142362b2..8d75c4db0 100644 --- a/vp9/common/vp9_alloccommon.c +++ b/vp9/common/vp9_alloccommon.c @@ -137,9 +137,6 @@ int vp9_alloc_frame_buffers(VP9_COMMON *oci, int width, int height) { return 1; } - vp9_update_mode_info_border(oci, oci->mip); - vp9_update_mode_info_in_image(oci, oci->mi); - return 0; } diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c index f19dc12d3..9cb1d2b86 100644 --- a/vp9/common/vp9_entropymode.c +++ b/vp9/common/vp9_entropymode.c @@ -718,6 +718,9 @@ void vp9_setup_past_independence(VP9_COMMON *cm, MACROBLOCKD *xd) { vp9_update_mode_info_border(cm, cm->mip); vp9_update_mode_info_in_image(cm, cm->mi); + vp9_update_mode_info_border(cm, cm->prev_mip); + vp9_update_mode_info_in_image(cm, cm->prev_mi); + cm->ref_frame_sign_bias[GOLDEN_FRAME] = 0; cm->ref_frame_sign_bias[ALTREF_FRAME] = 0; diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index 8f957345d..f9d02e3ca 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h @@ -196,6 +196,7 @@ typedef struct VP9Common { FRAME_TYPE frame_type; int show_frame; + int last_show_frame; int frame_flags; int MBs; |