Revert "[HbbTV] Fix player suspend on resource conflict"

This reverts commit e133679f12a51936af4f0972e28a61cc89edf7f8.

Change-Id: Iee958468ab75ec7b826b7e14075867b1f7c6d4eb

diff --git a/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.cc b/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.cc
index c289f748c0da41498484528a71fb89a33c9e717c..bb9e833344b10a8a1a623e352be3c1a17cfbb44d 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.cc
+++ b/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.cc
@@ -1052,16 +1052,15 @@ void TizenRendererImpl::SetCallBackFrameSize(const gfx::Size& size) {
 
 void TizenRendererImpl::Activate() {
   is_suspended_by_internal_ = false;
-  is_player_can_start_ =
-      media::MediaPlayerRegistry::GetInstance()->ActivateMediaPlayer(
-          player_id_, !is_suspended_by_resource_conflicted_);
+  is_player_can_start_ = media::MediaPlayerRegistry::GetInstance()->ActivateMediaPlayer(
+        player_id_, false);
   LOG_ID(INFO, player_id_) << __func__ << " ; is_player_can_start_ : " << is_player_can_start_;
 }
 
 void TizenRendererImpl::Deactivate() {
   LOG_ID(INFO, player_id_) << __func__;
   media::MediaPlayerRegistry::GetInstance()->DeactivateMediaPlayer(
-      player_id_, !is_suspended_by_resource_conflicted_);
+        player_id_, false);
 }
 
 void TizenRendererImpl::Show() {
@@ -1071,9 +1070,8 @@ void TizenRendererImpl::Show() {
   }
 
   is_suspended_by_upper_ = false;
-  is_player_can_start_ =
-      media::MediaPlayerRegistry::GetInstance()->ActivateMediaPlayer(
-          player_id_, !is_suspended_by_resource_conflicted_);
+  is_player_can_start_ = media::MediaPlayerRegistry::GetInstance()->ActivateMediaPlayer(
+        player_id_, true);
   LOG_ID(INFO, player_id_) << __func__ << " ; is_player_can_start_ : " << is_player_can_start_;
 }
 
@@ -1169,7 +1167,7 @@ void TizenRendererImpl::OnRequestSuspend(bool resource_conflicted) {
     LOG_ID(INFO, player_id_) << " Media is already suspended by internal.";
     return;
   }
-  is_suspended_by_resource_conflicted_ = resource_conflicted;
+
   // Keep same logic with 23TV
   // capability exceed, player state will set player state &= ~State::ACTIVE in
   // other place resource conflict will set inactive here.

diff --git a/tizen_src/chromium_impl/media/filters/hardware_resource_helper.h b/tizen_src/chromium_impl/media/filters/hardware_resource_helper.h
index e018e9e1fdea0e6a98536639dd9e215c2d88edd7..087385e96213ce93c7904d0e071b9fbf27d0160e 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/hardware_resource_helper.h
+++ b/tizen_src/chromium_impl/media/filters/hardware_resource_helper.h
@@ -84,7 +84,7 @@ class DecoderOwner {
       return;
     }
 
-    player_->RequestSuspend(true);
+    player_->RequestSuspend();
   }
 
   void ReleaseAudio() {

diff --git a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_tv.cc b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_tv.cc
index 09767dc30b8accb82bc7620ac10bb454ada0db2a..18568050592fcbad20168f69c2c10457b1cbadf0 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_tv.cc
+++ b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_tv.cc
@@ -713,7 +713,7 @@ void MediaPlayerBridgeCapiTV::RequestSuspend(bool resource_conflicted) {
         << "Player already suspended. Nothing to do. Returning";
     return;
   }
-  MediaPlayerBridgeCapi::RequestSuspend(resource_conflicted);
+  MediaPlayerBridgeCapi::Suspend();
   decryptor_ = 0;
 }