diff options
| author | Johann <johannkoenig@google.com> | 2014-06-19 15:14:19 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-06-19 15:14:19 -0700 |
| commit | 8a78dc491157ec8da8a63c95a9062094c6a6148c (patch) | |
| tree | 6ba20270c6faef9536efeabd4982aa1728b2dd86 | |
| parent | ab9755f3af72addd8545db091fa7f36e368dc7fd (diff) | |
| parent | fec6886f2cb29bc58395fa4d5399cd193eae0f52 (diff) | |
| download | libvpx-8a78dc491157ec8da8a63c95a9062094c6a6148c.tar libvpx-8a78dc491157ec8da8a63c95a9062094c6a6148c.tar.gz libvpx-8a78dc491157ec8da8a63c95a9062094c6a6148c.tar.bz2 libvpx-8a78dc491157ec8da8a63c95a9062094c6a6148c.zip | |
Merge "Remove labels from quantize"
| -rw-r--r-- | vp8/encoder/x86/quantize_sse2.c | 3 | ||||
| -rw-r--r-- | vp8/encoder/x86/quantize_sse4.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/vp8/encoder/x86/quantize_sse2.c b/vp8/encoder/x86/quantize_sse2.c index f495bf287..291d21992 100644 --- a/vp8/encoder/x86/quantize_sse2.c +++ b/vp8/encoder/x86/quantize_sse2.c @@ -26,11 +26,10 @@ int cmp = (x[z] < boost) | (y[z] == 0); \ zbin_boost_ptr++; \ if (cmp) \ - goto select_eob_end_##i; \ + break; \ qcoeff_ptr[z] = y[z]; \ eob = i; \ zbin_boost_ptr = b->zrun_zbin_boost; \ - select_eob_end_##i:; \ } while (0) void vp8_regular_quantize_b_sse2(BLOCK *b, BLOCKD *d) diff --git a/vp8/encoder/x86/quantize_sse4.c b/vp8/encoder/x86/quantize_sse4.c index b2fecfd2f..601dd23a2 100644 --- a/vp8/encoder/x86/quantize_sse4.c +++ b/vp8/encoder/x86/quantize_sse4.c @@ -17,18 +17,16 @@ #define SELECT_EOB(i, z, x, y, q) \ do { \ - __label__ select_eob_end; \ short boost = *zbin_boost_ptr; \ short x_z = _mm_extract_epi16(x, z); \ short y_z = _mm_extract_epi16(y, z); \ int cmp = (x_z < boost) | (y_z == 0); \ zbin_boost_ptr++; \ if (cmp) \ - goto select_eob_end; \ + break; \ q = _mm_insert_epi16(q, y_z, z); \ eob = i; \ zbin_boost_ptr = b->zrun_zbin_boost; \ - select_eob_end:; \ } while (0) void vp8_regular_quantize_b_sse4_1(BLOCK *b, BLOCKD *d) { |