ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am a6364e25: am f892f914: Merge "omx: fix structure sizes to be the same on 32 and 64-bit builds" into mnc-dev

Browse Source 
* commit 'a6364e257d6b0be3c94819cd16fffa2d4d7c8150':
  omx: fix structure sizes to be the same on 32 and 64-bit builds
This commit is contained in:
Lajos Molnar 2015-07-21 00:50:04 +00:00 committed by Android Git Automerger
commit b3ca8b29dd
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/media/hardware/HardwareAPI.h
View File

@ -100,7 +100,11 @@ struct StoreMetaDataInBuffersParams {
// dynamic buffer handling. // dynamic buffer handling.
struct VideoGrallocMetadata { struct VideoGrallocMetadata {
MetadataBufferType eType; // must be kMetadataBufferTypeGrallocSource MetadataBufferType eType; // must be kMetadataBufferTypeGrallocSource
#ifdef OMX_ANDROID_COMPILE_AS_32BIT_ON_64BIT_PLATFORMS
OMX_PTR pHandle;
#else
buffer_handle_t pHandle; buffer_handle_t pHandle;
#endif
}; };
// Legacy name for VideoGrallocMetadata struct. // Legacy name for VideoGrallocMetadata struct.
@ -108,7 +112,11 @@ struct VideoDecoderOutputMetaData : public VideoGrallocMetadata {};
struct VideoNativeMetadata { struct VideoNativeMetadata {
MetadataBufferType eType; // must be kMetadataBufferTypeANWBuffer MetadataBufferType eType; // must be kMetadataBufferTypeANWBuffer
#ifdef OMX_ANDROID_COMPILE_AS_32BIT_ON_64BIT_PLATFORMS
OMX_PTR pBuffer;
#else
struct ANativeWindowBuffer* pBuffer; struct ANativeWindowBuffer* pBuffer;
#endif
int nFenceFd; // -1 if unused int nFenceFd; // -1 if unused
}; };
@ -196,17 +204,17 @@ struct MediaImage {
}; };
Type mType; Type mType;
size_t mNumPlanes; // number of planes uint32_t mNumPlanes; // number of planes
size_t mWidth; // width of largest plane (unpadded, as in nFrameWidth) uint32_t mWidth; // width of largest plane (unpadded, as in nFrameWidth)
size_t mHeight; // height of largest plane (unpadded, as in nFrameHeight) uint32_t mHeight; // height of largest plane (unpadded, as in nFrameHeight)
size_t mBitDepth; // useable bit depth uint32_t mBitDepth; // useable bit depth
struct PlaneInfo { struct PlaneInfo {
size_t mOffset; // offset of first pixel of the plane in bytes uint32_t mOffset; // offset of first pixel of the plane in bytes
// from buffer offset // from buffer offset
size_t mColInc; // column increment in bytes uint32_t mColInc; // column increment in bytes
size_t mRowInc; // row increment in bytes uint32_t mRowInc; // row increment in bytes
size_t mHorizSubsampling; // subsampling compared to the largest plane uint32_t mHorizSubsampling; // subsampling compared to the largest plane
size_t mVertSubsampling; // subsampling compared to the largest plane uint32_t mVertSubsampling; // subsampling compared to the largest plane
}; };
PlaneInfo mPlane[MAX_NUM_PLANES]; PlaneInfo mPlane[MAX_NUM_PLANES];
}; };