diff options
author | James Dong <jdong@google.com> | 2011-05-19 14:09:27 -0700 |
---|---|---|
committer | James Dong <jdong@google.com> | 2011-05-19 14:10:00 -0700 |
commit | cd454fa91e9e856bfa5dd161f8e1b4b9a9729eae (patch) | |
tree | ee69728127541e9092e58a37f4a5e7e0f8abaa64 | |
parent | 51fb97031f62b1181fc9eb6c636d09a68987d939 (diff) | |
download | frameworks_base-cd454fa91e9e856bfa5dd161f8e1b4b9a9729eae.zip frameworks_base-cd454fa91e9e856bfa5dd161f8e1b4b9a9729eae.tar.gz frameworks_base-cd454fa91e9e856bfa5dd161f8e1b4b9a9729eae.tar.bz2 |
Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
This reverts commit ec78f551b575b0274cbe796f8e08a9df1a706680.
-rw-r--r-- | media/libstagefright/NuHTTPDataSource.cpp | 11 | ||||
-rw-r--r-- | media/libstagefright/include/NuHTTPDataSource.h | 1 |
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; |