From fcd3e94c075e964670d946f6ec5d82d059bf9e09 Mon Sep 17 00:00:00 2001 From: Lajos Molnar Date: Tue, 31 Mar 2015 10:06:48 -0700 Subject: mediaplayer: ensure secure decoders are instantiated before starting source Bug: 19984798 Change-Id: Iff13cf03c4ce3141380f4d7ab4a2b1045c5ce747 --- .../nuplayer/GenericSource.cpp | 43 ++++++++++++- .../libmediaplayerservice/nuplayer/GenericSource.h | 4 ++ media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 74 ++++++++++++++++++---- media/libmediaplayerservice/nuplayer/NuPlayer.h | 2 + .../nuplayer/NuPlayerSource.h | 2 + 5 files changed, 111 insertions(+), 14 deletions(-) (limited to 'media') diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp index a040343..5a31b74 100644 --- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp +++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp @@ -265,6 +265,12 @@ status_t NuPlayer::GenericSource::initFromDataSource() { } } + mBitrate = totalBitrate; + + return OK; +} + +status_t NuPlayer::GenericSource::startSources() { // Start the selected A/V tracks now before we start buffering. // Widevine sources might re-initialize crypto when starting, if we delay // this to start(), all data buffered during prepare would be wasted. @@ -279,8 +285,6 @@ status_t NuPlayer::GenericSource::initFromDataSource() { return UNKNOWN_ERROR; } - mBitrate = totalBitrate; - return OK; } @@ -415,6 +419,32 @@ void NuPlayer::GenericSource::onPrepareAsync() { | FLAG_CAN_SEEK_FORWARD | FLAG_CAN_SEEK); + if (mIsSecure) { + // secure decoders must be instantiated before starting widevine source + sp reply = new AMessage(kWhatSecureDecodersInstantiated, this); + notifyInstantiateSecureDecoders(reply); + } else { + finishPrepareAsync(); + } +} + +void NuPlayer::GenericSource::onSecureDecodersInstantiated(status_t err) { + if (err != OK) { + ALOGE("Failed to instantiate secure decoders!"); + notifyPreparedAndCleanup(err); + return; + } + finishPrepareAsync(); +} + +void NuPlayer::GenericSource::finishPrepareAsync() { + status_t err = startSources(); + if (err != OK) { + ALOGE("Failed to init start data source!"); + notifyPreparedAndCleanup(err); + return; + } + if (mIsStreaming) { mPrepareBuffering = true; @@ -430,6 +460,7 @@ void NuPlayer::GenericSource::notifyPreparedAndCleanup(status_t err) { mDataSource.clear(); mCachedSource.clear(); mHttpSource.clear(); + mBitrate = -1; cancelPollBuffering(); } @@ -805,6 +836,14 @@ void NuPlayer::GenericSource::onMessageReceived(const sp &msg) { break; } + case kWhatSecureDecodersInstantiated: + { + int32_t err; + CHECK(msg->findInt32("err", &err)); + onSecureDecodersInstantiated(err); + break; + } + case kWhatStopWidevine: { // mStopRead is only used for Widevine to prevent the video source diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.h b/media/libmediaplayerservice/nuplayer/GenericSource.h index 5fc41ec..862ee5f 100644 --- a/media/libmediaplayerservice/nuplayer/GenericSource.h +++ b/media/libmediaplayerservice/nuplayer/GenericSource.h @@ -96,6 +96,7 @@ private: kWhatStopWidevine, kWhatStart, kWhatResume, + kWhatSecureDecodersInstantiated, }; struct Track { @@ -158,6 +159,9 @@ private: void setDrmPlaybackStatusIfNeeded(int playbackStatus, int64_t position); void notifyPreparedAndCleanup(status_t err); + void onSecureDecodersInstantiated(status_t err); + void finishPrepareAsync(); + status_t startSources(); void onGetFormatMeta(sp msg) const; sp doGetFormatMeta(bool audio) const; diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index f4d3794..cfa5258 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -1021,22 +1021,40 @@ void NuPlayer::onResume() { } } -void NuPlayer::onStart() { - mOffloadAudio = false; - mAudioEOS = false; - mVideoEOS = false; - mStarted = true; +status_t NuPlayer::onInstantiateSecureDecoders() { + status_t err; + if (!(mSourceFlags & Source::FLAG_SECURE)) { + return BAD_TYPE; + } - /* instantiate decoders now for secure playback */ - if (mSourceFlags & Source::FLAG_SECURE) { - if (mNativeWindow != NULL) { - instantiateDecoder(false, &mVideoDecoder); + if (mRenderer != NULL) { + ALOGE("renderer should not be set when instantiating secure decoders"); + return UNKNOWN_ERROR; + } + + // TRICKY: We rely on mRenderer being null, so that decoder does not start requesting + // data on instantiation. + if (mNativeWindow != NULL) { + err = instantiateDecoder(false, &mVideoDecoder); + if (err != OK) { + return err; } + } - if (mAudioSink != NULL) { - instantiateDecoder(true, &mAudioDecoder); + if (mAudioSink != NULL) { + err = instantiateDecoder(true, &mAudioDecoder); + if (err != OK) { + return err; } } + return OK; +} + +void NuPlayer::onStart() { + mOffloadAudio = false; + mAudioEOS = false; + mVideoEOS = false; + mStarted = true; mSource->start(); @@ -1390,7 +1408,7 @@ void NuPlayer::flushDecoder(bool audio, bool needShutdown) { FlushStatus newStatus = needShutdown ? FLUSHING_DECODER_SHUTDOWN : FLUSHING_DECODER; - mFlushComplete[audio][false /* isDecoder */] = false; + mFlushComplete[audio][false /* isDecoder */] = (mRenderer == NULL); mFlushComplete[audio][true /* isDecoder */] = false; if (audio) { ALOGE_IF(mFlushingAudio != NONE, @@ -1675,6 +1693,23 @@ void NuPlayer::onSourceNotify(const sp &msg) { CHECK(msg->findInt32("what", &what)); switch (what) { + case Source::kWhatInstantiateSecureDecoders: + { + if (mSource == NULL) { + // This is a stale notification from a source that was + // asynchronously preparing when the client called reset(). + // We handled the reset, the source is gone. + break; + } + + sp reply; + CHECK(msg->findMessage("reply", &reply)); + status_t err = onInstantiateSecureDecoders(); + reply->setInt32("err", err); + reply->post(); + break; + } + case Source::kWhatPrepared: { if (mSource == NULL) { @@ -1687,6 +1722,14 @@ void NuPlayer::onSourceNotify(const sp &msg) { int32_t err; CHECK(msg->findInt32("err", &err)); + if (err != OK) { + // shut down potential secure codecs in case client never calls reset + mDeferredActions.push_back( + new FlushDecoderAction(FLUSH_CMD_SHUTDOWN /* audio */, + FLUSH_CMD_SHUTDOWN /* video */)); + processDeferredActions(); + } + sp driver = mDriver.promote(); if (driver != NULL) { // notify duration first, so that it's definitely set when @@ -1971,6 +2014,13 @@ void NuPlayer::Source::notifyPrepared(status_t err) { notify->post(); } +void NuPlayer::Source::notifyInstantiateSecureDecoders(const sp &reply) { + sp notify = dupNotify(); + notify->setInt32("what", kWhatInstantiateSecureDecoders); + notify->setMessage("reply", reply); + notify->post(); +} + void NuPlayer::Source::onMessageReceived(const sp & /* msg */) { TRESPASS(); } diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.h b/media/libmediaplayerservice/nuplayer/NuPlayer.h index a2cb53e..2bc20d7 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.h @@ -204,6 +204,8 @@ private: status_t instantiateDecoder(bool audio, sp *decoder); + status_t onInstantiateSecureDecoders(); + void updateVideoSize( const sp &inputFormat, const sp &outputFormat = NULL); diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerSource.h b/media/libmediaplayerservice/nuplayer/NuPlayerSource.h index 5a8beb1..d9f14a2 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerSource.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayerSource.h @@ -55,6 +55,7 @@ struct NuPlayer::Source : public AHandler { kWhatTimedTextData, kWhatQueueDecoderShutdown, kWhatDrmNoLicense, + kWhatInstantiateSecureDecoders, }; // The provides message is used to notify the player about various @@ -125,6 +126,7 @@ protected: void notifyFlagsChanged(uint32_t flags); void notifyVideoSizeChanged(const sp &format = NULL); + void notifyInstantiateSecureDecoders(const sp &reply); void notifyPrepared(status_t err = OK); private: -- cgit v1.1