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

Commit 355ac5a5 authored by Robert Shih's avatar Robert Shih Committed by Android (Google) Code Review
Browse files

Merge "nuplayer2: pass crypto info from extractor to decoder"

parents 04285604 f60cbe56

media/libmediaplayer2/nuplayer2/GenericSource2.cpp

+5 −0
Original line number Diff line number Diff line
@@ -1286,6 +1286,11 @@ void NuPlayer2::GenericSource2::readBuffer( 
            mVideoTimeUs = timeUs;

        }



        sp<AMediaCodecCryptoInfoWrapper> cryptInfo = extractor->getSampleCryptoInfo();

        if (cryptInfo != NULL) {

            meta->setObject("cryptInfo", cryptInfo);

        }



        queueDiscontinuityIfNeeded(seeking, formatChange, trackType, track);



        if (numBuffers == 0 && actualTimeUs != nullptr) {

media/libmediaplayer2/nuplayer2/NuPlayer2Decoder.cpp

+5 −0
Original line number Diff line number Diff line
@@ -1108,6 +1108,11 @@ bool NuPlayer2::Decoder::onInputBufferFetched(const sp<AMessage> &msg) { 
            } // buffer->data()

        } // needsCopy



        sp<RefBase> cryptInfoObj;

        if (buffer->meta()->findObject("cryptInfo", &cryptInfoObj)) {

            cryptInfo = static_cast<AMediaCodecCryptoInfoWrapper *>(cryptInfoObj.get());

        }



        status_t err;

        if (cryptInfo != NULL) {

            err = mCodec->queueSecureInputBuffer(