commit 8dad3f606a3112e24f0b75f2edc05be299d18c43
author Lajos Molnar <lajos@google.com> Mon Aug 25 17:55:39 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 25 17:55:39 2014 +0000
tree c21b4b41ff872066f59be1c4db3afa2c23d9c43f
parent 9c42bf257a7501491beca196a868aa260d515422
parent 87603c0dd1f4e62e52feffa8d6e960ad21f68893

Merge "NuPlayer: remember and resubmit CSDs after flush" into lmp-dev

media/libstagefright/codecs/aacdec/SoftAAC2.cpp

diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
index 90df607..8b4dd6f 100644
--- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
+++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
@@ -494,7 +494,7 @@
 }
 
 
-void SoftAAC2::onQueueFilled(OMX_U32 portIndex) {
+void SoftAAC2::onQueueFilled(OMX_U32 /* portIndex */) {
     if (mSignalledError || mOutputPortSettingsChange != NONE) {
         return;
     }
@@ -513,8 +513,7 @@
             OMX_BUFFERHEADERTYPE *inHeader = inInfo->mHeader;
 
             mEndOfInput = (inHeader->nFlags & OMX_BUFFERFLAG_EOS) != 0;
-            if (portIndex == 0 &&
-                    (inHeader->nFlags & OMX_BUFFERFLAG_CODECCONFIG) != 0) {
+            if ((inHeader->nFlags & OMX_BUFFERFLAG_CODECCONFIG) != 0) {
                 BufferInfo *inInfo = *inQueue.begin();
                 OMX_BUFFERHEADERTYPE *inHeader = inInfo->mHeader;
 

media/libstagefright/httplive/LiveSession.cpp

diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp
index 8667a6b..7b18348 100644
--- a/media/libstagefright/httplive/LiveSession.cpp
+++ b/media/libstagefright/httplive/LiveSession.cpp
@@ -1019,11 +1019,19 @@
 }
 
 size_t LiveSession::getTrackCount() const {
-    return mPlaylist->getTrackCount();
+    if (mPlaylist == NULL) {
+        return 0;
+    } else {
+        return mPlaylist->getTrackCount();
+    }
 }
 
 sp<AMessage> LiveSession::getTrackInfo(size_t trackIndex) const {
-    return mPlaylist->getTrackInfo(trackIndex);
+    if (mPlaylist == NULL) {
+        return NULL;
+    } else {
+        return mPlaylist->getTrackInfo(trackIndex);
+    }
 }
 
 status_t LiveSession::selectTrack(size_t index, bool select) {