Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'e3b80c838753fe8c9049950216c6379098465810':
  Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
This commit is contained in:
James Dong
2011-06-09 12:03:52 -07:00
committed by Android Git Automerger
parent e502c5364f e3b80c8387
commit 2488a94350
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
media/libstagefright/NuHTTPDataSource.cpp
View File

@@ -100,7 +100,6 @@ NuHTTPDataSource::NuHTTPDataSource(uint32_t flags)
mNumBandwidthHistoryItems(0), mNumBandwidthHistoryItems(0),
mTotalTransferTimeUs(0), mTotalTransferTimeUs(0),
mTotalTransferBytes(0), mTotalTransferBytes(0),
mPrevBandwidthMeasureTimeUs(0),
mDecryptHandle(NULL), mDecryptHandle(NULL),
mDrmManagerClient(NULL) { mDrmManagerClient(NULL) {
} }
@@ -535,16 +534,6 @@ void NuHTTPDataSource::addBandwidthMeasurement_l(
mTotalTransferBytes -= entry->mNumBytes; mTotalTransferBytes -= entry->mNumBytes;
mBandwidthHistory.erase(mBandwidthHistory.begin()); mBandwidthHistory.erase(mBandwidthHistory.begin());
--mNumBandwidthHistoryItems; --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;
}
} }
} }

1
media/libstagefright/include/NuHTTPDataSource.h
View File

@@ -97,7 +97,6 @@ private:
size_t mNumBandwidthHistoryItems; size_t mNumBandwidthHistoryItems;
int64_t mTotalTransferTimeUs; int64_t mTotalTransferTimeUs;
size_t mTotalTransferBytes; size_t mTotalTransferBytes;
int64_t mPrevBandwidthMeasureTimeUs;
DecryptHandle *mDecryptHandle; DecryptHandle *mDecryptHandle;
DrmManagerClient *mDrmManagerClient; DrmManagerClient *mDrmManagerClient;