Commit 83eff950 authored by Jim Bankoski's avatar Jim Bankoski Committed by Gerrit Code Review
Browse files

Merge "vp9_rdopt.c : signed unsigned mismatch in choose_tx_size"

parents 0cb31c72 f274ac7d
...@@ -507,7 +507,7 @@ static void choose_tx_size_from_rd(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -507,7 +507,7 @@ static void choose_tx_size_from_rd(VP9_COMP *cpi, MACROBLOCK *x,
cpi->sf.use_fast_coef_costing); cpi->sf.use_fast_coef_costing);
r[n][1] = r[n][0]; r[n][1] = r[n][0];
if (r[n][0] < INT_MAX) { if (r[n][0] < INT_MAX) {
for (m = 0; m <= n - (n == max_tx_size); m++) { for (m = 0; m <= n - (n == (int) max_tx_size); m++) {
if (m == n) if (m == n)
r[n][1] += vp9_cost_zero(tx_probs[m]); r[n][1] += vp9_cost_zero(tx_probs[m]);
else else
...@@ -526,7 +526,7 @@ static void choose_tx_size_from_rd(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -526,7 +526,7 @@ static void choose_tx_size_from_rd(VP9_COMP *cpi, MACROBLOCK *x,
// Early termination in transform size search. // Early termination in transform size search.
if (cpi->sf.tx_size_search_breakout && if (cpi->sf.tx_size_search_breakout &&
(rd[n][1] == INT64_MAX || (rd[n][1] == INT64_MAX ||
(n < max_tx_size && rd[n][1] > rd[n + 1][1]) || (n < (int) max_tx_size && rd[n][1] > rd[n + 1][1]) ||
s[n] == 1)) s[n] == 1))
break; break;
......
Markdown is supported
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