diff options
| author | Marco Nelissen <marcone@google.com> | 2014-10-09 19:38:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-09 19:38:40 +0000 |
| commit | f2ec103dc0583c3eef28e9d797ce2d791775b1ae (patch) | |
| tree | 7875aee4675e53fe069ad925bac977887159601a /include | |
| parent | 60dd0b8fc5fb0e20f110cb4d7eaacdfef17a684a (diff) | |
| parent | af238382e33a027494a53556e6104b7245e7213f (diff) | |
| download | frameworks_av-f2ec103dc0583c3eef28e9d797ce2d791775b1ae.zip frameworks_av-f2ec103dc0583c3eef28e9d797ce2d791775b1ae.tar.gz frameworks_av-f2ec103dc0583c3eef28e9d797ce2d791775b1ae.tar.bz2 | |
am af238382: Merge "Fix VideoFrame class layout for 64/32 bit" into lmp-dev
* commit 'af238382e33a027494a53556e6104b7245e7213f':
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 |