summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2015-02-04 13:37:18 -0800
committerChong Zhang <chz@google.com>2015-02-04 13:38:59 -0800
commit341ab6eebb6a992ec7bdf095420cf82bcab1c6b3 (patch)
treebc31f63e34f4a74a7bf679786e5a9af005348ed3 /media/libmediaplayerservice/nuplayer
parent77f877f82733263bca825b92a3f4537caafabf74 (diff)
downloadframeworks_av-341ab6eebb6a992ec7bdf095420cf82bcab1c6b3.zip
frameworks_av-341ab6eebb6a992ec7bdf095420cf82bcab1c6b3.tar.gz
frameworks_av-341ab6eebb6a992ec7bdf095420cf82bcab1c6b3.tar.bz2
reuse CCDecoder on video discontinuity
bug: 19266084 Change-Id: I06ef57b09b048a85f77be4dee27599c4f60aacc9
Diffstat (limited to 'media/libmediaplayerservice/nuplayer')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayer.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index e02a2d5..3b472a2 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -1185,7 +1185,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);