commit 6507185f5c59d39deeda6598ce50ee4900723501
author Robert Shih <robertshih@google.com> Thu Nov 17 18:21:47 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 17 18:21:47 2016 +0000
tree 99a10bb7e0f3519de2ef9d638281b84aa7ec1da2
parent d59bcb06a63093337e8b0174ff414e4617bdc4f4
parent 01abec873792d290944192814029c98a6e46917a

Merge "httplive: fix overflow in BandwidthEstimator" am: 6cc43e10f4 am: 3c0f1962af am: 51ae9199be
am: 01abec8737

Change-Id: I43de1de085d2a3b8f02a7b6242dedfc6683a0a4f

media/libstagefright/httplive/LiveSession.cpp

diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp
index e654a01..bde304c 100644
--- a/media/libstagefright/httplive/LiveSession.cpp
+++ b/media/libstagefright/httplive/LiveSession.cpp
@@ -178,7 +178,7 @@
         *shortTermBps = mShortTermEstimate;
     }
 
-    int32_t minEstimate = -1, maxEstimate = -1;
+    int64_t minEstimate = -1, maxEstimate = -1;
     List<int32_t>::iterator it;
     for (it = mPrevEstimates.begin(); it != mPrevEstimates.end(); it++) {
         int32_t estimate = *it;