Merge "Fix in token allocation with zerogroup expt" into experimental

0e905e03 · Deb Mukherjee · Gerrit Code Review · 27bb4777 · 64e7f017 · 0e905e03
Commit 0e905e03 authored Apr 24, 2013 by Deb Mukherjee Committed by Gerrit Code Review Apr 24, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

vp9/common/vp9_onyxc_int.h vp9/common/vp9_onyxc_int.h +4 -0

No files found.
--- a/vp9/common/vp9_onyxc_int.h
+++ b/vp9/common/vp9_onyxc_int.h
@@ -362,6 +362,10 @@ static int get_mb_col(const MACROBLOCKD *xd) {
 }

 static int get_token_alloc(int mb_rows, int mb_cols) {
+#if CONFIG_CODE_ZEROGROUP
+  return mb_rows * mb_cols * (24 * 16 * 2);
+#else
  return mb_rows * mb_cols * (24 * 16 + 4);
+#endif
 }
 #endif  // VP9_COMMON_VP9_ONYXC_INT_H_