diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-16 14:44:54 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-08-16 14:44:55 -0700 |
| commit | b7ca7dc9652456181080bf28ec376bc5a36cf6a2 (patch) | |
| tree | d0ffc520e062cb00a3f847ef06756c1947a71d99 /media/libstagefright/codecs | |
| parent | 4f981882da8080e1d41d000bfbad92df61adcfba (diff) | |
| parent | f5af6314db25ff3bef9bd2eeba201bc6cc60805d (diff) | |
| download | frameworks_av-b7ca7dc9652456181080bf28ec376bc5a36cf6a2.zip frameworks_av-b7ca7dc9652456181080bf28ec376bc5a36cf6a2.tar.gz frameworks_av-b7ca7dc9652456181080bf28ec376bc5a36cf6a2.tar.bz2 | |
Merge "avcenc: Clarify the ifdefs surrounding inline assembly"
Diffstat (limited to 'media/libstagefright/codecs')
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 48923cf..3678329 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) |