UpdateEventData is used to send the CSS CII data to the HbbTV UG.

Remove unused methods from tizen renderer side.

Change-Id: If53c00f2c8474c73ce297e34ecfae335f9e6f791

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 23b325d2d028360e7b8181e6b8a263fcd1e04501..2a7a9d9296e6fbd111330f5e9a9be71c11dbc188 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
@@ -560,18 +560,6 @@ void TizenRendererImpl::SetPreferTextLanguage(const std::string& lang) {
   media_player_->SetPreferTextLanguage(lang);
 }
 
-void TizenRendererImpl::UpdateEventData(std::string data) {
-  content::WebContentsDelegate* web_contents_delegate =
-      GetWebContentsDelegate();
-  if (!web_contents_delegate) {
-    LOG_ID(ERROR, player_id_) << "web_contents_delegate is null";
-    return;
-  }
-
-  web_contents_delegate->UpdateEventData(
-      static_cast<void*>(const_cast<char*>(data.c_str())));
-}
-
 void TizenRendererImpl::AudioTracksCountChanged(unsigned count) {
   if (!blink::IsHbbTV()) {
     LOG_ID(INFO, player_id_)

diff --git a/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.h b/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.h
index dcf03938041f687ca66a3822a069ee791902d6b5..d20f6fe797f3205390039d73eac64c369e0a0212 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.h
+++ b/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.h
@@ -246,7 +246,6 @@ class CONTENT_EXPORT TizenRendererImpl
   void SetActiveAudioTrack(int index) override;
   void SetActiveVideoTrack(int index) override;
   void SetPreferTextLanguage(const std::string& lang) override;
-  void UpdateEventData(std::string data);
   void PreVideoReload(int count, int player_id);
 #endif
   content::WebContents* GetWebContents() const;

diff --git a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi.h b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi.h
index d77f8f484a58d051492c144e252362e2e95bb2e6..ba55befe7dd3fa12d001f272af922eabf231d437 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi.h
+++ b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi.h
@@ -85,6 +85,7 @@ class MEDIA_EXPORT MediaPlayerBridgeCapi : public MediaPlayerTizen {
   void SetMediaPlayerClient(MediaPlayerTizenClient* client) override {
     client_ = client;
   }
+  void UpdateEventData(const std::string& data) override {}
   bool RegisterTimeline(const std::string& timeline_selector) override {
     return false;
   };

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 b5a3e97c91b178efdc5551a8deddb6145a8847c2..92fe5db5bdb7f665dd7f5b2a4e11b75c6d9575ac 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
@@ -2186,14 +2186,6 @@ void MediaPlayerBridgeCapiTV::OnOtherEvent(int event_type, void* event_data) {
         return;
       }
 
-      if (!uri.compare("urn:dvb:css")) {
-        LOG_ID(INFO, player_id_) << "event->value:" << eventstream->value
-                                 << " evalue " << value.c_str();
-        task_runner_->PostTask(
-            FROM_HERE, base::BindOnce(&MediaPlayerBridgeCapi::UpdateEventData,
-                                      weak_factory_.GetWeakPtr(), value));
-        return;
-      }
 
       const std::string info = uri + " " + value;
       task_runner_->PostTask(
@@ -2237,6 +2229,16 @@ void MediaPlayerBridgeCapiTV::OnOtherEvent(int event_type, void* event_data) {
           LOG_ID(INFO, player_id_) << "not supported scheme id uri,uri:" << uri;
           return;
         }
+
+        if (!uri.compare("urn:dvb:css")) {
+          LOG_ID(INFO, player_id_) << "CSS CII Update";
+          task_runner_->PostTask(
+              FROM_HERE,
+              base::BindOnce(&MediaPlayerBridgeCapiTV::UpdateEventData,
+                             weak_factory_.GetWeakPtr(), value));
+          return;
+        }
+
         const std::string info = uri + " " + value + "$" + data;
         task_runner_->PostTask(
             FROM_HERE,
@@ -3124,6 +3126,17 @@ void MediaPlayerBridgeCapiTV::HandlePeriodIdChange(
   }
 }
 
+void MediaPlayerBridgeCapiTV::UpdateEventData(const std::string& data) {
+  LOG(INFO) << "UpdateEventData :" << data;
+  content::WebContentsDelegate* web_contents_delegate =
+      GetMediaPlayerClient()->GetWebContentsDelegate();
+  if (!web_contents_delegate) {
+    return;
+  }
+
+  web_contents_delegate->UpdateEventData((void*)data.c_str());
+}
+
 bool MediaPlayerBridgeCapiTV::RegisterTimeline(
     const std::string& timeline_selector) {
   LOG(INFO) << "RegisterTimeline:" << timeline_selector.c_str();

diff --git a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_tv.h b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_tv.h
index 87c918a390194c19036de5b0ee201d6d8641b2d7..27dc7d77ed1c4613697bd9e812329aa8cd6e1bbc 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_tv.h
+++ b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_tv.h
@@ -160,6 +160,7 @@ class MEDIA_EXPORT MediaPlayerBridgeCapiTV : public MediaPlayerBridgeCapi {
 
 #endif
 
+  void UpdateEventData(const std::string& data) override;
   bool RegisterTimeline(const std::string& timeline_selector) override;
   void OnRegisterTimeline(const char* timeline_selector,
                           uint32_t units_per_tick,

diff --git a/tizen_src/chromium_impl/media/filters/media_player_tizen.h b/tizen_src/chromium_impl/media/filters/media_player_tizen.h
index 485f158be80035cfc7cc67a4e5dabd8336665c85..a5fd7e89a1ce5e63b9a7049666d6856f8ad3ee90 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/media_player_tizen.h
+++ b/tizen_src/chromium_impl/media/filters/media_player_tizen.h
@@ -138,7 +138,7 @@ class MEDIA_EXPORT MediaPlayerTizen {
   virtual void SetActiveAudioTrack(int index) {}
   virtual void SetActiveVideoTrack(int index) {}
   virtual void SetPreferTextLanguage(const std::string& lang) {}
-  virtual void UpdateEventData(std::string data) {}
+  virtual void UpdateEventData(const std::string& data) {}
   virtual bool RegisterTimeline(const std::string& timeline_selector) {
     return false;
   }