Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f3d3856f: Merge "Check for null codec from AMediaCodec_createDecoderByType" into mnc-dev

Browse Source 
* commit 'f3d3856f3e7b76765dfef6e94a4031c008f53b99':
  Check for null codec from AMediaCodec_createDecoderByType
This commit is contained in:
Andy Hung
2015-04-30 00:48:04 +00:00
committed by Android Git Automerger
parent c7bf0a6afb f3d3856f3e
commit f388c9e654
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
media/jni/soundpool/SoundPool.cpp
View File

@@ -514,10 +514,11 @@ static status_t decode(int fd, int64_t offset, int64_t length,
if (strncmp(mime, "audio/", 6) == 0) {
AMediaCodec *codec = AMediaCodec_createDecoderByType(mime);
if (AMediaCodec_configure(codec, format,
NULL /* window */, NULL /* drm */, 0 /* flags */) != AMEDIA_OK
|| AMediaCodec_start(codec) != AMEDIA_OK
|| AMediaExtractor_selectTrack(ex, i) != AMEDIA_OK) {
if (codec == NULL
|| AMediaCodec_configure(codec, format,
NULL /* window */, NULL /* drm */, 0 /* flags */) != AMEDIA_OK
|| AMediaCodec_start(codec) != AMEDIA_OK
|| AMediaExtractor_selectTrack(ex, i) != AMEDIA_OK) {
AMediaExtractor_delete(ex);
AMediaCodec_delete(codec);
AMediaFormat_delete(format);