From 02645bf17d4ab34100130cdee3d484f47a590c88 Mon Sep 17 00:00:00 2001
From: Keith Mok <kmok@cyngn.com>
Date: Wed, 6 Jan 2016 14:55:28 -0800
Subject: stagefright: Fix crash on mediaserver

CameraSource can be null when we do setupCustomVideoEncoderParams,
add a null pointer checking for it.

Change-Id: Ie28018e67d623b03bb7c3c7dbc8a92669158b84b
---
 media/libmediaplayerservice/StagefrightRecorder.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'media/libmediaplayerservice')

diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index 189bf8f..c4c5741 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -1626,7 +1626,9 @@ status_t StagefrightRecorder::setupVideoEncoder(
     format->setInt32("frame-rate", mFrameRate);
     format->setInt32("i-frame-interval", mIFramesIntervalSec);
 
-    setupCustomVideoEncoderParams(cameraSource, format);
+    if (cameraSource != NULL) {
+        setupCustomVideoEncoderParams(cameraSource, format);
+    }
 
     if (mVideoTimeScale > 0) {
         format->setInt32("time-scale", mVideoTimeScale);
-- 
cgit v1.1