Fix AMR decoder am: d061b5b

am: 988aae8

* commit '988aae8467be145c0513b8f5abb0f76f87112492':
  Fix AMR decoder

diff --combined media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp
index 8ea7ab5,6fb59dd..0baf5fd
--- 1/media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp
--- 2/media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp
+++ b/media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp
@@@ -294,7 -294,7 +294,7 @@@ static size_t getFrameSize(unsigned FT
      return frameSize;
  }
  
 -void SoftAMR::onQueueFilled(OMX_U32 portIndex) {
 +void SoftAMR::onQueueFilled(OMX_U32 /* portIndex */) {
      List<BufferInfo *> &inQueue = getPortQueue(0);
      List<BufferInfo *> &outQueue = getPortQueue(1);
  
@@@ -306,13 -306,6 +306,6 @@@
          BufferInfo *inInfo = *inQueue.begin();
          OMX_BUFFERHEADERTYPE *inHeader = inInfo->mHeader;
  
-         if (inHeader->nFilledLen == 0) {
-             inInfo->mOwnedByUs = false;
-             inQueue.erase(inQueue.begin());
-             notifyEmptyBufferDone(inHeader);
-             continue;
-         }
- 
          BufferInfo *outInfo = *outQueue.begin();
          OMX_BUFFERHEADERTYPE *outHeader = outInfo->mHeader;
  
@@@ -330,6 -323,13 +323,13 @@@
              return;
          }
  
+         if (inHeader->nFilledLen == 0) {
+             inInfo->mOwnedByUs = false;
+             inQueue.erase(inQueue.begin());
+             notifyEmptyBufferDone(inHeader);
+             continue;
+         }
+ 
          if (inHeader->nOffset == 0) {
              mAnchorTimeUs = inHeader->nTimeStamp;
              mNumSamplesOutput = 0;
@@@ -489,7 -489,7 +489,7 @@@
      }
  }
  
 -void SoftAMR::onPortFlushCompleted(OMX_U32 portIndex) {
 +void SoftAMR::onPortFlushCompleted(OMX_U32 /* portIndex */) {
  }
  
  void SoftAMR::onPortEnableCompleted(OMX_U32 portIndex, bool enabled) {