| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/media/android/renderer_media_player_manager.h" | 5 #include "content/renderer/media/android/renderer_media_player_manager.h" |
| 6 | 6 |
| 7 #include "content/common/media/media_player_messages_android.h" | 7 #include "content/common/media/media_player_messages_android.h" |
| 8 #include "content/public/common/renderer_preferences.h" | 8 #include "content/public/common/renderer_preferences.h" |
| 9 #include "content/renderer/media/android/renderer_media_player_manager.h" | 9 #include "content/renderer/media/android/renderer_media_player_manager.h" |
| 10 #include "content/renderer/media/android/webmediaplayer_android.h" | 10 #include "content/renderer/media/android/webmediaplayer_android.h" |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 } | 161 } |
| 162 | 162 |
| 163 void RendererMediaPlayerManager::OnVideoSizeChanged(int player_id, | 163 void RendererMediaPlayerManager::OnVideoSizeChanged(int player_id, |
| 164 int width, | 164 int width, |
| 165 int height) { | 165 int height) { |
| 166 WebMediaPlayerAndroid* player = GetMediaPlayer(player_id); | 166 WebMediaPlayerAndroid* player = GetMediaPlayer(player_id); |
| 167 if (player) | 167 if (player) |
| 168 player->OnVideoSizeChanged(width, height); | 168 player->OnVideoSizeChanged(width, height); |
| 169 } | 169 } |
| 170 | 170 |
| 171 void RendererMediaPlayerManager::OnTimeUpdate(int player_id, | 171 void RendererMediaPlayerManager::OnTimeUpdate( |
| 172 base::TimeDelta current_time) { | 172 int player_id, |
| 173 base::TimeDelta current_timestamp, |
| 174 base::TimeTicks current_time_ticks) { |
| 173 WebMediaPlayerAndroid* player = GetMediaPlayer(player_id); | 175 WebMediaPlayerAndroid* player = GetMediaPlayer(player_id); |
| 174 if (player) | 176 if (player) |
| 175 player->OnTimeUpdate(current_time); | 177 player->OnTimeUpdate(current_timestamp, current_time_ticks); |
| 176 } | 178 } |
| 177 | 179 |
| 178 void RendererMediaPlayerManager::OnMediaPlayerReleased(int player_id) { | 180 void RendererMediaPlayerManager::OnMediaPlayerReleased(int player_id) { |
| 179 WebMediaPlayerAndroid* player = GetMediaPlayer(player_id); | 181 WebMediaPlayerAndroid* player = GetMediaPlayer(player_id); |
| 180 if (player) | 182 if (player) |
| 181 player->OnPlayerReleased(); | 183 player->OnPlayerReleased(); |
| 182 } | 184 } |
| 183 | 185 |
| 184 void RendererMediaPlayerManager::OnConnectedToRemoteDevice(int player_id, | 186 void RendererMediaPlayerManager::OnConnectedToRemoteDevice(int player_id, |
| 185 const std::string& remote_playback_message) { | 187 const std::string& remote_playback_message) { |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 338 | 340 |
| 339 bool | 341 bool |
| 340 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() { | 342 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() { |
| 341 const RendererPreferences& prefs = static_cast<RenderFrameImpl*>( | 343 const RendererPreferences& prefs = static_cast<RenderFrameImpl*>( |
| 342 render_frame())->render_view()->renderer_preferences(); | 344 render_frame())->render_view()->renderer_preferences(); |
| 343 return prefs.use_video_overlay_for_embedded_encrypted_video; | 345 return prefs.use_video_overlay_for_embedded_encrypted_video; |
| 344 } | 346 } |
| 345 #endif // defined(VIDEO_HOLE) | 347 #endif // defined(VIDEO_HOLE) |
| 346 | 348 |
| 347 } // namespace content | 349 } // namespace content |
| OLD | NEW |