Merge branch 'LA.BF64.1.2.2_rb4.7' of git://codeaurora.org/platform/frameworks/av into cm-13.0

Change-Id: Ia41df61c3ccfeb809572b63a4b1a8ca6bd85dfb2

7 files changed, 76 insertions, 7 deletions

diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index ebe8046..213d4e2 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -2098,7 +2098,11 @@ status_t ACodec::configureCodec(
             }
             err = setupG711Codec(encoder, sampleRate, numChannels);
         }
+#ifdef QTI_FLAC_DECODER
     } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_FLAC) && encoder) {
+#else
+    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_FLAC)) {
+#endif
         int32_t numChannels = 0, sampleRate = 0, compressionLevel = -1;
         if (encoder &&
                 (!msg->findInt32("channel-count", &numChannels)
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk
index 6c37819..5a75269 100644
--- a/media/libstagefright/Android.mk
+++ b/media/libstagefright/Android.mk
@@ -156,6 +156,11 @@ LOCAL_SHARED_LIBRARIES += \
 
 LOCAL_CFLAGS += -Wno-multichar -Werror -Wno-error=deprecated-declarations -Wall
 
+ifeq ($(TARGET_USES_QCOM_BSP), true)
+    LOCAL_C_INCLUDES += $(call project-path-for,qcom-display)/libgralloc
+    LOCAL_CFLAGS += -DQTI_BSP
+endif
+
 # enable experiments only in userdebug and eng builds
 ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
 LOCAL_CFLAGS += -DENABLE_STAGEFRIGHT_EXPERIMENTS
@@ -165,6 +170,12 @@ ifeq ($(TARGET_BOARD_PLATFORM),omap4)
 LOCAL_CFLAGS += -DBOARD_CANT_REALLOCATE_OMX_BUFFERS
 endif
 
+ifeq ($(call is-vendor-board-platform,QCOM),true)
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_EXTN_FLAC_DECODER)),true)
+    LOCAL_CFLAGS += -DQTI_FLAC_DECODER
+endif
+endif
+
 LOCAL_CLANG := true
 
 ifeq ($(BOARD_USE_SAMSUNG_CAMERAFORMAT_NV21), true)
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index 926833f..7f7ddf7 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -2231,7 +2231,9 @@ status_t MPEG4Writer::Track::threadEntry() {
     MediaBuffer *buffer;
     const char *trackName = mIsAudio ? "Audio" : "Video";
     while (!mDone && (err = mSource->read(&buffer)) == OK) {
-        if (buffer->range_length() == 0) {
+        if (buffer == NULL) {
+            continue;
+        } else if (buffer->range_length() == 0) {
             buffer->release();
             buffer = NULL;
             ++nZeroLengthFrames;
diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index 45e9a79..b6bea65 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -872,6 +872,8 @@ status_t MediaCodec::getBufferAndFormat(
             }
             *format = info.mFormat;
         }
+    } else {
+        return BAD_INDEX;
     }
     return OK;
 }
@@ -988,6 +990,9 @@ bool MediaCodec::handleDequeueOutputBuffer(const sp<AReplyToken> &replyID, bool
         if (omxFlags & OMX_BUFFERFLAG_EXTRADATA) {
             flags |= BUFFER_FLAG_EXTRADATA;
         }
+        if (omxFlags & OMX_BUFFERFLAG_DATACORRUPT) {
+            flags |= BUFFER_FLAG_DATACORRUPT;
+        }
 
         response->setInt32("flags", flags);
         response->postReply(replyID);
@@ -2635,6 +2640,9 @@ void MediaCodec::onOutputBufferAvailable() {
         if (omxFlags & OMX_BUFFERFLAG_EOS) {
             flags |= BUFFER_FLAG_EOS;
         }
+        if (omxFlags & OMX_BUFFERFLAG_DATACORRUPT) {
+            flags |= BUFFER_FLAG_DATACORRUPT;
+        }
 
         msg->setInt32("flags", flags);
 
diff --git a/media/libstagefright/SurfaceMediaSource.cpp b/media/libstagefright/SurfaceMediaSource.cpp
index 7da5a9f..147eb45 100644
--- a/media/libstagefright/SurfaceMediaSource.cpp
+++ b/media/libstagefright/SurfaceMediaSource.cpp
@@ -35,6 +35,9 @@
 #include <utils/String8.h>
 
 #include <private/gui/ComposerService.h>
+#if QTI_BSP
+#include <gralloc_priv.h>
+#endif
 
 namespace android {
 
@@ -59,8 +62,12 @@ SurfaceMediaSource::SurfaceMediaSource(uint32_t bufferWidth, uint32_t bufferHeig
 
     BufferQueue::createBufferQueue(&mProducer, &mConsumer);
     mConsumer->setDefaultBufferSize(bufferWidth, bufferHeight);
-    mConsumer->setConsumerUsageBits(GRALLOC_USAGE_HW_VIDEO_ENCODER |
-            GRALLOC_USAGE_HW_TEXTURE);
+    mConsumer->setConsumerUsageBits(GRALLOC_USAGE_HW_VIDEO_ENCODER
+            | GRALLOC_USAGE_HW_TEXTURE
+#if QTI_BSP
+            | GRALLOC_USAGE_PRIVATE_WFD
+#endif
+            );
 
     sp<ISurfaceComposer> composer(ComposerService::getComposerService());
 
diff --git a/media/libstagefright/include/SimpleSoftOMXComponent.h b/media/libstagefright/include/SimpleSoftOMXComponent.h
index 591b38e..6a0a958 100644
--- a/media/libstagefright/include/SimpleSoftOMXComponent.h
+++ b/media/libstagefright/include/SimpleSoftOMXComponent.h
@@ -140,6 +140,7 @@ private:
     void onPortFlush(OMX_U32 portIndex, bool sendFlushComplete);
 
     void checkTransitions();
+    void onTransitionError();
 
     DISALLOW_EVIL_CONSTRUCTORS(SimpleSoftOMXComponent);
 };
diff --git a/media/libstagefright/omx/SimpleSoftOMXComponent.cpp b/media/libstagefright/omx/SimpleSoftOMXComponent.cpp
index e6a0c49..1fd0641 100644
--- a/media/libstagefright/omx/SimpleSoftOMXComponent.cpp
+++ b/media/libstagefright/omx/SimpleSoftOMXComponent.cpp
@@ -417,16 +417,43 @@ void SimpleSoftOMXComponent::onSendCommand(
     }
 }
 
+void SimpleSoftOMXComponent::onTransitionError() {
+    mState = OMX_StateInvalid;
+    mTargetState = OMX_StateInvalid;
+    notify(OMX_EventError, OMX_CommandStateSet, OMX_StateInvalid, 0);
+}
+
 void SimpleSoftOMXComponent::onChangeState(OMX_STATETYPE state) {
+    bool skipTransitions = false;
+
     // We shouldn't be in a state transition already.
-    CHECK_EQ((int)mState, (int)mTargetState);
+    if (mState != mTargetState) {
+        // Workaround to prevent assertion
+        // XXX CHECK_EQ((int)mState, (int)mTargetState);
+        ALOGW("mState %d != mTargetState %d", mState, mTargetState);
+        skipTransitions = true;
+        onTransitionError();
+    }
 
     switch (mState) {
         case OMX_StateLoaded:
-            CHECK_EQ((int)state, (int)OMX_StateIdle);
+            if (state != OMX_StateIdle) {
+                // Workaround to prevent assertion
+                // XXX CHECK_EQ((int)state, (int)OMX_StateIdle);
+                ALOGW("In OMX_StateLoaded, state %d != OMX_StateIdle", state);
+                skipTransitions = true;
+                onTransitionError();
+            }
             break;
         case OMX_StateIdle:
-            CHECK(state == OMX_StateLoaded || state == OMX_StateExecuting);
+            if (!(state == OMX_StateLoaded || state == OMX_StateExecuting)) {
+                // Workaround to prevent assertion
+                // XXX CHECK(state == OMX_StateLoaded || state == OMX_StateExecuting);
+                ALOGW("In OMX_StateIdle, state %d != OMX_StateLoaded||OMX_StateExecuting",
+                      state);
+                skipTransitions = true;
+                onTransitionError();
+            }
             break;
         case OMX_StateExecuting:
         {
@@ -440,11 +467,20 @@ void SimpleSoftOMXComponent::onChangeState(OMX_STATETYPE state) {
             notify(OMX_EventCmdComplete, OMX_CommandStateSet, state, NULL);
             break;
         }
-
+        case OMX_StateInvalid: {
+            ALOGW("In OMX_StateInvalid, ignore state transition to %d", state);
+            skipTransitions = true;
+            onTransitionError();
+            break;
+        }
         default:
             TRESPASS();
     }
 
+    if (skipTransitions) {
+        return;
+    }
+
     mTargetState = state;
 
     checkTransitions();