Commit 17cf545e authored by Hui Su's avatar Hui Su Committed by Gerrit Code Review
Browse files

Merge "Call set_ref_ptrs only for inter blocks"

parents 54fb24aa cb79ea1c
...@@ -4155,8 +4155,6 @@ static void encode_superblock(VP9_COMP *cpi, ThreadData *td, ...@@ -4155,8 +4155,6 @@ static void encode_superblock(VP9_COMP *cpi, ThreadData *td,
if (x->skip_encode) if (x->skip_encode)
return; return;
set_ref_ptrs(cm, xd, mbmi->ref_frame[0], mbmi->ref_frame[1]);
if (!is_inter_block(mbmi)) { if (!is_inter_block(mbmi)) {
int plane; int plane;
mbmi->skip = 1; mbmi->skip = 1;
...@@ -4168,6 +4166,7 @@ static void encode_superblock(VP9_COMP *cpi, ThreadData *td, ...@@ -4168,6 +4166,7 @@ static void encode_superblock(VP9_COMP *cpi, ThreadData *td,
} else { } else {
int ref; int ref;
const int is_compound = has_second_ref(mbmi); 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) { for (ref = 0; ref < 1 + is_compound; ++ref) {
YV12_BUFFER_CONFIG *cfg = get_ref_frame_buffer(cpi, YV12_BUFFER_CONFIG *cfg = get_ref_frame_buffer(cpi,
mbmi->ref_frame[ref]); mbmi->ref_frame[ref]);
......
...@@ -4157,8 +4157,6 @@ static void encode_superblock(VP9_COMP *cpi, ThreadData *td, ...@@ -4157,8 +4157,6 @@ static void encode_superblock(VP9_COMP *cpi, ThreadData *td,
if (x->skip_encode) if (x->skip_encode)
return; return;
set_ref_ptrs(cm, xd, mbmi->ref_frame[0], mbmi->ref_frame[1]);
if (!is_inter_block(mbmi)) { if (!is_inter_block(mbmi)) {
int plane; int plane;
mbmi->skip = 1; mbmi->skip = 1;
...@@ -4170,6 +4168,7 @@ static void encode_superblock(VP9_COMP *cpi, ThreadData *td, ...@@ -4170,6 +4168,7 @@ static void encode_superblock(VP9_COMP *cpi, ThreadData *td,
} else { } else {
int ref; int ref;
const int is_compound = has_second_ref(mbmi); 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) { for (ref = 0; ref < 1 + is_compound; ++ref) {
YV12_BUFFER_CONFIG *cfg = get_ref_frame_buffer(cpi, YV12_BUFFER_CONFIG *cfg = get_ref_frame_buffer(cpi,
mbmi->ref_frame[ref]); mbmi->ref_frame[ref]);
......
Supports Markdown
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