From bb9319b7254ef2e72c7473ad186618f6690e714f Mon Sep 17 00:00:00 2001
From: Paras Nagda <pnagda@codeaurora.org>
Date: Fri, 17 Oct 2014 13:15:03 +0530
Subject: MPEG4Writer: Fix MediaServer crash in MM Stress test.

  - Media Server crash is happening while accessing
    codecspecific data at the end of recording since
    stopRecording is issued from script even before
    codec spefic data is returned from encoder.
  - Size check is added to prevent accessing
    codecspecific data in this case.

 CRs-Fixed: 732893

Change-Id: I77ce3c02c76c4d3cc4345d761ad505090ef29530
---
 media/libstagefright/MPEG4Writer.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'media/libstagefright/MPEG4Writer.cpp')

diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index ed22ade..26686ab 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -2734,6 +2734,11 @@ void MPEG4Writer::Track::writeTrackHeader(bool use32BitOffset) {
     ALOGV("%s track time scale: %d",
         mIsAudio? "Audio": "Video", mTimeScale);
 
+    if (mMdatSizeBytes == 0) {
+        ALOGW("Track data is not available.");
+        return;
+    }
+
     uint32_t now = getMpeg4Time();
     mOwner->beginBox("trak");
         writeTkhdBox(now);
-- 
cgit v1.1