diff options
| author | Keith Mok <kmok@cyngn.com> | 2016-01-06 14:55:28 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-01-06 17:42:54 -0800 |
| commit | 02645bf17d4ab34100130cdee3d484f47a590c88 (patch) | |
| tree | 0f72a2309c42cf13c732388af20ae682d28683e1 /media/libmediaplayerservice | |
| parent | c20f75882a9af6bd5c7e94c24647453a13cd1d41 (diff) | |
| download | frameworks_av-02645bf17d4ab34100130cdee3d484f47a590c88.zip frameworks_av-02645bf17d4ab34100130cdee3d484f47a590c88.tar.gz frameworks_av-02645bf17d4ab34100130cdee3d484f47a590c88.tar.bz2 | |
stagefright: Fix crash on mediaserver
CameraSource can be null when we do setupCustomVideoEncoderParams,
add a null pointer checking for it.
Change-Id: Ie28018e67d623b03bb7c3c7dbc8a92669158b84b
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/StagefrightRecorder.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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); |