ref: 719cd35f3ac798bc7387f9d012877e4a50d3f67a
parent: 2855d8aea1c8ac74f7459d2086c778227ff2ca14
parent: 646edbc1b21773f1b5be0928da00b9b363fa9054
author: Adrian Grange <agrange@google.com>
date: Tue Jul 23 11:00:06 EDT 2013
Merge "Rolled-up several for loops into one"
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -2411,29 +2411,19 @@
int count16x16_16x16p = 0, count16x16_lp = 0;
int count32x32 = 0;
- for (i = 0; i < TX_SIZE_CONTEXTS; i++)
+ for (i = 0; i < TX_SIZE_CONTEXTS; ++i) {
count4x4 += cm->fc.tx_counts.p32x32[i][TX_4X4];
- for (i = 0; i < TX_SIZE_CONTEXTS; i++)
count4x4 += cm->fc.tx_counts.p16x16[i][TX_4X4];
- for (i = 0; i < TX_SIZE_CONTEXTS; i++)
count4x4 += cm->fc.tx_counts.p8x8[i][TX_4X4];
- for (i = 0; i < TX_SIZE_CONTEXTS; i++)
count8x8_lp += cm->fc.tx_counts.p32x32[i][TX_8X8];
- for (i = 0; i < TX_SIZE_CONTEXTS; i++)
count8x8_lp += cm->fc.tx_counts.p16x16[i][TX_8X8];
-
- for (i = 0; i < TX_SIZE_CONTEXTS; i++)
count8x8_8x8p += cm->fc.tx_counts.p8x8[i][TX_8X8];
- for (i = 0; i < TX_SIZE_CONTEXTS; i++)
count16x16_16x16p += cm->fc.tx_counts.p16x16[i][TX_16X16];
-
- for (i = 0; i < TX_SIZE_CONTEXTS; i++)
count16x16_lp += cm->fc.tx_counts.p32x32[i][TX_16X16];
-
- for (i = 0; i < TX_SIZE_CONTEXTS; i++)
count32x32 += cm->fc.tx_counts.p32x32[i][TX_32X32];
+ }
if (count4x4 == 0 && count16x16_lp == 0 && count16x16_16x16p == 0
&& count32x32 == 0) {
--
⑨