diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-29 14:24:52 -0800 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-02-29 14:24:52 -0800 |
| commit | 9f422f59fcb74283fa52c3bfd0a2665ec9ce9e10 (patch) | |
| tree | f5fe8c26eca24674c88df28f57e2d6b8b3d9c78b /media/libstagefright/codecs/aacenc/basic_op/typedefs.h | |
| parent | de99ee3d507bf1284fdb5d6b84a32f4227f16a6f (diff) | |
| parent | b8576d5ae50294bb1917b84f366054ebff02a3a6 (diff) | |
| download | frameworks_av-9f422f59fcb74283fa52c3bfd0a2665ec9ce9e10.zip frameworks_av-9f422f59fcb74283fa52c3bfd0a2665ec9ce9e10.tar.gz frameworks_av-9f422f59fcb74283fa52c3bfd0a2665ec9ce9e10.tar.bz2 | |
Merge changes I46c81dba,If1f40e9c,I652eaaa5
* changes:
stagefright aacenc: Use QDADD/QDSUB instructions
stagefright aacenc: Remove useless inline asm for simple right shift
stagefright aacenc: Use ARMv6 SSAT instruction
Diffstat (limited to 'media/libstagefright/codecs/aacenc/basic_op/typedefs.h')
| -rw-r--r-- | media/libstagefright/codecs/aacenc/basic_op/typedefs.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/aacenc/basic_op/typedefs.h b/media/libstagefright/codecs/aacenc/basic_op/typedefs.h index 8ef43e2..6059237 100644 --- a/media/libstagefright/codecs/aacenc/basic_op/typedefs.h +++ b/media/libstagefright/codecs/aacenc/basic_op/typedefs.h @@ -128,6 +128,13 @@ typedef unsigned __int64 UWord64; #define ARMV5TE_NORM_L 1 #define ARMV5TE_L_MPY_LS 1 #endif +#if ARMV6_INASM + #undef ARMV5TE_ADD + #define ARMV5TE_ADD 0 + #undef ARMV5TE_SUB + #define ARMV5TE_SUB 0 + #define ARMV6_SAT 1 +#endif //basic operation functions optimization flags #define SATRUATE_IS_INLINE 1 //define saturate as inline function |