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

Commit 6c7fbb3f authored by Marco Nelissen's avatar Marco Nelissen Committed by The Android Automerger
Browse files

Fix VideoFrame class layout for 64/32 bit 

This structure is passed between 64 and 32 bit processes via shared
memory, so ensure it's the same size, and that the members we care
about are in the same place.

Bug: 17569156
Change-Id: Id776bc825af1fbf43a6dd3407cca064f6d932902
parent 7a15279e

include/private/media/VideoFrame.h

+4 −1
Original line number Diff line number Diff line
@@ -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