Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2012 The Android Open Source Project |
| 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. |
| 6 | * You may obtain a copy of the License at |
| 7 | * |
| 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | * |
| 10 | * Unless required by applicable law or agreed to in writing, software |
| 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. |
| 15 | */ |
| 16 | |
| 17 | //#define LOG_NDEBUG 0 |
| 18 | #define LOG_TAG "CpuConsumer" |
Dan Stoza | d723bd7 | 2014-11-18 10:24:03 -0800 | [diff] [blame] | 19 | //#define ATRACE_TAG ATRACE_TAG_GRAPHICS |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 20 | |
Eino-Ville Talvala | 042ecee | 2013-02-28 18:23:24 -0800 | [diff] [blame] | 21 | #include <cutils/compiler.h> |
| 22 | #include <utils/Log.h> |
Dan Stoza | dd26416 | 2015-03-12 13:58:47 -0700 | [diff] [blame] | 23 | #include <gui/BufferItem.h> |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 24 | #include <gui/CpuConsumer.h> |
| 25 | |
Lajos Molnar | b3ca72c | 2015-01-29 10:55:21 -0800 | [diff] [blame] | 26 | #define CC_LOGV(x, ...) ALOGV("[%s] " x, mName.string(), ##__VA_ARGS__) |
Dan Stoza | d723bd7 | 2014-11-18 10:24:03 -0800 | [diff] [blame] | 27 | //#define CC_LOGD(x, ...) ALOGD("[%s] " x, mName.string(), ##__VA_ARGS__) |
| 28 | //#define CC_LOGI(x, ...) ALOGI("[%s] " x, mName.string(), ##__VA_ARGS__) |
Dan Albert | 8b49125 | 2014-09-08 18:53:39 -0700 | [diff] [blame] | 29 | #define CC_LOGW(x, ...) ALOGW("[%s] " x, mName.string(), ##__VA_ARGS__) |
| 30 | #define CC_LOGE(x, ...) ALOGE("[%s] " x, mName.string(), ##__VA_ARGS__) |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 31 | |
| 32 | namespace android { |
| 33 | |
Mathias Agopian | db89edc | 2013-08-02 01:40:18 -0700 | [diff] [blame] | 34 | CpuConsumer::CpuConsumer(const sp<IGraphicBufferConsumer>& bq, |
Dan Stoza | d723bd7 | 2014-11-18 10:24:03 -0800 | [diff] [blame] | 35 | size_t maxLockedBuffers, bool controlledByApp) : |
Mathias Agopian | 595264f | 2013-07-16 22:56:09 -0700 | [diff] [blame] | 36 | ConsumerBase(bq, controlledByApp), |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 37 | mMaxLockedBuffers(maxLockedBuffers), |
| 38 | mCurrentLockedBuffers(0) |
| 39 | { |
Eino-Ville Talvala | 042ecee | 2013-02-28 18:23:24 -0800 | [diff] [blame] | 40 | // Create tracking entries for locked buffers |
| 41 | mAcquiredBuffers.insertAt(0, maxLockedBuffers); |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 42 | |
Mathias Agopian | db89edc | 2013-08-02 01:40:18 -0700 | [diff] [blame] | 43 | mConsumer->setConsumerUsageBits(GRALLOC_USAGE_SW_READ_OFTEN); |
Dan Stoza | d723bd7 | 2014-11-18 10:24:03 -0800 | [diff] [blame] | 44 | mConsumer->setMaxAcquiredBufferCount(static_cast<int32_t>(maxLockedBuffers)); |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 45 | } |
| 46 | |
Eino-Ville Talvala | e232fdc | 2012-08-21 13:37:35 -0700 | [diff] [blame] | 47 | CpuConsumer::~CpuConsumer() { |
Eino-Ville Talvala | 042ecee | 2013-02-28 18:23:24 -0800 | [diff] [blame] | 48 | // ConsumerBase destructor does all the work. |
Eino-Ville Talvala | e232fdc | 2012-08-21 13:37:35 -0700 | [diff] [blame] | 49 | } |
| 50 | |
Eino-Ville Talvala | 042ecee | 2013-02-28 18:23:24 -0800 | [diff] [blame] | 51 | |
| 52 | |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 53 | void CpuConsumer::setName(const String8& name) { |
| 54 | Mutex::Autolock _l(mMutex); |
Pablo Ceballos | 65d9f6d | 2016-05-04 13:59:35 -0700 | [diff] [blame] | 55 | if (mAbandoned) { |
| 56 | CC_LOGE("setName: CpuConsumer is abandoned!"); |
| 57 | return; |
| 58 | } |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 59 | mName = name; |
Mathias Agopian | db89edc | 2013-08-02 01:40:18 -0700 | [diff] [blame] | 60 | mConsumer->setConsumerName(name); |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 61 | } |
| 62 | |
Lajos Molnar | 6a26be7 | 2015-01-22 16:37:37 -0800 | [diff] [blame] | 63 | static bool isPossiblyYUV(PixelFormat format) { |
Lajos Molnar | b3ca72c | 2015-01-29 10:55:21 -0800 | [diff] [blame] | 64 | switch (static_cast<int>(format)) { |
Lajos Molnar | 6a26be7 | 2015-01-22 16:37:37 -0800 | [diff] [blame] | 65 | case HAL_PIXEL_FORMAT_RGBA_8888: |
| 66 | case HAL_PIXEL_FORMAT_RGBX_8888: |
Romain Guy | ff41514 | 2016-12-13 16:51:25 -0800 | [diff] [blame] | 67 | case HAL_PIXEL_FORMAT_RGBA_FP16: |
Romain Guy | 541f226 | 2017-02-10 18:50:17 -0800 | [diff] [blame] | 68 | case HAL_PIXEL_FORMAT_RGBA_1010102: |
Lajos Molnar | 6a26be7 | 2015-01-22 16:37:37 -0800 | [diff] [blame] | 69 | case HAL_PIXEL_FORMAT_RGB_888: |
| 70 | case HAL_PIXEL_FORMAT_RGB_565: |
| 71 | case HAL_PIXEL_FORMAT_BGRA_8888: |
Lajos Molnar | 6a26be7 | 2015-01-22 16:37:37 -0800 | [diff] [blame] | 72 | case HAL_PIXEL_FORMAT_Y8: |
| 73 | case HAL_PIXEL_FORMAT_Y16: |
Eino-Ville Talvala | 5b75a51 | 2015-02-19 16:10:43 -0800 | [diff] [blame] | 74 | case HAL_PIXEL_FORMAT_RAW16: |
Lajos Molnar | 6a26be7 | 2015-01-22 16:37:37 -0800 | [diff] [blame] | 75 | case HAL_PIXEL_FORMAT_RAW10: |
| 76 | case HAL_PIXEL_FORMAT_RAW_OPAQUE: |
| 77 | case HAL_PIXEL_FORMAT_BLOB: |
| 78 | case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED: |
| 79 | return false; |
| 80 | |
| 81 | case HAL_PIXEL_FORMAT_YV12: |
| 82 | case HAL_PIXEL_FORMAT_YCbCr_420_888: |
| 83 | case HAL_PIXEL_FORMAT_YCbCr_422_SP: |
| 84 | case HAL_PIXEL_FORMAT_YCrCb_420_SP: |
| 85 | case HAL_PIXEL_FORMAT_YCbCr_422_I: |
| 86 | default: |
| 87 | return true; |
| 88 | } |
| 89 | } |
| 90 | |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 91 | status_t CpuConsumer::lockNextBuffer(LockedBuffer *nativeBuffer) { |
| 92 | status_t err; |
| 93 | |
| 94 | if (!nativeBuffer) return BAD_VALUE; |
| 95 | if (mCurrentLockedBuffers == mMaxLockedBuffers) { |
Dan Stoza | d723bd7 | 2014-11-18 10:24:03 -0800 | [diff] [blame] | 96 | CC_LOGW("Max buffers have been locked (%zd), cannot lock anymore.", |
Igor Murashkin | a5b7513 | 2013-08-14 18:49:12 -0700 | [diff] [blame] | 97 | mMaxLockedBuffers); |
| 98 | return NOT_ENOUGH_DATA; |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 99 | } |
| 100 | |
Dan Stoza | dd26416 | 2015-03-12 13:58:47 -0700 | [diff] [blame] | 101 | BufferItem b; |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 102 | |
| 103 | Mutex::Autolock _l(mMutex); |
| 104 | |
Andy McFadden | 1585c4d | 2013-06-28 13:52:40 -0700 | [diff] [blame] | 105 | err = acquireBufferLocked(&b, 0); |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 106 | if (err != OK) { |
| 107 | if (err == BufferQueue::NO_BUFFER_AVAILABLE) { |
| 108 | return BAD_VALUE; |
| 109 | } else { |
| 110 | CC_LOGE("Error acquiring buffer: %s (%d)", strerror(err), err); |
| 111 | return err; |
| 112 | } |
| 113 | } |
| 114 | |
Pablo Ceballos | 47650f4 | 2015-08-04 16:38:17 -0700 | [diff] [blame] | 115 | int slot = b.mSlot; |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 116 | |
Eino-Ville Talvala | 64d8b19 | 2013-02-28 14:08:34 -0800 | [diff] [blame] | 117 | void *bufferPointer = NULL; |
Eino-Ville Talvala | c43946b | 2013-05-04 18:07:43 -0700 | [diff] [blame] | 118 | android_ycbcr ycbcr = android_ycbcr(); |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 119 | |
Pablo Ceballos | 47650f4 | 2015-08-04 16:38:17 -0700 | [diff] [blame] | 120 | PixelFormat format = mSlots[slot].mGraphicBuffer->getPixelFormat(); |
Lajos Molnar | 6a26be7 | 2015-01-22 16:37:37 -0800 | [diff] [blame] | 121 | PixelFormat flexFormat = format; |
| 122 | if (isPossiblyYUV(format)) { |
| 123 | if (b.mFence.get()) { |
Pablo Ceballos | 47650f4 | 2015-08-04 16:38:17 -0700 | [diff] [blame] | 124 | err = mSlots[slot].mGraphicBuffer->lockAsyncYCbCr( |
Riley Andrews | d53e052 | 2014-08-18 16:57:11 -0700 | [diff] [blame] | 125 | GraphicBuffer::USAGE_SW_READ_OFTEN, |
| 126 | b.mCrop, |
| 127 | &ycbcr, |
| 128 | b.mFence->dup()); |
Riley Andrews | d53e052 | 2014-08-18 16:57:11 -0700 | [diff] [blame] | 129 | } else { |
Pablo Ceballos | 47650f4 | 2015-08-04 16:38:17 -0700 | [diff] [blame] | 130 | err = mSlots[slot].mGraphicBuffer->lockYCbCr( |
Lajos Molnar | 6a26be7 | 2015-01-22 16:37:37 -0800 | [diff] [blame] | 131 | GraphicBuffer::USAGE_SW_READ_OFTEN, |
| 132 | b.mCrop, |
| 133 | &ycbcr); |
| 134 | } |
| 135 | if (err == OK) { |
| 136 | bufferPointer = ycbcr.y; |
| 137 | flexFormat = HAL_PIXEL_FORMAT_YCbCr_420_888; |
| 138 | if (format != HAL_PIXEL_FORMAT_YCbCr_420_888) { |
| 139 | CC_LOGV("locking buffer of format %#x as flex YUV", format); |
| 140 | } |
| 141 | } else if (format == HAL_PIXEL_FORMAT_YCbCr_420_888) { |
| 142 | CC_LOGE("Unable to lock YCbCr buffer for CPU reading: %s (%d)", |
| 143 | strerror(-err), err); |
| 144 | return err; |
| 145 | } |
| 146 | } |
| 147 | |
| 148 | if (bufferPointer == NULL) { // not flexible YUV |
| 149 | if (b.mFence.get()) { |
Pablo Ceballos | 47650f4 | 2015-08-04 16:38:17 -0700 | [diff] [blame] | 150 | err = mSlots[slot].mGraphicBuffer->lockAsync( |
Riley Andrews | d53e052 | 2014-08-18 16:57:11 -0700 | [diff] [blame] | 151 | GraphicBuffer::USAGE_SW_READ_OFTEN, |
| 152 | b.mCrop, |
| 153 | &bufferPointer, |
| 154 | b.mFence->dup()); |
Riley Andrews | d53e052 | 2014-08-18 16:57:11 -0700 | [diff] [blame] | 155 | } else { |
Pablo Ceballos | 47650f4 | 2015-08-04 16:38:17 -0700 | [diff] [blame] | 156 | err = mSlots[slot].mGraphicBuffer->lock( |
Riley Andrews | d53e052 | 2014-08-18 16:57:11 -0700 | [diff] [blame] | 157 | GraphicBuffer::USAGE_SW_READ_OFTEN, |
| 158 | b.mCrop, |
| 159 | &bufferPointer); |
Lajos Molnar | 6a26be7 | 2015-01-22 16:37:37 -0800 | [diff] [blame] | 160 | } |
| 161 | if (err != OK) { |
| 162 | CC_LOGE("Unable to lock buffer for CPU reading: %s (%d)", |
| 163 | strerror(-err), err); |
| 164 | return err; |
Eino-Ville Talvala | c43946b | 2013-05-04 18:07:43 -0700 | [diff] [blame] | 165 | } |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 166 | } |
Eino-Ville Talvala | c43946b | 2013-05-04 18:07:43 -0700 | [diff] [blame] | 167 | |
Eino-Ville Talvala | 042ecee | 2013-02-28 18:23:24 -0800 | [diff] [blame] | 168 | size_t lockedIdx = 0; |
Dan Stoza | d723bd7 | 2014-11-18 10:24:03 -0800 | [diff] [blame] | 169 | for (; lockedIdx < static_cast<size_t>(mMaxLockedBuffers); lockedIdx++) { |
Eino-Ville Talvala | 042ecee | 2013-02-28 18:23:24 -0800 | [diff] [blame] | 170 | if (mAcquiredBuffers[lockedIdx].mSlot == |
| 171 | BufferQueue::INVALID_BUFFER_SLOT) { |
| 172 | break; |
| 173 | } |
| 174 | } |
| 175 | assert(lockedIdx < mMaxLockedBuffers); |
| 176 | |
| 177 | AcquiredBuffer &ab = mAcquiredBuffers.editItemAt(lockedIdx); |
Pablo Ceballos | 47650f4 | 2015-08-04 16:38:17 -0700 | [diff] [blame] | 178 | ab.mSlot = slot; |
Eino-Ville Talvala | 042ecee | 2013-02-28 18:23:24 -0800 | [diff] [blame] | 179 | ab.mBufferPointer = bufferPointer; |
Pablo Ceballos | 47650f4 | 2015-08-04 16:38:17 -0700 | [diff] [blame] | 180 | ab.mGraphicBuffer = mSlots[slot].mGraphicBuffer; |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 181 | |
Eino-Ville Talvala | 64d8b19 | 2013-02-28 14:08:34 -0800 | [diff] [blame] | 182 | nativeBuffer->data = |
| 183 | reinterpret_cast<uint8_t*>(bufferPointer); |
Pablo Ceballos | 47650f4 | 2015-08-04 16:38:17 -0700 | [diff] [blame] | 184 | nativeBuffer->width = mSlots[slot].mGraphicBuffer->getWidth(); |
| 185 | nativeBuffer->height = mSlots[slot].mGraphicBuffer->getHeight(); |
Lajos Molnar | 6a26be7 | 2015-01-22 16:37:37 -0800 | [diff] [blame] | 186 | nativeBuffer->format = format; |
| 187 | nativeBuffer->flexFormat = flexFormat; |
Eino-Ville Talvala | c43946b | 2013-05-04 18:07:43 -0700 | [diff] [blame] | 188 | nativeBuffer->stride = (ycbcr.y != NULL) ? |
Dan Stoza | d723bd7 | 2014-11-18 10:24:03 -0800 | [diff] [blame] | 189 | static_cast<uint32_t>(ycbcr.ystride) : |
Pablo Ceballos | 47650f4 | 2015-08-04 16:38:17 -0700 | [diff] [blame] | 190 | mSlots[slot].mGraphicBuffer->getStride(); |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 191 | |
| 192 | nativeBuffer->crop = b.mCrop; |
| 193 | nativeBuffer->transform = b.mTransform; |
| 194 | nativeBuffer->scalingMode = b.mScalingMode; |
| 195 | nativeBuffer->timestamp = b.mTimestamp; |
Eino-Ville Talvala | 5b75a51 | 2015-02-19 16:10:43 -0800 | [diff] [blame] | 196 | nativeBuffer->dataSpace = b.mDataSpace; |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 197 | nativeBuffer->frameNumber = b.mFrameNumber; |
| 198 | |
Eino-Ville Talvala | c43946b | 2013-05-04 18:07:43 -0700 | [diff] [blame] | 199 | nativeBuffer->dataCb = reinterpret_cast<uint8_t*>(ycbcr.cb); |
| 200 | nativeBuffer->dataCr = reinterpret_cast<uint8_t*>(ycbcr.cr); |
Dan Stoza | d723bd7 | 2014-11-18 10:24:03 -0800 | [diff] [blame] | 201 | nativeBuffer->chromaStride = static_cast<uint32_t>(ycbcr.cstride); |
| 202 | nativeBuffer->chromaStep = static_cast<uint32_t>(ycbcr.chroma_step); |
Eino-Ville Talvala | c43946b | 2013-05-04 18:07:43 -0700 | [diff] [blame] | 203 | |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 204 | mCurrentLockedBuffers++; |
| 205 | |
| 206 | return OK; |
| 207 | } |
| 208 | |
| 209 | status_t CpuConsumer::unlockBuffer(const LockedBuffer &nativeBuffer) { |
| 210 | Mutex::Autolock _l(mMutex); |
Eino-Ville Talvala | 042ecee | 2013-02-28 18:23:24 -0800 | [diff] [blame] | 211 | size_t lockedIdx = 0; |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 212 | |
| 213 | void *bufPtr = reinterpret_cast<void *>(nativeBuffer.data); |
Dan Stoza | d723bd7 | 2014-11-18 10:24:03 -0800 | [diff] [blame] | 214 | for (; lockedIdx < static_cast<size_t>(mMaxLockedBuffers); lockedIdx++) { |
Eino-Ville Talvala | 042ecee | 2013-02-28 18:23:24 -0800 | [diff] [blame] | 215 | if (bufPtr == mAcquiredBuffers[lockedIdx].mBufferPointer) break; |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 216 | } |
Eino-Ville Talvala | 042ecee | 2013-02-28 18:23:24 -0800 | [diff] [blame] | 217 | if (lockedIdx == mMaxLockedBuffers) { |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 218 | CC_LOGE("%s: Can't find buffer to free", __FUNCTION__); |
| 219 | return BAD_VALUE; |
| 220 | } |
| 221 | |
Eino-Ville Talvala | 042ecee | 2013-02-28 18:23:24 -0800 | [diff] [blame] | 222 | return releaseAcquiredBufferLocked(lockedIdx); |
| 223 | } |
| 224 | |
Dan Stoza | d723bd7 | 2014-11-18 10:24:03 -0800 | [diff] [blame] | 225 | status_t CpuConsumer::releaseAcquiredBufferLocked(size_t lockedIdx) { |
Eino-Ville Talvala | 042ecee | 2013-02-28 18:23:24 -0800 | [diff] [blame] | 226 | status_t err; |
Riley Andrews | d53e052 | 2014-08-18 16:57:11 -0700 | [diff] [blame] | 227 | int fd = -1; |
Eino-Ville Talvala | 042ecee | 2013-02-28 18:23:24 -0800 | [diff] [blame] | 228 | |
Riley Andrews | d53e052 | 2014-08-18 16:57:11 -0700 | [diff] [blame] | 229 | err = mAcquiredBuffers[lockedIdx].mGraphicBuffer->unlockAsync(&fd); |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 230 | if (err != OK) { |
Dan Stoza | d723bd7 | 2014-11-18 10:24:03 -0800 | [diff] [blame] | 231 | CC_LOGE("%s: Unable to unlock graphic buffer %zd", __FUNCTION__, |
Eino-Ville Talvala | 042ecee | 2013-02-28 18:23:24 -0800 | [diff] [blame] | 232 | lockedIdx); |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 233 | return err; |
| 234 | } |
Eino-Ville Talvala | 042ecee | 2013-02-28 18:23:24 -0800 | [diff] [blame] | 235 | int buf = mAcquiredBuffers[lockedIdx].mSlot; |
Riley Andrews | d53e052 | 2014-08-18 16:57:11 -0700 | [diff] [blame] | 236 | if (CC_LIKELY(fd != -1)) { |
| 237 | sp<Fence> fence(new Fence(fd)); |
| 238 | addReleaseFenceLocked( |
| 239 | mAcquiredBuffers[lockedIdx].mSlot, |
| 240 | mSlots[buf].mGraphicBuffer, |
| 241 | fence); |
| 242 | } |
Eino-Ville Talvala | 042ecee | 2013-02-28 18:23:24 -0800 | [diff] [blame] | 243 | |
| 244 | // release the buffer if it hasn't already been freed by the BufferQueue. |
| 245 | // This can happen, for example, when the producer of this buffer |
| 246 | // disconnected after this buffer was acquired. |
| 247 | if (CC_LIKELY(mAcquiredBuffers[lockedIdx].mGraphicBuffer == |
| 248 | mSlots[buf].mGraphicBuffer)) { |
Lajos Molnar | c5d7b7d | 2013-05-03 14:50:50 -0700 | [diff] [blame] | 249 | releaseBufferLocked( |
| 250 | buf, mAcquiredBuffers[lockedIdx].mGraphicBuffer, |
| 251 | EGL_NO_DISPLAY, EGL_NO_SYNC_KHR); |
Eino-Ville Talvala | 042ecee | 2013-02-28 18:23:24 -0800 | [diff] [blame] | 252 | } |
| 253 | |
| 254 | AcquiredBuffer &ab = mAcquiredBuffers.editItemAt(lockedIdx); |
| 255 | ab.mSlot = BufferQueue::INVALID_BUFFER_SLOT; |
| 256 | ab.mBufferPointer = NULL; |
| 257 | ab.mGraphicBuffer.clear(); |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 258 | |
| 259 | mCurrentLockedBuffers--; |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 260 | return OK; |
| 261 | } |
| 262 | |
Eino-Ville Talvala | f57e754 | 2012-08-20 15:44:40 -0700 | [diff] [blame] | 263 | void CpuConsumer::freeBufferLocked(int slotIndex) { |
Eino-Ville Talvala | f57e754 | 2012-08-20 15:44:40 -0700 | [diff] [blame] | 264 | ConsumerBase::freeBufferLocked(slotIndex); |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 265 | } |
| 266 | |
Eino-Ville Talvala | e41b318 | 2012-04-16 17:54:33 -0700 | [diff] [blame] | 267 | } // namespace android |