commit a55de24ae2e3810c74cc911865d0f8265d4b0850
author Nick Desaulniers <ndesaulniers@google.com> Tue Oct 08 11:03:56 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 08 11:03:56 2019 -0700
tree f1fcd254f83e52b0869baed5f67a0752c493a3c4
parent 30ae01c81c71a2ace39847aee67f1409845268e2
parent bdbe8adc387cc6e37bbceca6b10975bb372d9610

Merge "[media][sfplugin] fix -Wdangling-gsl" am: d3dd89caab am: 548b9b4097
am: bdbe8adc38

Change-Id: I961143d2143e26484b57c173ef883e64dcec4969

media/codec2/sfplugin/CCodecBuffers.cpp

diff --git a/media/codec2/sfplugin/CCodecBuffers.cpp b/media/codec2/sfplugin/CCodecBuffers.cpp
index 26c702d..ed8b832 100644
--- a/media/codec2/sfplugin/CCodecBuffers.cpp
+++ b/media/codec2/sfplugin/CCodecBuffers.cpp
@@ -878,9 +878,10 @@
     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;
             }