diff options
| author | Lajos Molnar <lajos@google.com> | 2015-01-29 00:27:50 -0800 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2015-01-29 00:27:50 -0800 |
| commit | ea5c0286e8a18e71608e6c6e5758b167fe0d6c26 (patch) | |
| tree | 7c60a14509723c3bc7a54c0225e686fd8d14860d /media/libstagefright/include | |
| parent | 6dafb81dc699672f218915fa2895f8ee012203a9 (diff) | |
| parent | 44a2390bb707f2bc55265c43010f3cd092e233db (diff) | |
| download | frameworks_av-ea5c0286e8a18e71608e6c6e5758b167fe0d6c26.zip frameworks_av-ea5c0286e8a18e71608e6c6e5758b167fe0d6c26.tar.gz frameworks_av-ea5c0286e8a18e71608e6c6e5758b167fe0d6c26.tar.bz2 | |
resolved conflicts for merge of 44a2390b to lmp-mr1-dev-plus-aosp
Change-Id: I39fdc2e8895e1e943749b9a2628656a8fa5bb72b
Diffstat (limited to 'media/libstagefright/include')
| -rw-r--r-- | media/libstagefright/include/HTTPBase.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/media/libstagefright/include/HTTPBase.h b/media/libstagefright/include/HTTPBase.h index 0c66e27..1c3cd5e 100644 --- a/media/libstagefright/include/HTTPBase.h +++ b/media/libstagefright/include/HTTPBase.h @@ -48,8 +48,6 @@ struct HTTPBase : public DataSource { virtual status_t setBandwidthStatCollectFreq(int32_t freqMs); - virtual void setBandwidthHistorySize(size_t numHistoryItems); - static void RegisterSocketUserTag(int sockfd, uid_t uid, uint32_t kTag); static void UnRegisterSocketUserTag(int sockfd); @@ -57,7 +55,7 @@ struct HTTPBase : public DataSource { static void UnRegisterSocketUserMark(int sockfd); protected: - virtual void addBandwidthMeasurement(size_t numBytes, int64_t delayUs); + void addBandwidthMeasurement(size_t numBytes, int64_t delayUs); private: struct BandwidthEntry { @@ -71,7 +69,6 @@ private: size_t mNumBandwidthHistoryItems; int64_t mTotalTransferTimeUs; size_t mTotalTransferBytes; - size_t mMaxBandwidthHistoryItems; enum { kMinBandwidthCollectFreqMs = 1000, // 1 second |