Merge lp:~justinmcp/oxide/mediahub-fixes-1.10 into lp:oxide/1.10

[Justin McPherson]

Small fixes and some changes to increase robustness in MH audio implementation

[lp:~justinmcp/oxide/mediahub-fixes-1.10]

1194. By Justin McPherson on 2015-10-01

Fix reporting of seekable status

[Chris Coulson (chrisccoulson)]

review: Approve

=== modified file 'shared/browser/media/mediahub_player_shim.cc'
--- shared/browser/media/mediahub_player_shim.cc	2015-02-17 14:22:40 +0000
+++ shared/browser/media/mediahub_player_shim.cc	2015-10-01 23:59:09 +0000
@@ -138,9 +138,9 @@
   try {
     Player* player = static_cast<Player*>(handle);
     if (player != 0) {
-      if (player->playback_status().get() == Player::playing);
+      if (player->playback_status().get() == Player::playing) {
         player->stop();
-
+      }
       core::ubuntu::media::Player::HeadersType headers;
       if (!cookies.empty()) {
         headers["Cookie"] = cookies;
@@ -334,6 +334,19 @@
 }
 
 void
+mediahub_set_rate(MediaHubClientHandle handle, double rate)
+{
+  try {
+    Player* player = static_cast<Player*>(handle);
+    if (player) {
+      player->playback_rate().set(rate);
+    }
+  } catch (std::runtime_error& error) {
+    std::cerr << __PRETTY_FUNCTION__ << " " << error.what() << std::endl;
+  }
+}
+
+void
 mediahub_set_player_lifetime(MediaHubClientHandle handle, Lifetime lifetime)
 {
   try {
 
=== modified file 'shared/browser/media/mediahub_player_shim.h'
--- shared/browser/media/mediahub_player_shim.h	2015-02-17 14:22:40 +0000
+++ shared/browser/media/mediahub_player_shim.h	2015-10-01 23:59:09 +0000
@@ -129,6 +129,12 @@
 void
 mediahub_set_volume(MediaHubClientHandle, double volume);
 
+
+/**
+  *
+  */
+void mediahub_set_rate(MediaHubClientHandle, double rate);
+
 /**
  * Set lifetime of player session.
  */
 
=== modified file 'shared/browser/media/oxide_browser_media_player_manager.cc'
--- shared/browser/media/oxide_browser_media_player_manager.cc	2015-06-29 16:47:46 +0000
+++ shared/browser/media/oxide_browser_media_player_manager.cc	2015-10-01 23:59:09 +0000
@@ -72,6 +72,14 @@
   }
 }
 
+void BrowserMediaPlayerManager::OnSetRate(int player_id, double rate) {
+  MediaPlayer* player = GetPlayer(player_id);
+
+  if (player) {
+    player->SetRate(rate);
+  }
+}
+
 void BrowserMediaPlayerManager::OnSetPoster(int player_id, const GURL& url) {
   // To be overridden by subclasses.
 }
 
=== modified file 'shared/browser/media/oxide_browser_media_player_manager.h'
--- shared/browser/media/oxide_browser_media_player_manager.h	2015-06-30 18:35:36 +0000
+++ shared/browser/media/oxide_browser_media_player_manager.h	2015-10-01 23:59:09 +0000
@@ -52,6 +52,7 @@
   void OnSeek(int player_id, const base::TimeDelta& pos);
   void OnPause(int player_id, bool is_media_related_action);
   void OnSetVolume(int player_id, double volume);
+  void OnSetRate(int player_id, double rate);
   void OnSetPoster(int player_id, const GURL& poster);
   void OnReleaseResources(int player_id);
   void OnDestroyPlayer(int player_id);
 
=== modified file 'shared/browser/media/oxide_media_player.h'
--- shared/browser/media/oxide_media_player.h	2015-01-06 06:28:47 +0000
+++ shared/browser/media/oxide_media_player.h	2015-10-01 23:59:09 +0000
@@ -44,6 +44,8 @@
 
   // Set the player volume.
   virtual void SetVolume(double volume) = 0;
+ 
+  virtual void SetRate(double rate) = 0;
 
   // Get the media information from the player.
   virtual int GetVideoWidth() = 0;
 
=== modified file 'shared/browser/media/oxide_media_web_contents_observer.cc'
--- shared/browser/media/oxide_media_web_contents_observer.cc	2015-01-19 22:49:05 +0000
+++ shared/browser/media/oxide_media_web_contents_observer.cc	2015-10-01 23:59:09 +0000
@@ -42,6 +42,9 @@
     IPC_MESSAGE_FORWARD(OxideHostMsg_MediaPlayer_SetVolume,
                         GetMediaPlayerManager(render_frame_host),
                         BrowserMediaPlayerManager::OnSetVolume)
+    IPC_MESSAGE_FORWARD(OxideHostMsg_MediaPlayer_SetRate,
+                        GetMediaPlayerManager(render_frame_host),
+                        BrowserMediaPlayerManager::OnSetRate)
     IPC_MESSAGE_FORWARD(OxideHostMsg_MediaPlayer_SetPoster,
                         GetMediaPlayerManager(render_frame_host),
                         BrowserMediaPlayerManager::OnSetPoster)
 
=== modified file 'shared/browser/media/oxide_player_media_hub.cc'
--- shared/browser/media/oxide_player_media_hub.cc	2015-08-25 20:42:44 +0000
+++ shared/browser/media/oxide_player_media_hub.cc	2015-10-01 23:59:09 +0000
@@ -32,6 +32,7 @@
       height_(0),
       duration_(0),
       media_hub_client_(0),
+      status_(MediaHubDelegate::null),
       weak_factory_(this) {
 
   const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess();
@@ -112,11 +113,11 @@
 }
 
 base::TimeDelta MediaPlayerMediaHub::GetCurrentTime() {
-  return base::TimeDelta::FromMilliseconds(mediahub_get_position(media_hub_client_));
+  return base::TimeDelta::FromMicroseconds(mediahub_get_position(media_hub_client_) / 1000);
 }
 
 base::TimeDelta MediaPlayerMediaHub::GetDuration() {
-  return base::TimeDelta::FromMilliseconds(mediahub_get_duration(media_hub_client_));
+  return base::TimeDelta::FromMicroseconds(mediahub_get_duration(media_hub_client_) / 1000);
 }
 
 void MediaPlayerMediaHub::Release() {
@@ -126,6 +127,10 @@
   mediahub_set_volume(media_hub_client_, volume);
 }
 
+void MediaPlayerMediaHub::SetRate(double rate) {
+  mediahub_set_rate(media_hub_client_, rate);
+}
+
 bool MediaPlayerMediaHub::CanPause() {
   return mediahub_can_pause(media_hub_client_) != 0;
 }
@@ -159,22 +164,26 @@
 }
 
 void MediaPlayerMediaHub::playback_status_changed(MediaHubDelegate::Status status) {
+  if (status == status_) {
+    return;
+  }
+  status_ = status;
   switch (status) {
   case null:
   case ready:
     manager_->OnMediaMetadataChanged(player_id(),
-                                      base::TimeDelta::FromMilliseconds(mediahub_get_duration(media_hub_client_)),
+                                      base::TimeDelta::FromMicroseconds(mediahub_get_duration(media_hub_client_) / 1000),
                                       0, 0, true);
     break;
   case playing:
     manager_->OnMediaMetadataChanged(player_id(),
-                                      base::TimeDelta::FromMilliseconds(mediahub_get_duration(media_hub_client_)),
+                                      base::TimeDelta::FromMicroseconds(mediahub_get_duration(media_hub_client_) / 1000),
                                       0, 0, true);
     manager_->OnPlayerPlay(player_id());
     break;
   case paused:
     manager_->OnMediaMetadataChanged(player_id(),
-                                      base::TimeDelta::FromMilliseconds(mediahub_get_duration(media_hub_client_)),
+                                      base::TimeDelta::FromMicroseconds(mediahub_get_duration(media_hub_client_) / 1000),
                                       0, 0, true);
     manager_->OnPlayerPause(player_id());
     break;
@@ -201,14 +210,14 @@
 
   if (duration != duration_) {
     manager_->OnMediaMetadataChanged(player_id(),
-                                      base::TimeDelta::FromMilliseconds(duration),
+                                      base::TimeDelta::FromMicroseconds(duration / 1000),
                                       0, 0, true);
     duration_ = duration;
   }
 
   manager_->OnTimeUpdate(player_id(),
-      base::TimeDelta::FromMilliseconds(
-          mediahub_get_position(media_hub_client_)));
+      base::TimeDelta::FromMicroseconds(
+          mediahub_get_position(media_hub_client_) / 1000));
 }
 
 }  // namespace media
 
=== modified file 'shared/browser/media/oxide_player_media_hub.h'
--- shared/browser/media/oxide_player_media_hub.h	2015-02-17 14:22:40 +0000
+++ shared/browser/media/oxide_player_media_hub.h	2015-10-01 23:59:09 +0000
@@ -48,6 +48,7 @@
   void SeekTo(base::TimeDelta timestamp) override;
   void Release() override;
   void SetVolume(double volume) override;
+  void SetRate(double rate) override;
   int GetVideoWidth() override;
   int GetVideoHeight() override;
   base::TimeDelta GetCurrentTime() override;
@@ -98,6 +99,7 @@
   std::string cookies_;
 
   MediaHubClientHandle media_hub_client_;
+  MediaHubDelegate::Status status_;
 
   base::WeakPtrFactory<MediaPlayerMediaHub> weak_factory_;
 
 
=== modified file 'shared/common/oxide_messages.h'
--- shared/common/oxide_messages.h	2015-06-29 17:52:40 +0000
+++ shared/common/oxide_messages.h	2015-10-01 23:59:09 +0000
@@ -185,6 +185,11 @@
                     int /* player_id */,
                     double /* volume */)
 
+// Set the rate.
+IPC_MESSAGE_ROUTED2(OxideHostMsg_MediaPlayer_SetRate,
+                    int /* player_id */,
+                    double /* rate */)
+
 // Set the poster image.
 IPC_MESSAGE_ROUTED2(OxideHostMsg_MediaPlayer_SetPoster,
                     int /* player_id */,
 
=== modified file 'shared/renderer/media/oxide_renderer_media_player_manager.cc'
--- shared/renderer/media/oxide_renderer_media_player_manager.cc	2015-01-20 17:26:44 +0000
+++ shared/renderer/media/oxide_renderer_media_player_manager.cc	2015-10-01 23:59:09 +0000
@@ -91,6 +91,10 @@
   Send(new OxideHostMsg_MediaPlayer_SetVolume(routing_id(), player_id, volume));
 }
 
+void RendererMediaPlayerManager::SetRate(int player_id, double rate) {
+  Send(new OxideHostMsg_MediaPlayer_SetRate(routing_id(), player_id, rate));
+}
+
 void RendererMediaPlayerManager::SetPoster(int player_id, const GURL& poster) {
   Send(new OxideHostMsg_MediaPlayer_SetPoster(routing_id(), player_id, poster));
 }
 
=== modified file 'shared/renderer/media/oxide_renderer_media_player_manager.h'
--- shared/renderer/media/oxide_renderer_media_player_manager.h	2014-12-10 04:14:21 +0000
+++ shared/renderer/media/oxide_renderer_media_player_manager.h	2015-10-01 23:59:09 +0000
@@ -56,6 +56,8 @@
   // Sets the player volume.
   void SetVolume(int player_id, double volume);
 
+  void SetRate(int player_id, double rate);
+
   // Sets the poster image.
   void SetPoster(int player_id, const GURL& poster);
 
 
=== modified file 'shared/renderer/media/oxide_web_media_player.cc'
--- shared/renderer/media/oxide_web_media_player.cc	2015-08-25 20:42:44 +0000
+++ shared/renderer/media/oxide_web_media_player.cc	2015-10-01 23:59:09 +0000
@@ -201,7 +201,7 @@
 }
 
 void WebMediaPlayer::seek(double seconds) {
-  NOTIMPLEMENTED();
+  player_manager_->Seek(player_id_, base::TimeDelta::FromSeconds(seconds));
 }
 
 bool WebMediaPlayer::supportsSave() const {
@@ -209,7 +209,7 @@
 }
 
 void WebMediaPlayer::setRate(double rate) {
-  NOTIMPLEMENTED();
+  player_manager_->SetRate(player_id_, rate);
 }
 
 void WebMediaPlayer::setSinkId(
@@ -325,7 +325,8 @@
 }
 
 WebTimeRanges WebMediaPlayer::seekable() const {
-  return buffered_;
+  const blink::WebTimeRange seekable_range(0.0, duration());
+  return blink::WebTimeRanges(&seekable_range, 1);
 }
 
 double WebMediaPlayer::maxTimeSeekable() const {