summaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_encodeframe.c
diff options
context:
space:
mode:
authorAdrian Grange <agrange@google.com>2013-07-23 15:00:06 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2013-07-23 15:00:06 -0700
commit719cd35f3ac798bc7387f9d012877e4a50d3f67a (patch)
treec1eee1c588aab22b76c75bca84aef6645c98cac8 /vp9/encoder/vp9_encodeframe.c
parent2855d8aea1c8ac74f7459d2086c778227ff2ca14 (diff)
parent646edbc1b21773f1b5be0928da00b9b363fa9054 (diff)
downloadlibvpx-719cd35f3ac798bc7387f9d012877e4a50d3f67a.tar
libvpx-719cd35f3ac798bc7387f9d012877e4a50d3f67a.tar.gz
libvpx-719cd35f3ac798bc7387f9d012877e4a50d3f67a.tar.bz2
libvpx-719cd35f3ac798bc7387f9d012877e4a50d3f67a.zip
Merge "Rolled-up several for loops into one"
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
-rw-r--r--vp9/encoder/vp9_encodeframe.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 47c198498..88d0b01c8 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -2411,29 +2411,19 @@ void vp9_encode_frame(VP9_COMP *cpi) {
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) {