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

Merge "Specifying -1 for both low and highwater marks would not actually do the right thing"

Browse Source
This commit is contained in:
Andreas Huber
2011-10-07 10:08:48 -07:00
committed by Android (Google) Code Review
parent 851a14eb94 b987d875c6
commit 41c95f3642
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
media/libstagefright/NuCachedSource2.cpp
View File

@@ -598,11 +598,10 @@ void NuCachedSource2::updateCacheParamsFromSystemProperty() {
void NuCachedSource2::updateCacheParamsFromString(const char *s) {
ssize_t lowwaterMarkKb, highwaterMarkKb;
unsigned keepAliveSecs;
int keepAliveSecs;
if (sscanf(s, "%ld/%ld/%u",
&lowwaterMarkKb, &highwaterMarkKb, &keepAliveSecs) != 3
|| lowwaterMarkKb >= highwaterMarkKb) {
if (sscanf(s, "%ld/%ld/%d",
&lowwaterMarkKb, &highwaterMarkKb, &keepAliveSecs) != 3) {
LOGE("Failed to parse cache parameters from '%s'.", s);
return;
}
@@ -619,7 +618,18 @@ void NuCachedSource2::updateCacheParamsFromString(const char *s) {
mHighwaterThresholdBytes = kDefaultHighWaterThreshold;
}
mKeepAliveIntervalUs = keepAliveSecs * 1000000ll;
if (mLowwaterThresholdBytes >= mHighwaterThresholdBytes) {
LOGE("Illegal low/highwater marks specified, reverting to defaults.");
mLowwaterThresholdBytes = kDefaultLowWaterThreshold;
mHighwaterThresholdBytes = kDefaultHighWaterThreshold;
}
if (keepAliveSecs >= 0) {
mKeepAliveIntervalUs = keepAliveSecs * 1000000ll;
} else {
mKeepAliveIntervalUs = kDefaultKeepAliveIntervalUs;
}
LOGV("lowwater = %d bytes, highwater = %d bytes, keepalive = %lld us",
mLowwaterThresholdBytes,