From ea8c9b1bd9cd416b51b0040763af501004110fe7 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Wed, 31 Aug 2011 15:04:25 -0700 Subject: Discontinuities are only signalled on streams that have been identified, i.e. those that have a queue. This ensures that the player doesn't observe discontinuities that don't match up across streams. Also, make sure output buffers arriving from the decoder to be rendered are sent back to the decoder if we started flushing. Finally, don't parse TS packets for streams we don't support. And don't allocate memory for them. Change-Id: I708e0de4cba8110a62e4c8ceb1e5702430d5d2bb --- media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'media/libmediaplayerservice/nuplayer') diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index 1f08a91..ee77f47 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -663,6 +663,19 @@ void NuPlayer::renderBuffer(bool audio, const sp &msg) { sp reply; CHECK(msg->findMessage("reply", &reply)); + if (IsFlushingState(audio ? mFlushingAudio : mFlushingVideo)) { + // We're currently attempting to flush the decoder, in order + // to complete this, the decoder wants all its buffers back, + // so we don't want any output buffers it sent us (from before + // we initiated the flush) to be stuck in the renderer's queue. + + LOGV("we're still flushing the %s decoder, sending its output buffer" + " right back.", audio ? "audio" : "video"); + + reply->post(); + return; + } + sp obj; CHECK(msg->findObject("buffer", &obj)); -- cgit v1.1