diff options
| author | Bryan Ferris <bferris@google.com> | 2020-03-26 18:23:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-03-26 18:23:32 +0000 |
| commit | ae2c605380345aa2b08b9f78f16161a5cb9d6f7c (patch) | |
| tree | 97274f018e171a91a1787b2de77c7299fb3fc5de | |
| parent | 57f9e3c01518cc96ea55d5adc0cf6a95f0630a36 (diff) | |
| parent | 75b7bf70de4093eacdb1d59738deae2d7cca4a3b (diff) | |
| download | frameworks_av-ae2c605380345aa2b08b9f78f16161a5cb9d6f7c.tar.gz frameworks_av-ae2c605380345aa2b08b9f78f16161a5cb9d6f7c.tar.bz2 frameworks_av-ae2c605380345aa2b08b9f78f16161a5cb9d6f7c.zip | |
Merge "[media][sfplugin] fix -Wdangling-gsl" into qt-qpr1-dev
| -rw-r--r-- | media/codec2/sfplugin/CCodecBuffers.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/media/codec2/sfplugin/CCodecBuffers.cpp b/media/codec2/sfplugin/CCodecBuffers.cpp index 26c702ddc0..ed8b832478 100644 --- a/media/codec2/sfplugin/CCodecBuffers.cpp +++ b/media/codec2/sfplugin/CCodecBuffers.cpp @@ -878,9 +878,10 @@ void OutputBuffersArray::realloc(const std::shared_ptr<C2Buffer> &c2buffer) { switch (c2buffer->data().type()) { case C2BufferData::LINEAR: { uint32_t size = kLinearBufferSize; - const C2ConstLinearBlock &block = c2buffer->data().linearBlocks().front(); - if (block.size() < kMaxLinearBufferSize / 2) { - size = block.size() * 2; + const std::vector<C2ConstLinearBlock> &linear_blocks = c2buffer->data().linearBlocks(); + const uint32_t block_size = linear_blocks.front().size(); + if (block_size < kMaxLinearBufferSize / 2) { + size = block_size * 2; } else { size = kMaxLinearBufferSize; } |