diff options
| author | Chong Zhang <chz@google.com> | 2015-02-06 13:31:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-06 13:31:55 +0000 |
| commit | abc4872bb8af6699c8c5fc285a538bf492c51748 (patch) | |
| tree | bb46235d2708cb576ff451b13a10b4698ab4500b /media/libmediaplayerservice | |
| parent | 5549bb5b651db8465ac846b3490eee9378253a76 (diff) | |
| parent | 78a0d1acd4cb7103bba349f8a23fd1814bed483b (diff) | |
| download | frameworks_av-abc4872bb8af6699c8c5fc285a538bf492c51748.zip frameworks_av-abc4872bb8af6699c8c5fc285a538bf492c51748.tar.gz frameworks_av-abc4872bb8af6699c8c5fc285a538bf492c51748.tar.bz2 | |
am 78a0d1ac: am 04d2804a: am 13cfe85a: Merge "reuse CCDecoder on video discontinuity" into lmp-mr1-dev
* commit '78a0d1acd4cb7103bba349f8a23fd1814bed483b':
reuse CCDecoder on video discontinuity
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index 1f55706..fb8dbce 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -1201,7 +1201,9 @@ status_t NuPlayer::instantiateDecoder(bool audio, sp<DecoderBase> *decoder) { CHECK(format->findString("mime", &mime)); sp<AMessage> ccNotify = new AMessage(kWhatClosedCaptionNotify, id()); - mCCDecoder = new CCDecoder(ccNotify); + if (mCCDecoder == NULL) { + mCCDecoder = new CCDecoder(ccNotify); + } if (mSourceFlags & Source::FLAG_SECURE) { format->setInt32("secure", true); |