diff options
| author | Keith Mok <kmok@cyngn.com> | 2016-05-12 10:19:57 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-05-12 11:34:56 -0700 |
| commit | 8436846aeb997577415288270a2e4648f2a52ded (patch) | |
| tree | 7b15914d261504a71baa92f78ee4437204bad8f1 /media/libmediaplayerservice | |
| parent | 5c7669385726b8aab6a554e31cc720e27dd446e8 (diff) | |
| download | frameworks_av-8436846aeb997577415288270a2e4648f2a52ded.zip frameworks_av-8436846aeb997577415288270a2e4648f2a52ded.tar.gz frameworks_av-8436846aeb997577415288270a2e4648f2a52ded.tar.bz2 | |
Revert "nuplayer: Fix audio EOS notifiy on AudioSink not ready"
This patch is buggy, and causing notifyConsume not called
when the buffer is erased, causing audio discontinous cannot
resume properly. This patch is not in 8994 CAF also.
FEIJ-276
This reverts commit dc5f0eb0bb08885f63a97a111b02e234efc5c413.
Change-Id: Idcb5ec9a419a979afe170d3a518ee7696a6fac6c
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp index aa9842b..8afdefe 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp @@ -857,18 +857,6 @@ bool NuPlayer::Renderer::onDrainAudioQueue() { // immediately after start. Investigate error message // "vorbis_dsp_synthesis returned -135", along with RTSP. uint32_t numFramesPlayed; - if(!mAudioSink->ready() && !mAudioQueue.empty()) { - while (!mAudioQueue.empty()) { - QueueEntry *entry = &*mAudioQueue.begin(); - if (entry->mBuffer == NULL) { - notifyEOS(true /* audio */, entry->mFinalResult); - } - mAudioQueue.erase(mAudioQueue.begin()); - entry = NULL; - } - return false; - } - if (mAudioSink->getPosition(&numFramesPlayed) != OK) { // When getPosition fails, renderer will not reschedule the draining // unless new samples are queued. |