ref: f6176a73a20b07e6388cc8526d8eb23d434dc1e7
parent: ee8920732d1b1446799c5cb9195cfcb2df1fefe8
parent: e674cfcb055a8b69afce697e4419649bcab7523f
author: Jerome Jiang <jianj@google.com>
date: Tue Nov 6 13:47:16 EST 2018
Merge "vp8 dec: only compute ref frame buffer pointer for non intra"
--- a/vp8/decoder/threading.c
+++ b/vp8/decoder/threading.c
@@ -415,13 +415,17 @@
"Corrupted reference frame");
}
- xd->pre.y_buffer =
- ref_buffer[xd->mode_info_context->mbmi.ref_frame][0] + recon_yoffset;
- xd->pre.u_buffer =
- ref_buffer[xd->mode_info_context->mbmi.ref_frame][1] + recon_uvoffset;
- xd->pre.v_buffer =
- ref_buffer[xd->mode_info_context->mbmi.ref_frame][2] + recon_uvoffset;
-
+ if (xd->mode_info_context->mbmi.ref_frame >= LAST_FRAME) {
+ const MV_REFERENCE_FRAME ref = xd->mode_info_context->mbmi.ref_frame;
+ xd->pre.y_buffer = ref_buffer[ref][0] + recon_yoffset;
+ xd->pre.u_buffer = ref_buffer[ref][1] + recon_uvoffset;
+ xd->pre.v_buffer = ref_buffer[ref][2] + recon_uvoffset;
+ } else {
+ // ref_frame is INTRA_FRAME, pre buffer should not be used.
+ xd->pre.y_buffer = 0;
+ xd->pre.u_buffer = 0;
+ xd->pre.v_buffer = 0;
+ }
mt_decode_macroblock(pbi, xd, 0);
xd->left_available = 1;