summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2014-10-20 00:23:46 -0700
committerSteve Kondik <shade@chemlab.org>2014-10-20 13:54:37 -0700
commitf8a7a34dab68b8c91d2edc2fc7172e62a43b616a (patch)
treeacde54677c44d62297ed4cb179cd857e0c890ed1
parenta64683d281909c2abe7ecf32a819e7256aaa36f1 (diff)
downloadframeworks_av-f8a7a34dab68b8c91d2edc2fc7172e62a43b616a.tar.gz
frameworks_av-f8a7a34dab68b8c91d2edc2fc7172e62a43b616a.tar.bz2
frameworks_av-f8a7a34dab68b8c91d2edc2fc7172e62a43b616a.zip
stagefright: Fix crash if PCM offload gets a null source
Change-Id: I4db08355fb132288cec2ba99ec4dcb77f1618add
-rw-r--r--media/libstagefright/AwesomePlayer.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index cc152d8385..0787554ed6 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -1931,7 +1931,9 @@ status_t AwesomePlayer::initAudioDecoder() {
mAudioSource = mAudioTrack;
#ifndef QCOM_DIRECTTRACK
} else {
- mOmxSource->getFormat()->setInt32(kKeySampleBits, 16);
+ if (mOmxSource != NULL) {
+ mOmxSource->getFormat()->setInt32(kKeySampleBits, 16);
+ }
mAudioSource = mOmxSource;
#endif
}