diff options
| author | 2015-04-07 18:14:37 +0000 | |
|---|---|---|
| committer | 2015-04-07 18:14:50 +0000 | |
| commit | 11da530a704fc9406d6779c5b985d3394c6a8474 (patch) | |
| tree | 0ccc284b29a954b5af201192d0edd0af7fb129c8 /libs/gui/StreamSplitter.cpp | |
| parent | 7b5f82d8d726e4bcd21c19340c0743a728bc0253 (diff) | |
| parent | 1c2001efcf56d7f65242249fa4e5833f03a68e37 (diff) | |
Merge "Cherry-pick dataSpace and BufferItem changes" into lmp-mr1-dev-plus-aosp
Diffstat (limited to 'libs/gui/StreamSplitter.cpp')
| -rw-r--r-- | libs/gui/StreamSplitter.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/gui/StreamSplitter.cpp b/libs/gui/StreamSplitter.cpp index 8146869b83..43f9214fc7 100644 --- a/libs/gui/StreamSplitter.cpp +++ b/libs/gui/StreamSplitter.cpp @@ -20,6 +20,7 @@ #define ATRACE_TAG ATRACE_TAG_GRAPHICS //#define LOG_NDEBUG 0 +#include <gui/BufferItem.h> #include <gui/IGraphicBufferConsumer.h> #include <gui/IGraphicBufferProducer.h> #include <gui/StreamSplitter.h> @@ -123,7 +124,7 @@ void StreamSplitter::onFrameAvailable(const BufferItem& /* item */) { ++mOutstandingBuffers; // Acquire and detach the buffer from the input - IGraphicBufferConsumer::BufferItem bufferItem; + BufferItem bufferItem; status_t status = mInput->acquireBuffer(&bufferItem, /* presentWhen */ 0); LOG_ALWAYS_FATAL_IF(status != NO_ERROR, "acquiring buffer from input failed (%d)", status); @@ -141,7 +142,8 @@ void StreamSplitter::onFrameAvailable(const BufferItem& /* item */) { IGraphicBufferProducer::QueueBufferInput queueInput( bufferItem.mTimestamp, bufferItem.mIsAutoTimestamp, - bufferItem.mCrop, static_cast<int32_t>(bufferItem.mScalingMode), + bufferItem.mDataSpace, bufferItem.mCrop, + static_cast<int32_t>(bufferItem.mScalingMode), bufferItem.mTransform, bufferItem.mIsDroppable, bufferItem.mFence); |