diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2010-12-14 19:07:50 +0800 |
|---|---|---|
| committer | Chia-chi Yeh <chiachi@android.com> | 2010-12-14 19:07:50 +0800 |
| commit | 6ead6aed9ef9420c6d4c5efd170d5ab502e337e5 (patch) | |
| tree | d0e19efbf3eb108c0a52154cf19a89cf92a7ea06 | |
| parent | 4736a38e2514bfe50b0241d2053befea82822944 (diff) | |
| download | jpeg-6ead6aed9ef9420c6d4c5efd170d5ab502e337e5.tar.gz | |
libjpeg: Make both JDCT_IFAST and JDCT_ISLOW use armv6_idct.
Change-Id: Iae9c402ec7e1c6b078f404fec995162c8091f383
| -rw-r--r-- | jddctmgr.c | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -144,6 +144,13 @@ start_pass (j_decompress_ptr cinfo) #endif case DCTSIZE: switch (cinfo->dct_method) { +#ifdef ANDROID_ARMV6_IDCT + case JDCT_ISLOW: + case JDCT_IFAST: + method_ptr = jpeg_idct_armv6; + method = JDCT_IFAST; + break; +#else /* ANDROID_ARMV6_IDCT */ #ifdef DCT_ISLOW_SUPPORTED case JDCT_ISLOW: method_ptr = jpeg_idct_islow; @@ -152,14 +159,11 @@ start_pass (j_decompress_ptr cinfo) #endif #ifdef DCT_IFAST_SUPPORTED case JDCT_IFAST: -#ifdef ANDROID_ARMV6_IDCT - method_ptr = jpeg_idct_armv6; -#else method_ptr = jpeg_idct_ifast; -#endif method = JDCT_IFAST; break; #endif +#endif /* ANDROID_ARMV6_IDCT */ #ifdef DCT_FLOAT_SUPPORTED case JDCT_FLOAT: method_ptr = jpeg_idct_float; @@ -233,7 +237,7 @@ start_pass (j_decompress_ptr cinfo) int j = ((i & 7) << 3) + orders[i >> 3]; ifmtbl[j] = (qtbl->quantval[i] * scales[i] + 2) >> 2; } -#else +#else /* ANDROID_ARMV6_IDCT */ #define CONST_BITS 14 static const INT16 aanscales[DCTSIZE2] = { @@ -255,7 +259,7 @@ start_pass (j_decompress_ptr cinfo) (INT32) aanscales[i]), CONST_BITS-IFAST_SCALE_BITS); } -#endif +#endif /* ANDROID_ARMV6_IDCT */ } break; #endif |