commit d5172468321f09db54a0bac492d56696a90cfb39
author Eugene Mutavchi <Ievgen_Mutavchi@comcast.com> Fri Jan 22 13:33:21 2021 +0000
committer Eugene Mutavchi <Ievgen_Mutavchi@comcast.com> Fri Jan 22 13:33:21 2021 +0000
tree 42571a61a83b4cbb0688093fe1de6905cd37fed3
parent e59b1e680d864c0fe593c2b967f0990825df5d34

Force player stop

Change-Id: Ieef138fd9f61a896999fe420fbe04f767812d3c1

src/third_party/starboard/rdk/shared/libcobalt.cc

diff --git a/src/third_party/starboard/rdk/shared/libcobalt.cc b/src/third_party/starboard/rdk/shared/libcobalt.cc
index 2843b37..43263e7 100644
--- a/src/third_party/starboard/rdk/shared/libcobalt.cc
+++ b/src/third_party/starboard/rdk/shared/libcobalt.cc
@@ -26,6 +26,14 @@
 
 using namespace third_party::starboard::rdk::shared;
 
+namespace third_party {
+namespace starboard {
+namespace rdk {
+namespace shared {
+namespace player {
+void ForceStop();
+}}}}}
+
 namespace
 {
 
@@ -60,6 +68,7 @@
     starboard::ScopedLock lock(mutex_);
     WaitForApp(lock);
     starboard::Semaphore sem;
+    player::ForceStop();
     Application::Get()->Suspend(
       &sem,
       [](void* ctx) {

src/third_party/starboard/rdk/shared/player/player_internal.cc

diff --git a/src/third_party/starboard/rdk/shared/player/player_internal.cc b/src/third_party/starboard/rdk/shared/player/player_internal.cc
index 545f3b6..b026a0b 100644
--- a/src/third_party/starboard/rdk/shared/player/player_internal.cc
+++ b/src/third_party/starboard/rdk/shared/player/player_internal.cc
@@ -54,6 +54,14 @@
   sResumeTimestamp = time;
 }
 
+static GstElement* sPipeline = 0;
+void ForceStop() {
+  if (sPipeline) {
+      GstStructure* structure = gst_structure_new_empty("force-stop");
+      gst_element_post_message(sPipeline, gst_message_new_application(GST_OBJECT(sPipeline), structure));
+  }
+}
+
 using third_party::starboard::rdk::shared::drm::DrmSystemOcdm;
 using third_party::starboard::rdk::shared::media::CodecToGstCaps;
 
@@ -1123,9 +1131,11 @@
     while(!g_main_loop_is_running(main_loop_))
       g_usleep(1);
   }
+  sPipeline = pipeline_;
 }
 
 PlayerImpl::~PlayerImpl() {
+  sPipeline = 0;
   GST_DEBUG_OBJECT(pipeline_, "Destroying player");
   {
     ::starboard::ScopedLock lock(source_setup_mutex_);
@@ -1163,6 +1173,15 @@
   GST_TRACE("%d", SbThreadGetId());
 
   switch (GST_MESSAGE_TYPE(message)) {
+    case GST_MESSAGE_APPLICATION: {
+      const GstStructure* structure = gst_message_get_structure(message);
+      if (gst_structure_has_name(structure, "force-stop")) {
+         GST_INFO("Received Force STOP!!!");
+         self->ChangePipelineState(GST_STATE_NULL);
+      }
+      break;
+    }
+
     case GST_MESSAGE_EOS:
       if (GST_MESSAGE_SRC(message) == GST_OBJECT(self->pipeline_)) {
         GST_INFO("EOS");
@@ -1484,8 +1503,10 @@
   static constexpr int kAsyncSourceFinishTimeMs = 50;
   int timeout = kAsyncSourceFinishTimeMs;
   SbTime diff = SbTimeGetMonotonicNow()- sResumeTimestamp;
-  if (diff < kSbTimeSecond)
+  if (diff < kSbTimeSecond) {
      timeout = std::max(timeout, int((kSbTimeSecond - diff) / kSbTimeMillisecond));
+     GST_INFO("Adjusted timeout = %d", timeout);
+  }
   GSource* src = g_timeout_source_new(timeout);
   g_source_set_callback(src, &PlayerImpl::FinishSourceSetup, self, nullptr);
   self->source_setup_id_ = g_source_attach(src, self->main_loop_context_);