diff options
author | Marco Nelissen <marcone@google.com> | 2014-10-10 17:14:08 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-10 17:14:08 +0000 |
commit | 3d54bda88e5c0e251c93367c81a316859cc17c1e (patch) | |
tree | 519bc4c4546d53d53050630e01c04878884bec88 /include | |
parent | c0db452b030b4e169a3c539847ccba424ba39c81 (diff) | |
parent | bd15f216197c1866f0a20d7a4af3eabb9edf6261 (diff) | |
download | frameworks_av-3d54bda88e5c0e251c93367c81a316859cc17c1e.zip frameworks_av-3d54bda88e5c0e251c93367c81a316859cc17c1e.tar.gz frameworks_av-3d54bda88e5c0e251c93367c81a316859cc17c1e.tar.bz2 |
am bd15f216: am feea7c3b: am af238382: Merge "Fix VideoFrame class layout for 64/32 bit" into lmp-dev
* commit 'bd15f216197c1866f0a20d7a4af3eabb9edf6261':
Fix VideoFrame class layout for 64/32 bit
Diffstat (limited to 'include')
-rw-r--r-- | include/private/media/VideoFrame.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/private/media/VideoFrame.h b/include/private/media/VideoFrame.h index 5dd425b..5193d00 100644 --- a/include/private/media/VideoFrame.h +++ b/include/private/media/VideoFrame.h @@ -63,8 +63,11 @@ public: uint32_t mDisplayWidth; uint32_t mDisplayHeight; uint32_t mSize; // Number of bytes in mData + int32_t mRotationAngle; // rotation angle, clockwise, should be multiple of 90 + // mData should be 64 bit aligned to prevent additional padding uint8_t* mData; // Actual binary data - int32_t mRotationAngle; // rotation angle, clockwise + // pad structure so it's the same size on 64 bit and 32 bit + char mPadding[8 - sizeof(mData)]; }; }; // namespace android |