fixup! [MM] Handle buffering and playback

- Avoid buffer request after receiving EOS packet from demuxer
- Print stream type in log.

Reference:
https://review.tizen.org/gerrit/280824
https://review.tizen.org/gerrit/276725
https://review.tizen.org/gerrit/276751

Change-Id: I9cbf51908585e29df9fe0f7ab2ca55039b2d8eb9
Signed-off-by: Venugopal S M <sm.venugopal@samsung.com>

diff --git a/media/mojo/clients/mojo_demuxer_stream_impl.cc b/media/mojo/clients/mojo_demuxer_stream_impl.cc
index d2b82fb..a988cb4 100644 (file)
--- a/media/mojo/clients/mojo_demuxer_stream_impl.cc
+++ b/media/mojo/clients/mojo_demuxer_stream_impl.cc
@@ -87,7 +87,8 @@ void MojoDemuxerStreamImpl::OnBufferReady(ReadCallback callback,
 
 #if defined(TIZEN_MULTIMEDIA)
   if (status == Status::kNeedBuffer) {
-    LOG(INFO) << __func__ << ": kNeedBuffer!";
+    LOG(INFO) << __func__ << " (" << media::DemuxerStream::GetTypeName(stream_->type())
+              << ") kNeedBuffer!";
     std::move(callback).Run(Status::kNeedBuffer, mojom::DecoderBufferPtr(),
                             audio_config, video_config);
     return;

diff --git a/tizen_src/chromium_impl/media/filters/media_player_esplusplayer.cc b/tizen_src/chromium_impl/media/filters/media_player_esplusplayer.cc
index 1f94e87..4b15096 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/media_player_esplusplayer.cc
+++ b/tizen_src/chromium_impl/media/filters/media_player_esplusplayer.cc
@@ -709,7 +709,7 @@ void MediaPlayerESPlusPlayer::ReadBuffer(DemuxerStream::Type type) {
     return;
 
   // Avoid unnecessary or redundant read requests.
-  if (!ShouldFeed(type) || ReadRequested(type))
+  if (!ShouldFeed(type) || ReadRequested(type) || IsEos(type))
     return;
 
   SetReadRequested(type, true);