diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-10-26 17:59:43 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-10-26 17:59:43 -0700 |
| commit | 4cd7c2de3b8b4bdf6045630aa02caea71996a56f (patch) | |
| tree | c7d99131c664b1e786183099c74733b30336c66f /media/libmediaplayerservice/nuplayer | |
| parent | 04fdb627d164cc81c8fa2830db1b20cf1261aea4 (diff) | |
| parent | 788add7a8de76ff057858021741f3988ba966b71 (diff) | |
| download | frameworks_av-4cd7c2de3b8b4bdf6045630aa02caea71996a56f.zip frameworks_av-4cd7c2de3b8b4bdf6045630aa02caea71996a56f.tar.gz frameworks_av-4cd7c2de3b8b4bdf6045630aa02caea71996a56f.tar.bz2 | |
Merge "NuPlayer: Decoder: Check for valid codec on resume"
Diffstat (limited to 'media/libmediaplayerservice/nuplayer')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp index f83eaf6..baea834 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp @@ -364,7 +364,14 @@ void NuPlayer::Decoder::onResume(bool notifyComplete) { if (notifyComplete) { mResumePending = true; } - mCodec->start(); + + if (mCodec != NULL) { + mCodec->start(); + } else { + ALOGW("Decoder %s onResume without a valid codec object", + mComponentName.c_str()); + handleError(NO_INIT); + } } void NuPlayer::Decoder::doFlush(bool notifyComplete) { |