Revert "[HbbTV] Delay prepare until play if decoder is busy"

This reverts commit 8fc2c49c91219563a7d628906eef2f6410fdfeb7.

Change-Id: Id75be4c4643075d2445bd9d2e07eba0d79cfa60c

diff --git a/tizen_src/chromium_impl/media/filters/media_player_esplusplayer.h b/tizen_src/chromium_impl/media/filters/media_player_esplusplayer.h
index 30faf87fb317be8490e48294f9fdaa3a2a2d3a7a..c8120b945369f82f7f2e52760cc5b4f19b246056 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/media_player_esplusplayer.h
+++ b/tizen_src/chromium_impl/media/filters/media_player_esplusplayer.h
@@ -166,7 +166,6 @@ class MEDIA_EXPORT MediaPlayerESPlusPlayer : public MediaPlayerTizen {
   bool is_video_hole_ = false;
   bool is_video_low_latency_ = false;
   int player_id_ = 0;
-  bool is_paused_ = true;
   // first -> pts, second -> duration
   base::StaticMap<DemuxerStream::Type,
                   std::pair<base::TimeDelta, base::TimeDelta>,
@@ -220,6 +219,7 @@ class MEDIA_EXPORT MediaPlayerESPlusPlayer : public MediaPlayerTizen {
   double pending_playback_rate_ = 0.0;
   bool is_prepared_ = false;
   bool is_preparing_ = false;
+  bool is_paused_ = true;
   bool is_buffering_ = false;
   base::TimeDelta current_position_;
 

diff --git a/tizen_src/chromium_impl/media/filters/media_player_esplusplayer_tv.cc b/tizen_src/chromium_impl/media/filters/media_player_esplusplayer_tv.cc
index a1c7c624b35ac7325983459ee529f7a98b1eb9ed..a8b09dccd03e792df249fe90394b9754a40274e0 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/media_player_esplusplayer_tv.cc
+++ b/tizen_src/chromium_impl/media/filters/media_player_esplusplayer_tv.cc
@@ -124,21 +124,7 @@ bool MediaPlayerESPlusPlayerTV::Play() {
   auto dec_name = content::kNoneDecoder;
   if (td_ptr) {
     dec_name = td_ptr->GetDecoderType();
-    if (!td_ptr->IsOwnerTheSame(content::DecoderOwner(this))) {
-      bool media_resource_acquired = false;
-      GetMediaPlayerClient()->NotifyPlaybackState(
-          kPlaybackVideoReady, GetPlayerId(), "", "", &media_resource_acquired,
-          NULL, NULL, dec_name);
-      if (!media_resource_acquired) {
-        LOG_ID(INFO, GetPlayerId()) << "HbbTV media resource was not acquired";
-      } else {
-        SetDecoderAcquired(td_ptr->GetDecoderType());
-        MediaPlayerESPlusPlayer::Prepare();
-        // Clear is_paused_ so that playback will start when prepare completes
-        is_paused_ = false;
-      }
-      return false;
-    }
+    SetDecoderAcquired(td_ptr->GetDecoderType());
   }
   if (GetMediaPlayerClient()) {
     bool media_resource_acquired = false;
@@ -194,13 +180,10 @@ void MediaPlayerESPlusPlayerTV::Prepare() {
       ChooseDecoderIfNeeded(video_config.codec());
       if (auto td_ptr = suitable_decoder_.lock()) {
         decoder_assigned_ = true;
-        if (td_ptr->IsOwnerTheSame(content::DecoderOwner(this))) {
-          // Decoder resource is acquired, we can prepare the player
-          MediaPlayerESPlusPlayer::Prepare();
-        }
       }
     }
   }
+  MediaPlayerESPlusPlayer::Prepare();
 }
 
 void MediaPlayerESPlusPlayerTV::Release() {