Mathias Agopian | 3e87601 | 2012-06-07 17:52:54 -0700 | [diff] [blame] | 1 | /* |
| 2 | ** |
Jamie Gennis | 1a4d883 | 2012-08-02 20:11:05 -0700 | [diff] [blame] | 3 | ** Copyright 2012 The Android Open Source Project |
Mathias Agopian | 3e87601 | 2012-06-07 17:52:54 -0700 | [diff] [blame] | 4 | ** |
| 5 | ** Licensed under the Apache License Version 2.0(the "License"); |
| 6 | ** you may not use this file except in compliance with the License. |
| 7 | ** You may obtain a copy of the License at |
| 8 | ** |
| 9 | ** http://www.apache.org/licenses/LICENSE-2.0 |
| 10 | ** |
| 11 | ** Unless required by applicable law or agreed to in writing software |
| 12 | ** distributed under the License is distributed on an "AS IS" BASIS |
| 13 | ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND either express or implied. |
| 14 | ** See the License for the specific language governing permissions and |
| 15 | ** limitations under the License. |
| 16 | */ |
| 17 | |
Dan Stoza | 9e56aa0 | 2015-11-02 13:00:03 -0800 | [diff] [blame] | 18 | // #define LOG_NDEBUG 0 |
| 19 | #undef LOG_TAG |
| 20 | #define LOG_TAG "FramebufferSurface" |
| 21 | |
Mathias Agopian | 3e87601 | 2012-06-07 17:52:54 -0700 | [diff] [blame] | 22 | #include <errno.h> |
Mark Salyzyn | a5e161b | 2016-09-29 08:08:05 -0700 | [diff] [blame] | 23 | #include <stdio.h> |
| 24 | #include <stdlib.h> |
| 25 | #include <string.h> |
Mathias Agopian | 3e87601 | 2012-06-07 17:52:54 -0700 | [diff] [blame] | 26 | |
Mathias Agopian | 3e87601 | 2012-06-07 17:52:54 -0700 | [diff] [blame] | 27 | #include <utils/String8.h> |
Mark Salyzyn | 7823e12 | 2016-09-29 08:08:05 -0700 | [diff] [blame] | 28 | #include <log/log.h> |
Mathias Agopian | 3e87601 | 2012-06-07 17:52:54 -0700 | [diff] [blame] | 29 | |
Mathias Agopian | 3e87601 | 2012-06-07 17:52:54 -0700 | [diff] [blame] | 30 | #include <EGL/egl.h> |
| 31 | |
| 32 | #include <hardware/hardware.h> |
Dan Stoza | 84493cd | 2015-03-12 15:12:44 -0700 | [diff] [blame] | 33 | #include <gui/BufferItem.h> |
Mathias Agopian | a934764 | 2017-02-13 16:42:28 -0800 | [diff] [blame] | 34 | #include <gui/BufferQueue.h> |
Dan Stoza | 84493cd | 2015-03-12 15:12:44 -0700 | [diff] [blame] | 35 | #include <gui/Surface.h> |
Mathias Agopian | a934764 | 2017-02-13 16:42:28 -0800 | [diff] [blame] | 36 | |
Mathias Agopian | 3e87601 | 2012-06-07 17:52:54 -0700 | [diff] [blame] | 37 | #include <ui/GraphicBuffer.h> |
Mathias Agopian | a934764 | 2017-02-13 16:42:28 -0800 | [diff] [blame] | 38 | #include <ui/Rect.h> |
Mathias Agopian | 3e87601 | 2012-06-07 17:52:54 -0700 | [diff] [blame] | 39 | |
Mathias Agopian | 33ceeb3 | 2013-04-01 16:54:58 -0700 | [diff] [blame] | 40 | #include "FramebufferSurface.h" |
| 41 | #include "HWComposer.h" |
Fabien Sanglard | 1971b63 | 2017-03-10 14:50:03 -0800 | [diff] [blame] | 42 | #include "../SurfaceFlinger.h" |
Jamie Gennis | cdbaecb | 2012-10-12 14:18:10 -0700 | [diff] [blame] | 43 | |
Mathias Agopian | 3e87601 | 2012-06-07 17:52:54 -0700 | [diff] [blame] | 44 | // ---------------------------------------------------------------------------- |
| 45 | namespace android { |
| 46 | // ---------------------------------------------------------------------------- |
| 47 | |
Mathias Agopian | 3e87601 | 2012-06-07 17:52:54 -0700 | [diff] [blame] | 48 | /* |
| 49 | * This implements the (main) framebuffer management. This class is used |
| 50 | * mostly by SurfaceFlinger, but also by command line GL application. |
| 51 | * |
| 52 | */ |
| 53 | |
Mathias Agopian | db89edc | 2013-08-02 01:40:18 -0700 | [diff] [blame] | 54 | FramebufferSurface::FramebufferSurface(HWComposer& hwc, int disp, |
| 55 | const sp<IGraphicBufferConsumer>& consumer) : |
| 56 | ConsumerBase(consumer), |
Mathias Agopian | f5a3392 | 2012-09-19 18:16:22 -0700 | [diff] [blame] | 57 | mDisplayType(disp), |
Jamie Gennis | 1a4d883 | 2012-08-02 20:11:05 -0700 | [diff] [blame] | 58 | mCurrentBufferSlot(-1), |
Dan Stoza | 9e56aa0 | 2015-11-02 13:00:03 -0800 | [diff] [blame] | 59 | mCurrentBuffer(), |
| 60 | mCurrentFence(Fence::NO_FENCE), |
Fabien Sanglard | 9d96de4 | 2016-10-11 00:15:18 +0000 | [diff] [blame] | 61 | #ifdef USE_HWC2 |
Dan Stoza | 9e56aa0 | 2015-11-02 13:00:03 -0800 | [diff] [blame] | 62 | mHwc(hwc), |
| 63 | mHasPendingRelease(false), |
| 64 | mPreviousBufferSlot(BufferQueue::INVALID_BUFFER_SLOT), |
| 65 | mPreviousBuffer() |
Fabien Sanglard | 9d96de4 | 2016-10-11 00:15:18 +0000 | [diff] [blame] | 66 | #else |
| 67 | mHwc(hwc) |
| 68 | #endif |
Mathias Agopian | 3e87601 | 2012-06-07 17:52:54 -0700 | [diff] [blame] | 69 | { |
Fabien Sanglard | 9d96de4 | 2016-10-11 00:15:18 +0000 | [diff] [blame] | 70 | #ifdef USE_HWC2 |
Dan Stoza | 9e56aa0 | 2015-11-02 13:00:03 -0800 | [diff] [blame] | 71 | ALOGV("Creating for display %d", disp); |
Fabien Sanglard | 9d96de4 | 2016-10-11 00:15:18 +0000 | [diff] [blame] | 72 | #endif |
| 73 | |
Andy McFadden | b0d1dd3 | 2012-09-10 14:08:09 -0700 | [diff] [blame] | 74 | mName = "FramebufferSurface"; |
Mathias Agopian | db89edc | 2013-08-02 01:40:18 -0700 | [diff] [blame] | 75 | mConsumer->setConsumerName(mName); |
| 76 | mConsumer->setConsumerUsageBits(GRALLOC_USAGE_HW_FB | |
Mathias Agopian | f5a3392 | 2012-09-19 18:16:22 -0700 | [diff] [blame] | 77 | GRALLOC_USAGE_HW_RENDER | |
| 78 | GRALLOC_USAGE_HW_COMPOSER); |
Fabien Sanglard | 9d96de4 | 2016-10-11 00:15:18 +0000 | [diff] [blame] | 79 | #ifdef USE_HWC2 |
Dan Stoza | 9e56aa0 | 2015-11-02 13:00:03 -0800 | [diff] [blame] | 80 | const auto& activeConfig = mHwc.getActiveConfig(disp); |
| 81 | mConsumer->setDefaultBufferSize(activeConfig->getWidth(), |
| 82 | activeConfig->getHeight()); |
Fabien Sanglard | 9d96de4 | 2016-10-11 00:15:18 +0000 | [diff] [blame] | 83 | #else |
| 84 | mConsumer->setDefaultBufferFormat(mHwc.getFormat(disp)); |
| 85 | mConsumer->setDefaultBufferSize(mHwc.getWidth(disp), mHwc.getHeight(disp)); |
| 86 | #endif |
Fabien Sanglard | 1971b63 | 2017-03-10 14:50:03 -0800 | [diff] [blame] | 87 | mConsumer->setMaxAcquiredBufferCount( |
| 88 | SurfaceFlinger::maxFrameBufferAcquiredBuffers - 1); |
Jesse Hall | 99c7dbb | 2013-03-14 14:29:29 -0700 | [diff] [blame] | 89 | } |
| 90 | |
Jesse Hall | 7cd8597 | 2014-08-07 22:48:06 -0700 | [diff] [blame] | 91 | status_t FramebufferSurface::beginFrame(bool /*mustRecompose*/) { |
Jesse Hall | 028dc8f | 2013-08-20 16:35:32 -0700 | [diff] [blame] | 92 | return NO_ERROR; |
| 93 | } |
| 94 | |
Mark Salyzyn | 92dc3fc | 2014-03-12 13:12:44 -0700 | [diff] [blame] | 95 | status_t FramebufferSurface::prepareFrame(CompositionType /*compositionType*/) { |
Jesse Hall | 38efe86 | 2013-04-06 23:12:29 -0700 | [diff] [blame] | 96 | return NO_ERROR; |
| 97 | } |
| 98 | |
Jesse Hall | 99c7dbb | 2013-03-14 14:29:29 -0700 | [diff] [blame] | 99 | status_t FramebufferSurface::advanceFrame() { |
Fabien Sanglard | 9d96de4 | 2016-10-11 00:15:18 +0000 | [diff] [blame] | 100 | #ifdef USE_HWC2 |
Chia-I Wu | 06d63de | 2017-01-04 14:58:51 +0800 | [diff] [blame] | 101 | uint32_t slot = 0; |
Dan Stoza | 9e56aa0 | 2015-11-02 13:00:03 -0800 | [diff] [blame] | 102 | sp<GraphicBuffer> buf; |
| 103 | sp<Fence> acquireFence(Fence::NO_FENCE); |
| 104 | android_dataspace_t dataspace = HAL_DATASPACE_UNKNOWN; |
Chia-I Wu | 06d63de | 2017-01-04 14:58:51 +0800 | [diff] [blame] | 105 | status_t result = nextBuffer(slot, buf, acquireFence, dataspace); |
Dan Stoza | 9e56aa0 | 2015-11-02 13:00:03 -0800 | [diff] [blame] | 106 | if (result != NO_ERROR) { |
| 107 | ALOGE("error latching next FramebufferSurface buffer: %s (%d)", |
| 108 | strerror(-result), result); |
| 109 | return result; |
| 110 | } |
Chia-I Wu | 06d63de | 2017-01-04 14:58:51 +0800 | [diff] [blame] | 111 | result = mHwc.setClientTarget(mDisplayType, slot, |
| 112 | acquireFence, buf, dataspace); |
Dan Stoza | 9e56aa0 | 2015-11-02 13:00:03 -0800 | [diff] [blame] | 113 | if (result != NO_ERROR) { |
| 114 | ALOGE("error posting framebuffer: %d", result); |
| 115 | } |
| 116 | return result; |
Fabien Sanglard | 9d96de4 | 2016-10-11 00:15:18 +0000 | [diff] [blame] | 117 | #else |
| 118 | // Once we remove FB HAL support, we can call nextBuffer() from here |
| 119 | // instead of using onFrameAvailable(). No real benefit, except it'll be |
| 120 | // more like VirtualDisplaySurface. |
| 121 | return NO_ERROR; |
| 122 | #endif |
Jesse Hall | 99c7dbb | 2013-03-14 14:29:29 -0700 | [diff] [blame] | 123 | } |
| 124 | |
Fabien Sanglard | 9d96de4 | 2016-10-11 00:15:18 +0000 | [diff] [blame] | 125 | #ifdef USE_HWC2 |
Chia-I Wu | 06d63de | 2017-01-04 14:58:51 +0800 | [diff] [blame] | 126 | status_t FramebufferSurface::nextBuffer(uint32_t& outSlot, |
| 127 | sp<GraphicBuffer>& outBuffer, sp<Fence>& outFence, |
| 128 | android_dataspace_t& outDataspace) { |
Fabien Sanglard | 9d96de4 | 2016-10-11 00:15:18 +0000 | [diff] [blame] | 129 | #else |
| 130 | status_t FramebufferSurface::nextBuffer(sp<GraphicBuffer>& outBuffer, sp<Fence>& outFence) { |
| 131 | #endif |
Jamie Gennis | 1a4d883 | 2012-08-02 20:11:05 -0700 | [diff] [blame] | 132 | Mutex::Autolock lock(mMutex); |
Mathias Agopian | 3e87601 | 2012-06-07 17:52:54 -0700 | [diff] [blame] | 133 | |
Dan Stoza | 84493cd | 2015-03-12 15:12:44 -0700 | [diff] [blame] | 134 | BufferItem item; |
Andy McFadden | 1585c4d | 2013-06-28 13:52:40 -0700 | [diff] [blame] | 135 | status_t err = acquireBufferLocked(&item, 0); |
Jamie Gennis | 1a4d883 | 2012-08-02 20:11:05 -0700 | [diff] [blame] | 136 | if (err == BufferQueue::NO_BUFFER_AVAILABLE) { |
Chia-I Wu | 06d63de | 2017-01-04 14:58:51 +0800 | [diff] [blame] | 137 | #ifdef USE_HWC2 |
Chia-I Wu | aaff73f | 2017-02-13 12:28:24 -0800 | [diff] [blame] | 138 | mHwcBufferCache.getHwcBuffer(mCurrentBufferSlot, mCurrentBuffer, |
Chia-I Wu | 06d63de | 2017-01-04 14:58:51 +0800 | [diff] [blame] | 139 | &outSlot, &outBuffer); |
| 140 | #else |
Mathias Agopian | da27af9 | 2012-09-13 18:17:13 -0700 | [diff] [blame] | 141 | outBuffer = mCurrentBuffer; |
Chia-I Wu | 06d63de | 2017-01-04 14:58:51 +0800 | [diff] [blame] | 142 | #endif |
Jamie Gennis | 1a4d883 | 2012-08-02 20:11:05 -0700 | [diff] [blame] | 143 | return NO_ERROR; |
| 144 | } else if (err != NO_ERROR) { |
| 145 | ALOGE("error acquiring buffer: %s (%d)", strerror(-err), err); |
| 146 | return err; |
| 147 | } |
| 148 | |
| 149 | // If the BufferQueue has freed and reallocated a buffer in mCurrentSlot |
| 150 | // then we may have acquired the slot we already own. If we had released |
| 151 | // our current buffer before we call acquireBuffer then that release call |
| 152 | // would have returned STALE_BUFFER_SLOT, and we would have called |
| 153 | // freeBufferLocked on that slot. Because the buffer slot has already |
| 154 | // been overwritten with the new buffer all we have to do is skip the |
| 155 | // releaseBuffer call and we should be in the same state we'd be in if we |
| 156 | // had released the old buffer first. |
| 157 | if (mCurrentBufferSlot != BufferQueue::INVALID_BUFFER_SLOT && |
Pablo Ceballos | 47650f4 | 2015-08-04 16:38:17 -0700 | [diff] [blame] | 158 | item.mSlot != mCurrentBufferSlot) { |
Fabien Sanglard | 9d96de4 | 2016-10-11 00:15:18 +0000 | [diff] [blame] | 159 | #ifdef USE_HWC2 |
Dan Stoza | 9e56aa0 | 2015-11-02 13:00:03 -0800 | [diff] [blame] | 160 | mHasPendingRelease = true; |
| 161 | mPreviousBufferSlot = mCurrentBufferSlot; |
| 162 | mPreviousBuffer = mCurrentBuffer; |
Fabien Sanglard | 9d96de4 | 2016-10-11 00:15:18 +0000 | [diff] [blame] | 163 | #else |
| 164 | // Release the previous buffer. |
| 165 | err = releaseBufferLocked(mCurrentBufferSlot, mCurrentBuffer, |
| 166 | EGL_NO_DISPLAY, EGL_NO_SYNC_KHR); |
| 167 | if (err < NO_ERROR) { |
| 168 | ALOGE("error releasing buffer: %s (%d)", strerror(-err), err); |
| 169 | return err; |
| 170 | } |
| 171 | #endif |
Jamie Gennis | 1a4d883 | 2012-08-02 20:11:05 -0700 | [diff] [blame] | 172 | } |
Pablo Ceballos | 47650f4 | 2015-08-04 16:38:17 -0700 | [diff] [blame] | 173 | mCurrentBufferSlot = item.mSlot; |
Jamie Gennis | 1a4d883 | 2012-08-02 20:11:05 -0700 | [diff] [blame] | 174 | mCurrentBuffer = mSlots[mCurrentBufferSlot].mGraphicBuffer; |
Dan Stoza | 9e56aa0 | 2015-11-02 13:00:03 -0800 | [diff] [blame] | 175 | mCurrentFence = item.mFence; |
Dan Stoza | 9e56aa0 | 2015-11-02 13:00:03 -0800 | [diff] [blame] | 176 | |
Mathias Agopian | da27af9 | 2012-09-13 18:17:13 -0700 | [diff] [blame] | 177 | outFence = item.mFence; |
Fabien Sanglard | 9d96de4 | 2016-10-11 00:15:18 +0000 | [diff] [blame] | 178 | #ifdef USE_HWC2 |
Chia-I Wu | aaff73f | 2017-02-13 12:28:24 -0800 | [diff] [blame] | 179 | mHwcBufferCache.getHwcBuffer(mCurrentBufferSlot, mCurrentBuffer, |
Chia-I Wu | 06d63de | 2017-01-04 14:58:51 +0800 | [diff] [blame] | 180 | &outSlot, &outBuffer); |
Dan Stoza | 9e56aa0 | 2015-11-02 13:00:03 -0800 | [diff] [blame] | 181 | outDataspace = item.mDataSpace; |
Chia-I Wu | 06d63de | 2017-01-04 14:58:51 +0800 | [diff] [blame] | 182 | #else |
| 183 | outBuffer = mCurrentBuffer; |
Fabien Sanglard | 9d96de4 | 2016-10-11 00:15:18 +0000 | [diff] [blame] | 184 | #endif |
Jamie Gennis | 1a4d883 | 2012-08-02 20:11:05 -0700 | [diff] [blame] | 185 | return NO_ERROR; |
Mathias Agopian | 3e87601 | 2012-06-07 17:52:54 -0700 | [diff] [blame] | 186 | } |
| 187 | |
Fabien Sanglard | 9d96de4 | 2016-10-11 00:15:18 +0000 | [diff] [blame] | 188 | #ifndef USE_HWC2 |
| 189 | // Overrides ConsumerBase::onFrameAvailable(), does not call base class impl. |
| 190 | void FramebufferSurface::onFrameAvailable(const BufferItem& /* item */) { |
| 191 | sp<GraphicBuffer> buf; |
| 192 | sp<Fence> acquireFence; |
| 193 | status_t err = nextBuffer(buf, acquireFence); |
| 194 | if (err != NO_ERROR) { |
| 195 | ALOGE("error latching nnext FramebufferSurface buffer: %s (%d)", |
| 196 | strerror(-err), err); |
| 197 | return; |
| 198 | } |
| 199 | err = mHwc.fbPost(mDisplayType, acquireFence, buf); |
| 200 | if (err != NO_ERROR) { |
| 201 | ALOGE("error posting framebuffer: %d", err); |
| 202 | } |
| 203 | } |
| 204 | #endif |
| 205 | |
Jamie Gennis | 1a4d883 | 2012-08-02 20:11:05 -0700 | [diff] [blame] | 206 | void FramebufferSurface::freeBufferLocked(int slotIndex) { |
| 207 | ConsumerBase::freeBufferLocked(slotIndex); |
| 208 | if (slotIndex == mCurrentBufferSlot) { |
| 209 | mCurrentBufferSlot = BufferQueue::INVALID_BUFFER_SLOT; |
| 210 | } |
| 211 | } |
| 212 | |
Jesse Hall | 851cfe8 | 2013-03-20 13:44:00 -0700 | [diff] [blame] | 213 | void FramebufferSurface::onFrameCommitted() { |
Fabien Sanglard | 9d96de4 | 2016-10-11 00:15:18 +0000 | [diff] [blame] | 214 | #ifdef USE_HWC2 |
Dan Stoza | 9e56aa0 | 2015-11-02 13:00:03 -0800 | [diff] [blame] | 215 | if (mHasPendingRelease) { |
Fabien Sanglard | 11d0fc3 | 2016-12-01 15:43:01 -0800 | [diff] [blame] | 216 | sp<Fence> fence = mHwc.getPresentFence(mDisplayType); |
Dan Stoza | 9e56aa0 | 2015-11-02 13:00:03 -0800 | [diff] [blame] | 217 | if (fence->isValid()) { |
| 218 | status_t result = addReleaseFence(mPreviousBufferSlot, |
| 219 | mPreviousBuffer, fence); |
| 220 | ALOGE_IF(result != NO_ERROR, "onFrameCommitted: failed to add the" |
| 221 | " fence: %s (%d)", strerror(-result), result); |
| 222 | } |
| 223 | status_t result = releaseBufferLocked(mPreviousBufferSlot, |
| 224 | mPreviousBuffer, EGL_NO_DISPLAY, EGL_NO_SYNC_KHR); |
| 225 | ALOGE_IF(result != NO_ERROR, "onFrameCommitted: error releasing buffer:" |
| 226 | " %s (%d)", strerror(-result), result); |
| 227 | |
| 228 | mPreviousBuffer.clear(); |
| 229 | mHasPendingRelease = false; |
| 230 | } |
Fabien Sanglard | 9d96de4 | 2016-10-11 00:15:18 +0000 | [diff] [blame] | 231 | #else |
| 232 | sp<Fence> fence = mHwc.getAndResetReleaseFence(mDisplayType); |
| 233 | if (fence->isValid() && |
| 234 | mCurrentBufferSlot != BufferQueue::INVALID_BUFFER_SLOT) { |
| 235 | status_t err = addReleaseFence(mCurrentBufferSlot, |
| 236 | mCurrentBuffer, fence); |
| 237 | ALOGE_IF(err, "setReleaseFenceFd: failed to add the fence: %s (%d)", |
| 238 | strerror(-err), err); |
| 239 | } |
| 240 | #endif |
Mathias Agopian | da27af9 | 2012-09-13 18:17:13 -0700 | [diff] [blame] | 241 | } |
| 242 | |
Fabien Sanglard | 9d96de4 | 2016-10-11 00:15:18 +0000 | [diff] [blame] | 243 | #ifndef USE_HWC2 |
| 244 | status_t FramebufferSurface::compositionComplete() |
| 245 | { |
| 246 | return mHwc.fbCompositionComplete(); |
| 247 | } |
| 248 | #endif |
| 249 | |
Dan Stoza | f10c46e | 2014-11-11 10:32:31 -0800 | [diff] [blame] | 250 | void FramebufferSurface::dumpAsString(String8& result) const { |
Colin Cross | 3d1d280 | 2016-09-26 18:10:16 -0700 | [diff] [blame] | 251 | ConsumerBase::dumpState(result); |
Mathias Agopian | 3e87601 | 2012-06-07 17:52:54 -0700 | [diff] [blame] | 252 | } |
| 253 | |
Mathias Agopian | 74d211a | 2013-04-22 16:55:35 +0200 | [diff] [blame] | 254 | void FramebufferSurface::dumpLocked(String8& result, const char* prefix) const |
Jesse Hall | 7adb0f8 | 2013-03-06 16:13:49 -0800 | [diff] [blame] | 255 | { |
Fabien Sanglard | 9d96de4 | 2016-10-11 00:15:18 +0000 | [diff] [blame] | 256 | #ifndef USE_HWC2 |
| 257 | mHwc.fbDump(result); |
| 258 | #endif |
Mathias Agopian | 74d211a | 2013-04-22 16:55:35 +0200 | [diff] [blame] | 259 | ConsumerBase::dumpLocked(result, prefix); |
Jesse Hall | 7adb0f8 | 2013-03-06 16:13:49 -0800 | [diff] [blame] | 260 | } |
| 261 | |
Dan Stoza | 9e56aa0 | 2015-11-02 13:00:03 -0800 | [diff] [blame] | 262 | const sp<Fence>& FramebufferSurface::getClientTargetAcquireFence() const { |
| 263 | return mCurrentFence; |
| 264 | } |
Dan Stoza | 9e56aa0 | 2015-11-02 13:00:03 -0800 | [diff] [blame] | 265 | |
Mathias Agopian | 3e87601 | 2012-06-07 17:52:54 -0700 | [diff] [blame] | 266 | // ---------------------------------------------------------------------------- |
| 267 | }; // namespace android |
| 268 | // ---------------------------------------------------------------------------- |