diff options
author | Haynes Mathew George <hgeorge@codeaurora.org> | 2015-12-01 12:29:21 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2015-12-19 02:46:24 -0500 |
commit | 5ce76a865484cd1241e8088ff4a6982bb17f3867 (patch) | |
tree | 760b48f2f2e5bdf8f7425097cacf82c86beeb766 /media/libmediaplayerservice/nuplayer/NuPlayer.cpp | |
parent | ce4e90394c5c4ccf79678fa3c4b32ffd63cd3bf1 (diff) | |
download | frameworks_av-5ce76a865484cd1241e8088ff4a6982bb17f3867.zip frameworks_av-5ce76a865484cd1241e8088ff4a6982bb17f3867.tar.gz frameworks_av-5ce76a865484cd1241e8088ff4a6982bb17f3867.tar.bz2 |
Revert "NuPlayer: Teardown sequence for pcm offload"
This reverts commit 00208bc4c6d725ea9ce0795a897d42b5a32360c3.
CRs-Fixed: 941002
Change-Id: I22c9954fc3ed3207f218dde0c02f7dddc8751df9
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayer.cpp')
-rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 47 |
1 files changed, 0 insertions, 47 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; } |