diff options
| author | Marcus Oakland <marcus.oakland@arm.com> | 2014-03-25 17:53:43 +0000 |
|---|---|---|
| committer | Glenn Kasten <gkasten@android.com> | 2014-04-02 11:20:01 -0700 |
| commit | 849de60c1eae2ec28f0b468b9ec16b339aad17e9 (patch) | |
| tree | ce7a9111860222c7497afb5e280c110607a1fe7d | |
| parent | 17b5ca1e665a1bbe17387b36fcce8f6b52513d5e (diff) | |
| download | native-849de60c1eae2ec28f0b468b9ec16b339aad17e9.tar.gz | |
AArch64: Correction to OMX_U32 and OMX_S32
The types of OMX_U32 and OMX_S32 were appropriate to a 32-bit system
but were not appropriate to a 64-bit system. They have been changed to
make them portable between the two systems. With this change and a
change to frameworks/av/media/libstagefright/foundation/AString.cpp,
the android.media.cts.DecoderTest#testFlush CTS test passes.
Change-Id: I8e16c7169f54599c23fea71585b531e48541c78a
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
| -rw-r--r-- | include/media/openmax/OMX_Types.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/media/openmax/OMX_Types.h b/include/media/openmax/OMX_Types.h index 03fd4bcf50..9dec372c9d 100644 --- a/include/media/openmax/OMX_Types.h +++ b/include/media/openmax/OMX_Types.h @@ -48,6 +48,8 @@ #ifndef OMX_Types_h #define OMX_Types_h +#include <stdint.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -160,10 +162,10 @@ typedef unsigned short OMX_U16; typedef signed short OMX_S16; /** OMX_U32 is a 32 bit unsigned quantity that is 32 bit word aligned */ -typedef unsigned long OMX_U32; +typedef uint32_t OMX_U32; /** OMX_S32 is a 32 bit signed quantity that is 32 bit word aligned */ -typedef signed long OMX_S32; +typedef int32_t OMX_S32; /* Users with compilers that cannot accept the "long long" designation should |