diff options
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 47 | ||||
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.h | 2 |
2 files changed, 0 insertions, 49 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index 1d3ea45..72dda5c 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -1118,12 +1118,6 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { int32_t reason; CHECK(msg->findInt32("reason", &reason)); ALOGV("Tear down audio with reason %d.", reason); - - if (ifDecodedPCMOffload()) { - tearDownPCMOffload(msg); - break; - } - mAudioDecoder.clear(); ++mAudioDecoderGeneration; bool needsToCreateAudioDecoder = true; @@ -2448,47 +2442,6 @@ void NuPlayer::Source::onMessageReceived(const sp<AMessage> & /* msg */) { TRESPASS(); } -void NuPlayer::tearDownPCMOffload(const sp<AMessage> &msg) { - int32_t reason; - CHECK(msg->findInt32("reason", &reason)); - - if (mAudioDecoder != NULL) { - switch (mFlushingAudio) { - case NONE: - case FLUSHING_DECODER: - mDeferredActions.push_back( - new FlushDecoderAction(FLUSH_CMD_SHUTDOWN /* audio */, - FLUSH_CMD_NONE /* video */)); - - if (reason == Renderer::kDueToError) { - mDeferredActions.push_back( - new InstantiateDecoderAction(true /* audio */, &mAudioDecoder)); - } - - int64_t positionUs; - if (!msg->findInt64("positionUs", &positionUs)) { - positionUs = mPreviousSeekTimeUs; - } - mDeferredActions.push_back(new SeekAction(positionUs)); - break; - default: - ALOGW("tearDownPCMOffload while flushing audio in %d", mFlushingAudio); - break; - } - } - - if (mRenderer != NULL) { - closeAudioSink(); - mRenderer->flush( - true /* audio */, false /* notifyComplete */); - if (mVideoDecoder != NULL) { - mRenderer->flush( - false /* audio */, false /* notifyComplete */); - } - } - processDeferredActions(); -} - bool NuPlayer::ifDecodedPCMOffload() { return mOffloadDecodedPCM; } diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.h b/media/libmediaplayerservice/nuplayer/NuPlayer.h index 4ee3ffc..1c51c4b 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.h @@ -283,8 +283,6 @@ protected: void writeTrackInfo(Parcel* reply, const sp<AMessage> format) const; - void tearDownPCMOffload(const sp<AMessage> &msg); - DISALLOW_EVIL_CONSTRUCTORS(NuPlayer); }; |