resolved conflicts for merge of 3d630e86 to master

Change-Id: I9eb7b7c1668b5f0de85ec8b1e9257cf1ec4d8b9e

diff --cc media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 0059dc8,93ab704..03aa42e
--- 1/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
--- 2/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@@ -461,13 -461,26 +461,26 @@@ void NuPlayer::onMessageReceived(const 
  
          case kWhatReset:
          {
 -            LOGV("kWhatReset");
 +            ALOGV("kWhatReset");
  
+             if (mRenderer != NULL) {
+                 // There's an edge case where the renderer owns all output
+                 // buffers and is paused, therefore the decoder will not read
+                 // more input data and will never encounter the matching
+                 // discontinuity. To avoid this, we resume the renderer.
+ 
+                 if (mFlushingAudio == AWAITING_DISCONTINUITY
+                         || mFlushingVideo == AWAITING_DISCONTINUITY) {
+                     mRenderer->resume();
+                 }
+             }
+ 
              if (mFlushingAudio != NONE || mFlushingVideo != NONE) {
                  // We're currently flushing, postpone the reset until that's
                  // completed.
  
-                 ALOGV("postponing reset");
 -                LOGV("postponing reset mFlushingAudio=%d, mFlushingVideo=%d",
 -                        mFlushingAudio, mFlushingVideo);
++                ALOGV("postponing reset mFlushingAudio=%d, mFlushingVideo=%d",
++                      mFlushingAudio, mFlushingVideo);
  
                  mResetPostponed = true;
                  break;

diff --cc media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
index 1731728,0cb7f45..d0d9ca6
--- 1/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
--- 2/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
@@@ -628,6 -628,9 +628,9 @@@ void NuPlayer::Renderer::onPause() 
          mAudioSink->pause();
      }
  
 -    LOGV("now paused audio queue has %d entries, video has %d entries",
 -         mAudioQueue.size(), mVideoQueue.size());
++    ALOGV("now paused audio queue has %d entries, video has %d entries",
++          mAudioQueue.size(), mVideoQueue.size());
+ 
      mPaused = true;
  }