am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2

* commit 'e3b80c838753fe8c9049950216c6379098465810':
  Revert "Add avg bandwidth estimate every 2 seconds - do not merge."

2 files changed, 0 insertions, 12 deletions

diff --git a/media/libstagefright/NuHTTPDataSource.cpp b/media/libstagefright/NuHTTPDataSource.cpp
index 62fb732..bee0d5e 100644
--- a/media/libstagefright/NuHTTPDataSource.cpp
+++ b/media/libstagefright/NuHTTPDataSource.cpp
@@ -100,7 +100,6 @@ NuHTTPDataSource::NuHTTPDataSource(uint32_t flags)
       mNumBandwidthHistoryItems(0),
       mTotalTransferTimeUs(0),
       mTotalTransferBytes(0),
-      mPrevBandwidthMeasureTimeUs(0),
       mDecryptHandle(NULL),
       mDrmManagerClient(NULL) {
 }
@@ -535,16 +534,6 @@ void NuHTTPDataSource::addBandwidthMeasurement_l(
         mTotalTransferBytes -= entry->mNumBytes;
         mBandwidthHistory.erase(mBandwidthHistory.begin());
         --mNumBandwidthHistoryItems;
-        int64_t timeNowUs = ALooper::GetNowUs();
-        if (timeNowUs - mPrevBandwidthMeasureTimeUs > 2000000LL) {
-            if (mPrevBandwidthMeasureTimeUs != 0) {
-                double estimatedBandwidth =
-                    ((double)mTotalTransferBytes * 8E3 / mTotalTransferTimeUs);
-                LOGI("estimated avg bandwidth is %8.2f kbps in the past %lld us",
-                    estimatedBandwidth, timeNowUs - mPrevBandwidthMeasureTimeUs);
-            }
-            mPrevBandwidthMeasureTimeUs = timeNowUs;
-        }
     }
 }
 
diff --git a/media/libstagefright/include/NuHTTPDataSource.h b/media/libstagefright/include/NuHTTPDataSource.h
index 0d68234..2569568 100644
--- a/media/libstagefright/include/NuHTTPDataSource.h
+++ b/media/libstagefright/include/NuHTTPDataSource.h
@@ -97,7 +97,6 @@ private:
     size_t mNumBandwidthHistoryItems;
     int64_t mTotalTransferTimeUs;
     size_t mTotalTransferBytes;
-    int64_t mPrevBandwidthMeasureTimeUs;
 
     DecryptHandle *mDecryptHandle;
     DrmManagerClient *mDrmManagerClient;