Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04d2804a authored by Chong Zhang's avatar Chong Zhang Committed by Android Git Automerger
Browse files

am 13cfe85a: Merge "reuse CCDecoder on video discontinuity" into lmp-mr1-dev 

* commit '13cfe85a':
  reuse CCDecoder on video discontinuity
parents bcd22f0f 13cfe85a

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+3 −1
Original line number Diff line number Diff line
@@ -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());

        if (mCCDecoder == NULL) {

            mCCDecoder = new CCDecoder(ccNotify);

        }



        if (mSourceFlags & Source::FLAG_SECURE) {

            format->setInt32("secure", true);