diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-11-28 10:18:47 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-11-28 10:18:47 -0800 |
| commit | 066becc245b29ca60983d9d66d57f5df972ac109 (patch) | |
| tree | 8a64a2d5f88222da314390dd9d00a72c9ffee1a2 | |
| parent | f8a7a3dc2738af7a4627aea7a5c642c755bc0aca (diff) | |
| parent | eb8193226e6cf972364a4eafd0c92f592276f73b (diff) | |
| download | android_hardware_qcom_media-066becc245b29ca60983d9d66d57f5df972ac109.tar.gz android_hardware_qcom_media-066becc245b29ca60983d9d66d57f5df972ac109.tar.bz2 android_hardware_qcom_media-066becc245b29ca60983d9d66d57f5df972ac109.zip | |
Merge "mm-video: vidc: Make buffer state bitmap 64 bits"
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/inc/omx_vdec.h | 12 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp | 5 |
2 files changed, 10 insertions, 7 deletions
diff --git a/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h b/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h index 25288e57..557257a4 100644 --- a/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h +++ b/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h @@ -150,10 +150,10 @@ class VideoHeap : public MemoryHeapBase (unsigned)((OMX_BUFFERHEADERTYPE *)bufHdr)->nTimeStamp) // BitMask Management logic -#define BITS_PER_BYTE 32 -#define BITMASK_SIZE(mIndex) (((mIndex) + BITS_PER_BYTE - 1)/BITS_PER_BYTE) -#define BITMASK_OFFSET(mIndex) ((mIndex)/BITS_PER_BYTE) -#define BITMASK_FLAG(mIndex) (1 << ((mIndex) % BITS_PER_BYTE)) +#define BITS_PER_INDEX 64 +#define BITMASK_SIZE(mIndex) (((mIndex) + BITS_PER_INDEX - 1)/BITS_PER_INDEX) +#define BITMASK_OFFSET(mIndex) ((mIndex)/BITS_PER_INDEX) +#define BITMASK_FLAG(mIndex) ((uint64_t)1 << ((mIndex) % BITS_PER_INDEX)) #define BITMASK_CLEAR(mArray,mIndex) (mArray)[BITMASK_OFFSET(mIndex)] \ &= ~(BITMASK_FLAG(mIndex)) #define BITMASK_SET(mArray,mIndex) (mArray)[BITMASK_OFFSET(mIndex)] \ @@ -806,9 +806,9 @@ class omx_vdec: public qc_omx_component int pending_input_buffers; int pending_output_buffers; // bitmask array size for output side - unsigned int m_out_bm_count; + uint64_t m_out_bm_count; // bitmask array size for input side - unsigned int m_inp_bm_count; + uint64_t m_inp_bm_count; //Input port Populated OMX_BOOL m_inp_bPopulated; //Output port Populated diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp index e13af752..f6369cf5 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp @@ -39,6 +39,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Include Files ////////////////////////////////////////////////////////////////////////////// +#define __STDC_FORMAT_MACROS +#include <inttypes.h> + #include <string.h> #include <pthread.h> #include <sys/prctl.h> @@ -8295,7 +8298,7 @@ OMX_ERRORTYPE omx_vdec::allocate_output_headers() sizeof(OMX_BUFFERHEADERTYPE), nPMEMInfoSize, nPlatformListSize); - DEBUG_PRINT_LOW("PE %d bmSize %d",nPlatformEntrySize, + DEBUG_PRINT_LOW("PE %d bmSize %"PRId64, nPlatformEntrySize, m_out_bm_count); m_out_mem_ptr = (OMX_BUFFERHEADERTYPE *)calloc(nBufHdrSize,1); // Alloc mem for platform specific info |