Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8d8bce2 authored by Andy Hung's avatar Andy Hung Committed by Android Git Automerger
Browse files

am 67072a8a: am 913efd2b: Merge "h264dec: Use intptr_t when a pointer is treated as an integer" 

* commit '67072a8a':
  h264dec: Use intptr_t when a pointer is treated as an integer
parents f9e3617a 67072a8a

media/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM.h

+3 −3
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ typedef OMX_S16 ARM_BLOCK8x8[64]; 


/* Alignment operation */



#define armAlignToBytes(Ptr,N)      (Ptr + ( ((N-(int)Ptr)&(N-1)) / sizeof(*Ptr) ))

#define armAlignToBytes(Ptr,N)      (Ptr + ( ((N-(intptr_t)Ptr)&(N-1)) / sizeof(*Ptr) ))

#define armAlignTo2Bytes(Ptr)       armAlignToBytes(Ptr,2)

#define armAlignTo4Bytes(Ptr)       armAlignToBytes(Ptr,4)

#define armAlignTo8Bytes(Ptr)       armAlignToBytes(Ptr,8)
@@ -98,8 +98,8 @@ typedef OMX_S16 ARM_BLOCK8x8[64]; 
#define armRetDataErrIf(condition, code) if(condition) { return (code); }



#ifndef ALIGNMENT_DOESNT_MATTER

#define armIsByteAligned(Ptr,N)     ((((int)(Ptr)) % N)==0)

#define armNotByteAligned(Ptr,N)    ((((int)(Ptr)) % N)!=0)

#define armIsByteAligned(Ptr,N)     ((((intptr_t)(Ptr)) % N)==0)

#define armNotByteAligned(Ptr,N)    ((((intptr_t)(Ptr)) % N)!=0)

#else

#define armIsByteAligned(Ptr,N)     (1)

#define armNotByteAligned(Ptr,N)    (0)

media/libstagefright/codecs/on2/h264dec/omxdl/reference/api/armCOMM.h

+3 −3
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ typedef OMX_S16 ARM_BLOCK8x8[64]; 


/* Alignment operation */



#define armAlignToBytes(Ptr,N)      (Ptr + ( ((N-(int)Ptr)&(N-1)) / sizeof(*Ptr) ))

#define armAlignToBytes(Ptr,N)      (Ptr + ( ((N-(intptr_t)Ptr)&(N-1)) / sizeof(*Ptr) ))

#define armAlignTo2Bytes(Ptr)       armAlignToBytes(Ptr,2)

#define armAlignTo4Bytes(Ptr)       armAlignToBytes(Ptr,4)

#define armAlignTo8Bytes(Ptr)       armAlignToBytes(Ptr,8)
@@ -98,8 +98,8 @@ typedef OMX_S16 ARM_BLOCK8x8[64]; 
#define armRetDataErrIf(condition, code) if(condition) { return (code); }



#ifndef ALIGNMENT_DOESNT_MATTER

#define armIsByteAligned(Ptr,N)     ((((int)(Ptr)) % N)==0)

#define armNotByteAligned(Ptr,N)    ((((int)(Ptr)) % N)!=0)

#define armIsByteAligned(Ptr,N)     ((((intptr_t)(Ptr)) % N)==0)

#define armNotByteAligned(Ptr,N)    ((((intptr_t)(Ptr)) % N)!=0)

#else

#define armIsByteAligned(Ptr,N)     (1)

#define armNotByteAligned(Ptr,N)    (0)