commit f7270c2008902f373058e6e06052fc493553866c
author Pawin Vongmasa <pawin@google.com> Fri Sep 21 17:04:15 2018 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Mon Sep 24 22:16:44 2018 +0000
tree b73fe3a4f35422ec79e386953d600a333b665ffd
parent 1dec5092e2d9ed768da31b33a0925d81575c2fb3

CCodec: add cast to signed integer

Bug: 116297102

Test: m cts && cts-tradefed run cts -m CtsSecurityTestCases \
-t android.security.cts.StagefrightTest#testStagefright_cve_2016_3755

Test: m cts && cts-tradefed run cts -m CtsMediaTestCases \
-t android.media.cts.MediaCodecTest

Test: m cts && cts-tradefed run cts-dev -m CtsMediaTestCases \
--compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice

Test: m cts && cts-tradefed run cts -m CtsSecurityTestCases
Change-Id: Ic34b85a2e191b219af0189f136e9ed34ae316204
(cherry picked from commit 153dcbeed25d0b076813fb80901876d6745bf262)

media/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/sfplugin/CCodecBufferChannel.cpp b/media/sfplugin/CCodecBufferChannel.cpp
index bf14e09..b372b3c 100644
--- a/media/sfplugin/CCodecBufferChannel.cpp
+++ b/media/sfplugin/CCodecBufferChannel.cpp
@@ -1405,7 +1405,7 @@
             prevInput + static_cast<int>(numDiscardedInputBuffers),
             component.load(std::memory_order_relaxed),
             output.load(std::memory_order_relaxed));
-    return prevInput + numDiscardedInputBuffers;
+    return prevInput + static_cast<int>(numDiscardedInputBuffers);
 }
 
 int CCodecBufferChannel::PipelineCapacity::freeComponentSlot(