summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/include
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-01-28 21:38:38 -0800
committerLajos Molnar <lajos@google.com>2015-01-28 21:52:09 -0800
commitf0d689934e70d3e5b3784265e890377db04c7c1d (patch)
tree92a7f9bf2304a7b1ced4e34c7cca6ddc569b2e55 /media/libstagefright/include
parentc84bc78d4244987268cbe621cecdfb72cbd48dc7 (diff)
downloadframeworks_av-f0d689934e70d3e5b3784265e890377db04c7c1d.zip
frameworks_av-f0d689934e70d3e5b3784265e890377db04c7c1d.tar.gz
frameworks_av-f0d689934e70d3e5b3784265e890377db04c7c1d.tar.bz2
Revert "HLS: QCom enhancements"
This is to restore patch attributions This reverts commit f580806d893c4631f5324ff0af5c2db68a40ef42. Bug: 18821145 Change-Id: Idc49385fffccfde2a3915388fe3fe4e2b740d787
Diffstat (limited to 'media/libstagefright/include')
-rw-r--r--media/libstagefright/include/HTTPBase.h5
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