ref: 7f7c888c147c19ae07c31229c78351d9c3bd821f
parent: b757d89ff93492da129726ee3ed6411473bffb26
parent: 70a7885a655c902be5eb979966ae66171bcd0900
author: James Zern <jzern@google.com>
date: Thu Aug 4 18:19:30 EDT 2016
Merge "correct break placement"
--- a/vp9/common/mips/dspr2/vp9_itrans16_dspr2.c
+++ b/vp9/common/mips/dspr2/vp9_itrans16_dspr2.c
@@ -68,7 +68,8 @@
for (j = 0; j < 16; ++j) temp_in[j * 16 + i] = out[i * 16 + j];
idct16_cols_add_blk_dspr2(temp_in, dest, pitch);
- } break;
+ break;
+ }
case ADST_ADST: // ADST in both directions
{
int16_t temp_in[16];
@@ -89,7 +90,8 @@
dest[j * pitch + i] = clip_pixel(ROUND_POWER_OF_TWO(temp_out[j], 6) +
dest[j * pitch + i]);
}
- } break;
+ break;
+ }
default: printf("vp9_short_iht16x16_add_dspr2 : Invalid tx_type\n"); break;
}
}
--- a/vpx_dsp/mips/convolve8_dspr2.c
+++ b/vpx_dsp/mips/convolve8_dspr2.c
@@ -1424,7 +1424,8 @@
src += src_stride;
dst += dst_stride;
}
- } break;
+ break;
+ }
case 8: {
uint32_t tp1, tp2;
@@ -1446,7 +1447,8 @@
src += src_stride;
dst += dst_stride;
}
- } break;
+ break;
+ }
case 16: {
uint32_t tp1, tp2, tp3, tp4;
@@ -1474,7 +1476,8 @@
src += src_stride;
dst += dst_stride;
}
- } break;
+ break;
+ }
case 32: {
uint32_t tp1, tp2, tp3, tp4;
uint32_t tp5, tp6, tp7, tp8;
@@ -1512,7 +1515,8 @@
src += src_stride;
dst += dst_stride;
}
- } break;
+ break;
+ }
case 64: {
uint32_t tp1, tp2, tp3, tp4;
uint32_t tp5, tp6, tp7, tp8;
@@ -1573,7 +1577,8 @@
src += src_stride;
dst += dst_stride;
}
- } break;
+ break;
+ }
default:
for (y = h; y--;) {
for (x = 0; x < w; ++x) {