diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-16 15:31:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-16 15:31:18 -0700 |
| commit | 1a42aee5e1e975158da4754f9bae46c945e27281 (patch) | |
| tree | a53726fd44407323ef9cb2adcb8913d78c4143c8 /media | |
| parent | 9bd763d1d3b7dcb30320aa70597680a53ffb5bbf (diff) | |
| parent | a109e9d5d5dbdbbd63a3f32fce131c718f0f8c99 (diff) | |
| download | frameworks_av-1a42aee5e1e975158da4754f9bae46c945e27281.zip frameworks_av-1a42aee5e1e975158da4754f9bae46c945e27281.tar.gz frameworks_av-1a42aee5e1e975158da4754f9bae46c945e27281.tar.bz2 | |
am a109e9d5: am b7ca7dc9: Merge "avcenc: Clarify the ifdefs surrounding inline assembly"
* commit 'a109e9d5d5dbdbbd63a3f32fce131c718f0f8c99':
avcenc: Clarify the ifdefs surrounding inline assembly
Diffstat (limited to 'media')
4 files changed, 12 insertions, 4 deletions
diff --git a/media/libstagefright/codecs/avc/enc/Android.mk b/media/libstagefright/codecs/avc/enc/Android.mk index 0aecfa8..d9ebdf5 100644 --- a/media/libstagefright/codecs/avc/enc/Android.mk +++ b/media/libstagefright/codecs/avc/enc/Android.mk @@ -28,7 +28,6 @@ LOCAL_C_INCLUDES := \ $(TOP)/frameworks/native/include/media/openmax LOCAL_CFLAGS := \ - -D__arm__ \ -DOSCL_IMPORT_REF= -DOSCL_UNUSED_ARG= -DOSCL_EXPORT_REF= include $(BUILD_STATIC_LIBRARY) diff --git a/media/libstagefright/codecs/avc/enc/src/sad_halfpel_inline.h b/media/libstagefright/codecs/avc/enc/src/sad_halfpel_inline.h index 3a21647..bb4a510 100644 --- a/media/libstagefright/codecs/avc/enc/src/sad_halfpel_inline.h +++ b/media/libstagefright/codecs/avc/enc/src/sad_halfpel_inline.h @@ -24,7 +24,10 @@ extern "C" { #endif -#if defined(__GNUC__) && defined(__arm__) /* ARM GNU COMPILER */ +/* Intentionally not using the gcc asm version, since it (if fixed so + * as to not crash - the current register constraints are faulty) is + * slightly slower than the plain C version on modern GCC versions. */ +#if !defined(__CC_ARM) /* Generic C version */ __inline int32 INTERP1_SUB_SAD(int32 sad, int32 tmp, int32 tmp2) { diff --git a/media/libstagefright/codecs/avc/enc/src/sad_inline.h b/media/libstagefright/codecs/avc/enc/src/sad_inline.h index 3f18483..f6c3554 100644 --- a/media/libstagefright/codecs/avc/enc/src/sad_inline.h +++ b/media/libstagefright/codecs/avc/enc/src/sad_inline.h @@ -23,7 +23,10 @@ extern "C" { #endif -#if defined(__GNUC__) && defined(__arm__) /* ARM GNU COMPILER */ +/* Intentionally not using the gcc asm version, since it (if fixed so + * as to not crash - the current register constraints are faulty) is + * slightly slower than the plain C version on modern GCC versions. */ +#if !defined(__CC_ARM) /* Generic C version */ __inline int32 SUB_SAD(int32 sad, int32 tmp, int32 tmp2) { diff --git a/media/libstagefright/codecs/avc/enc/src/sad_mb_offset.h b/media/libstagefright/codecs/avc/enc/src/sad_mb_offset.h index 5bc5c86..8a7fe22 100644 --- a/media/libstagefright/codecs/avc/enc/src/sad_mb_offset.h +++ b/media/libstagefright/codecs/avc/enc/src/sad_mb_offset.h @@ -16,7 +16,10 @@ * ------------------------------------------------------------------- */ -#if defined(__GNUC__) && defined(__arm__) /* ARM GNU COMPILER */ +/* Intentionally not using the gcc asm version, since it (if fixed so + * as to not crash - the current register constraints are faulty) is + * slightly slower than the plain C version on modern GCC versions. */ +#if !defined(__CC_ARM) /* Generic C version */ #if (NUMBER==3) __inline int32 sad_mb_offset3(uint8 *ref, uint8 *blk, int lx, int dmin) |