From 849de60c1eae2ec28f0b468b9ec16b339aad17e9 Mon Sep 17 00:00:00 2001 From: Marcus Oakland Date: Tue, 25 Mar 2014 17:53:43 +0000 Subject: [PATCH] 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 --- include/media/openmax/OMX_Types.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/media/openmax/OMX_Types.h b/include/media/openmax/OMX_Types.h index 03fd4bcf5..9dec372c9 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 + #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