Merge "[WVDRM] Fix for stuttering on low bandwidth" into jb-mr1-dev

proprietary/wvm/WVMMediaSource.cpp

@@ -35,7 +35,6 @@ WVMMediaSource::WVMMediaSource(WVSession *session, WVEsSelector esSelector,
       mIsLiveStream(isLive),
       mNewSegment(false),
       mCryptoInitialized(false),
-      mIsStalled(false),
       mStripADTS(false),
       mGroup(NULL),
       mKeyTime(0),
@@ -212,8 +211,6 @@ status_t WVMMediaSource::read(MediaBuffer **buffer, const ReadOptions *options)
 {
     Mutex::Autolock autoLock(mLock);
 
-    mIsStalled = false;
-
     CHECK(mStarted);
 
     *buffer = NULL;
@@ -342,8 +339,6 @@ status_t WVMMediaSource::read(MediaBuffer **buffer, const ReadOptions *options)
                 return ERROR_IO;
             } else {
                 // Didn't get anything, sleep a bit so we don't hog the CPU then try again
-                if (retryCount > 10)
-                    mIsStalled = true;
                 usleep(10000);
                 continue;
             }
@@ -355,15 +350,12 @@ status_t WVMMediaSource::read(MediaBuffer **buffer, const ReadOptions *options)
 
         if (seekNextSync && ((mKeyTime < seekTimeUs) || !syncFrame)) {
             // drop frames up to next sync if requested
-            mIsStalled = true;
             usleep(10000);
             mDecryptContext.Initialize(mediaBuf);
             mEncryptedSizes.clear();
             continue;
         }
 
-        mIsStalled = false;
-
         if (offset + bytesRead < mediaBuf->size())
             break;