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

Merge "Don't hold onto the lock while reconnecting to the server" into ics-mr0

Browse Source
This commit is contained in:
Dave Burke
2011-10-17 18:35:11 -07:00
committed by Android (Google) Code Review
parent 9a7e4ce72a 96e35f2e57
commit 6f13adb22a
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
media/libstagefright/NuCachedSource2.cpp
View File

@@ -279,6 +279,8 @@ void NuCachedSource2::onMessageReceived(const sp<AMessage> &msg) {
void NuCachedSource2::fetchInternal() {
LOGV("fetchInternal");
bool reconnect = false;
{
Mutex::Autolock autoLock(mLock);
CHECK(mFinalStatus == OK || mNumRetriesLeft > 0);
@@ -286,18 +288,24 @@ void NuCachedSource2::fetchInternal() {
if (mFinalStatus != OK) {
--mNumRetriesLeft;
status_t err =
mSource->reconnectAtOffset(mCacheOffset + mCache->totalSize());
reconnect = true;
}
}
if (err == ERROR_UNSUPPORTED) {
mNumRetriesLeft = 0;
return;
} else if (err != OK) {
LOGI("The attempt to reconnect failed, %d retries remaining",
mNumRetriesLeft);
if (reconnect) {
status_t err =
mSource->reconnectAtOffset(mCacheOffset + mCache->totalSize());
return;
}
Mutex::Autolock autoLock(mLock);
if (err == ERROR_UNSUPPORTED) {
mNumRetriesLeft = 0;
return;
} else if (err != OK) {
LOGI("The attempt to reconnect failed, %d retries remaining",
mNumRetriesLeft);
return;
}
}