From cb79ea1c16a210306e7d400bfea2e89d667f611b Mon Sep 17 00:00:00 2001 From: hui su Date: Wed, 12 Aug 2015 10:57:07 -0700 Subject: [PATCH] Call set_ref_ptrs only for inter blocks In encode_superblock, call set_ref_ptrs only for inter blocks. Change-Id: I27545c0e3e679e1838b78d7c9d01fe5a4d3cc0fb --- vp10/encoder/encodeframe.c | 3 +-- vp9/encoder/vp9_encodeframe.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/vp10/encoder/encodeframe.c b/vp10/encoder/encodeframe.c index 9d07840..146da6f 100644 --- a/vp10/encoder/encodeframe.c +++ b/vp10/encoder/encodeframe.c @@ -4155,8 +4155,6 @@ static void encode_superblock(VP9_COMP *cpi, ThreadData *td, if (x->skip_encode) return; - set_ref_ptrs(cm, xd, mbmi->ref_frame[0], mbmi->ref_frame[1]); - if (!is_inter_block(mbmi)) { int plane; mbmi->skip = 1; @@ -4168,6 +4166,7 @@ static void encode_superblock(VP9_COMP *cpi, ThreadData *td, } else { int ref; const int is_compound = has_second_ref(mbmi); + set_ref_ptrs(cm, xd, mbmi->ref_frame[0], mbmi->ref_frame[1]); for (ref = 0; ref < 1 + is_compound; ++ref) { YV12_BUFFER_CONFIG *cfg = get_ref_frame_buffer(cpi, mbmi->ref_frame[ref]); diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 0fd1cd3..5c12dc4 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -4157,8 +4157,6 @@ static void encode_superblock(VP9_COMP *cpi, ThreadData *td, if (x->skip_encode) return; - set_ref_ptrs(cm, xd, mbmi->ref_frame[0], mbmi->ref_frame[1]); - if (!is_inter_block(mbmi)) { int plane; mbmi->skip = 1; @@ -4170,6 +4168,7 @@ static void encode_superblock(VP9_COMP *cpi, ThreadData *td, } else { int ref; const int is_compound = has_second_ref(mbmi); + set_ref_ptrs(cm, xd, mbmi->ref_frame[0], mbmi->ref_frame[1]); for (ref = 0; ref < 1 + is_compound; ++ref) { YV12_BUFFER_CONFIG *cfg = get_ref_frame_buffer(cpi, mbmi->ref_frame[ref]); -- 2.7.4