ref: d72ed35374db9956a274a816c1228a8d99adedbd
parent: 12cb30d4bd0e08d9bcca632e21f13c7a20d9ce17
parent: 73c8fe5deb43e4d3fb793927a679c6997d72c4d9
author: hkuang <hkuang@google.com>
date: Thu Apr 2 17:35:12 EDT 2015
Merge "Fix error of "Left shift of negative value -1"."
--- a/vp9/decoder/vp9_decodeframe.c
+++ b/vp9/decoder/vp9_decodeframe.c
@@ -1926,7 +1926,7 @@
// pixels of each superblock row can be changed by next superblock row.
if (pbi->frame_parallel_decode)
vp9_frameworker_wait(pbi->frame_worker_owner, ref_frame_buf,
- MAX(0, (y1 + 7) << (plane == 0 ? 0 : 1)));
+ MAX(0, (y1 + 7)) << (plane == 0 ? 0 : 1));
// Skip border extension if block is inside the frame.
if (x0 < 0 || x0 > frame_width - 1 || x1 < 0 || x1 > frame_width - 1 ||
@@ -1982,7 +1982,7 @@
// pixels of each superblock row can be changed by next superblock row.
if (pbi->frame_parallel_decode)
vp9_frameworker_wait(pbi->frame_worker_owner, ref_frame_buf,
- MAX(0, (y1 + 7) << (plane == 0 ? 0 : 1)));
+ MAX(0, (y1 + 7)) << (plane == 0 ? 0 : 1));
}
#if CONFIG_VP9_HIGHBITDEPTH
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {--
⑨