diff options
| author | Dan Stoza <stoza@google.com> | 2014-04-21 16:11:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-21 16:11:20 +0000 |
| commit | 9e8eeafe1ea0e88d548270280bcc209dde51781b (patch) | |
| tree | 26aac822426da9880168702c8988f3cbe80d0dd0 /media/libstagefright/omx | |
| parent | 6adc9ccb2948d9421a0ed4b74f52b909bcec2037 (diff) | |
| parent | 2475264264b51a7592c5b2e4cd6cfdaddba16644 (diff) | |
| download | frameworks_av-9e8eeafe1ea0e88d548270280bcc209dde51781b.zip frameworks_av-9e8eeafe1ea0e88d548270280bcc209dde51781b.tar.gz frameworks_av-9e8eeafe1ea0e88d548270280bcc209dde51781b.tar.bz2 | |
Merge "BufferQueue: Increase max slots from 32 to 64"
Diffstat (limited to 'media/libstagefright/omx')
| -rw-r--r-- | media/libstagefright/omx/GraphicBufferSource.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/media/libstagefright/omx/GraphicBufferSource.cpp b/media/libstagefright/omx/GraphicBufferSource.cpp index 3df57b4..16f6c58 100644 --- a/media/libstagefright/omx/GraphicBufferSource.cpp +++ b/media/libstagefright/omx/GraphicBufferSource.cpp @@ -29,6 +29,8 @@ #include <media/hardware/MetadataBufferType.h> #include <ui/GraphicBuffer.h> +#include <inttypes.h> + namespace android { static const bool EXTRA_CHECK = true; @@ -763,13 +765,13 @@ void GraphicBufferSource::onFrameAvailable() { void GraphicBufferSource::onBuffersReleased() { Mutex::Autolock lock(mMutex); - uint32_t slotMask; + uint64_t slotMask; if (mConsumer->getReleasedBuffers(&slotMask) != NO_ERROR) { ALOGW("onBuffersReleased: unable to get released buffer set"); - slotMask = 0xffffffff; + slotMask = 0xffffffffffffffffULL; } - ALOGV("onBuffersReleased: 0x%08x", slotMask); + ALOGV("onBuffersReleased: 0x%016" PRIx64, slotMask); for (int i = 0; i < BufferQueue::NUM_BUFFER_SLOTS; i++) { if ((slotMask & 0x01) != 0) { |