diff options
| author | Andreas Huber <andih@google.com> | 2012-08-28 11:11:47 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-28 11:11:48 -0700 |
| commit | 3a1d5240f3dcf0f3538549cc94c63fde8b216762 (patch) | |
| tree | 52b1e1c29f0dc816587ddeceb6cbf009ad620751 /media/libstagefright | |
| parent | eccfd92954c1c79bd8e71b9d3df9314d0e93d287 (diff) | |
| parent | a7607a7f97b3136d5e61c0bca63760bf9fc05b19 (diff) | |
| download | frameworks_av-3a1d5240f3dcf0f3538549cc94c63fde8b216762.zip frameworks_av-3a1d5240f3dcf0f3538549cc94c63fde8b216762.tar.gz frameworks_av-3a1d5240f3dcf0f3538549cc94c63fde8b216762.tar.bz2 | |
Merge "Fix retries when server doesn't support range requests." into jb-mr1-dev
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/NuCachedSource2.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/media/libstagefright/NuCachedSource2.cpp b/media/libstagefright/NuCachedSource2.cpp index f1075b1..05e599b 100644 --- a/media/libstagefright/NuCachedSource2.cpp +++ b/media/libstagefright/NuCachedSource2.cpp @@ -298,7 +298,9 @@ void NuCachedSource2::fetchInternal() { Mutex::Autolock autoLock(mLock); - if (err == ERROR_UNSUPPORTED) { + if (err == ERROR_UNSUPPORTED || err == -EPIPE) { + // These are errors that are not likely to go away even if we + // retry, i.e. the server doesn't support range requests or similar. mNumRetriesLeft = 0; return; } else if (err != OK) { @@ -317,8 +319,14 @@ void NuCachedSource2::fetchInternal() { Mutex::Autolock autoLock(mLock); if (n < 0) { - ALOGE("source returned error %ld, %d retries left", n, mNumRetriesLeft); mFinalStatus = n; + if (n == ERROR_UNSUPPORTED || n == -EPIPE) { + // These are errors that are not likely to go away even if we + // retry, i.e. the server doesn't support range requests or similar. + mNumRetriesLeft = 0; + } + + ALOGE("source returned error %ld, %d retries left", n, mNumRetriesLeft); mCache->releasePage(page); } else if (n == 0) { ALOGI("ERROR_END_OF_STREAM"); |