Support CAST+WMPI on android

content/renderer/media/android/renderer_media_player_manager.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/android/renderer_media_player_manager.h"
 
 #include "content/common/media/media_player_messages_android.h"
 #include "content/public/common/renderer_preferences.h"
 #include "content/renderer/media/android/webmediaplayer_android.h"
 #include "content/renderer/media/cdm/renderer_cdm_manager.h"
@@ skipping 46 matching lines @@
   IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void RendererMediaPlayerManager::WasHidden() {
   ReleaseVideoResources();
 }
 
 void RendererMediaPlayerManager::Initialize(
-    MediaPlayerHostMsg_Initialize_Type type,
+    media::MediaPlayerHostMsg_Initialize_Type type,
     int player_id,
     const GURL& url,
     const GURL& first_party_for_cookies,
     int demuxer_client_id,
     const GURL& frame_url,
     bool allow_credentials) {
   MediaPlayerHostMsg_Initialize_Params media_player_params;
-  media_player_params.type = type;
+  media_player_params.type =
+      static_cast<MediaPlayerHostMsg_Initialize_Type>(type);

[DaleCurtis, 2016/01/12 20:24:09]

Seems unnecessary? Did something complain?

[hubbe, 2016/01/12 21:23:18]

../../content/renderer/media/android/renderer_media_player_manager.cc: In member
function 'virtual void content::RendererMediaPlay\
erManager::Initialize(media::MediaPlayerHostMsg_Initialize_Type, int, const
GURL&, const GURL&, int, const GURL&, bool)':
../../content/renderer/media/android/renderer_media_player_manager.cc:75:28:
error: cannot convert 'media::MediaPlayerHostMsg_Init\
ialize_Type' to 'MediaPlayerHostMsg_Initialize_Type' in assignment
   media_player_params.type = type;

[DaleCurtis, 2016/01/12 23:21:53]

Oh I see, you have a different type of the same name. Lets not do that, please
give it a different name to confusing aliasing.

[hubbe, 2016/01/13 00:11:55]

Done.

   media_player_params.player_id = player_id;
   media_player_params.demuxer_client_id = demuxer_client_id;
   media_player_params.url = url;
   media_player_params.first_party_for_cookies = first_party_for_cookies;
   media_player_params.frame_url = frame_url;
   media_player_params.allow_credentials = allow_credentials;
 
   Send(new MediaPlayerHostMsg_Initialize(routing_id(), media_player_params));
 }
 
@@ skipping 38 matching lines @@
   Send(new MediaPlayerHostMsg_RequestRemotePlaybackControl(routing_id(),
                                                            player_id));
 }
 
 void RendererMediaPlayerManager::OnMediaMetadataChanged(
     int player_id,
     base::TimeDelta duration,
     int width,
     int height,
     bool success) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnMediaMetadataChanged(duration, width, height, success);
 }
 
 void RendererMediaPlayerManager::OnMediaPlaybackCompleted(int player_id) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnPlaybackComplete();
 }
 
 void RendererMediaPlayerManager::OnMediaBufferingUpdate(int player_id,
                                                         int percent) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnBufferingUpdate(percent);
 }
 
 void RendererMediaPlayerManager::OnSeekRequest(
     int player_id,
     const base::TimeDelta& time_to_seek) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnSeekRequest(time_to_seek);
 }
 
 void RendererMediaPlayerManager::OnSeekCompleted(
     int player_id,
     const base::TimeDelta& current_time) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnSeekComplete(current_time);
 }
 
 void RendererMediaPlayerManager::OnMediaError(int player_id, int error) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnMediaError(error);
 }
 
 void RendererMediaPlayerManager::OnVideoSizeChanged(int player_id,
                                                     int width,
                                                     int height) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnVideoSizeChanged(width, height);
 }
 
 void RendererMediaPlayerManager::OnTimeUpdate(
     int player_id,
     base::TimeDelta current_timestamp,
     base::TimeTicks current_time_ticks) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnTimeUpdate(current_timestamp, current_time_ticks);
 }
 
 void RendererMediaPlayerManager::OnWaitingForDecryptionKey(int player_id) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnWaitingForDecryptionKey();
 }
 
 void RendererMediaPlayerManager::OnMediaPlayerReleased(int player_id) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnPlayerReleased();
 }
 
 void RendererMediaPlayerManager::OnConnectedToRemoteDevice(int player_id,
     const std::string& remote_playback_message) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnConnectedToRemoteDevice(remote_playback_message);
 }
 
 void RendererMediaPlayerManager::OnDisconnectedFromRemoteDevice(int player_id) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnDisconnectedFromRemoteDevice();
 }
 
 void RendererMediaPlayerManager::OnDidExitFullscreen(int player_id) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnDidExitFullscreen();
 }
 
 void RendererMediaPlayerManager::OnPlayerPlay(int player_id) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnMediaPlayerPlay();
 }
 
 void RendererMediaPlayerManager::OnPlayerPause(int player_id) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnMediaPlayerPause();
 }
 
 void RendererMediaPlayerManager::OnRemoteRouteAvailabilityChanged(
     int player_id,
     bool routes_available) {
-  WebMediaPlayerAndroid* player = GetMediaPlayer(player_id);
+  RendererMediaPlayerInterface* player = GetMediaPlayer(player_id);
   if (player)
     player->OnRemoteRouteAvailabilityChanged(routes_available);
 }
 
 void RendererMediaPlayerManager::EnterFullscreen(int player_id) {
   Send(new MediaPlayerHostMsg_EnterFullscreen(routing_id(), player_id));
 }
 
 void RendererMediaPlayerManager::SetCdm(int player_id, int cdm_id) {
   if (cdm_id == media::CdmContext::kInvalidCdmId) {
     NOTREACHED();
     return;
   }
   Send(new MediaPlayerHostMsg_SetCdm(routing_id(), player_id, cdm_id));
 }
 
 int RendererMediaPlayerManager::RegisterMediaPlayer(
-    WebMediaPlayerAndroid* player) {
+    RendererMediaPlayerInterface* player) {
   media_players_[next_media_player_id_] = player;
   return next_media_player_id_++;
 }
 
 void RendererMediaPlayerManager::UnregisterMediaPlayer(int player_id) {
   media_players_.erase(player_id);
 }
 
 void RendererMediaPlayerManager::ReleaseVideoResources() {
-  std::map<int, WebMediaPlayerAndroid*>::iterator player_it;
+  std::map<int, RendererMediaPlayerInterface*>::iterator player_it;
   for (player_it = media_players_.begin(); player_it != media_players_.end();
        ++player_it) {
-    WebMediaPlayerAndroid* player = player_it->second;
+    RendererMediaPlayerInterface* player = player_it->second;
 
     // Do not release if an audio track is still playing
     if (player && (player->paused() || player->hasVideo()))
       player->ReleaseMediaResources();
   }
 }
 
-WebMediaPlayerAndroid* RendererMediaPlayerManager::GetMediaPlayer(
+RendererMediaPlayerInterface* RendererMediaPlayerManager::GetMediaPlayer(
     int player_id) {
-  std::map<int, WebMediaPlayerAndroid*>::iterator iter =
+  std::map<int, RendererMediaPlayerInterface*>::iterator iter =
       media_players_.find(player_id);
   if (iter != media_players_.end())
     return iter->second;
   return NULL;
 }
 
 #if defined(VIDEO_HOLE)
 void RendererMediaPlayerManager::RequestExternalSurface(
     int player_id,
     const gfx::RectF& geometry) {
   Send(new MediaPlayerHostMsg_NotifyExternalSurface(
       routing_id(), player_id, true, geometry));
 }
 
 void RendererMediaPlayerManager::DidCommitCompositorFrame() {
   std::map<int, gfx::RectF> geometry_change;
   RetrieveGeometryChanges(&geometry_change);
   for (std::map<int, gfx::RectF>::iterator it = geometry_change.begin();
        it != geometry_change.end();
        ++it) {
     Send(new MediaPlayerHostMsg_NotifyExternalSurface(
         routing_id(), it->first, false, it->second));
   }
 }
 
 void RendererMediaPlayerManager::RetrieveGeometryChanges(
     std::map<int, gfx::RectF>* changes) {
   DCHECK(changes->empty());
-  for (std::map<int, WebMediaPlayerAndroid*>::iterator player_it =
+  for (std::map<int, RendererMediaPlayerInterface*>::iterator player_it =
            media_players_.begin();
        player_it != media_players_.end();
        ++player_it) {
-    WebMediaPlayerAndroid* player = player_it->second;
+    RendererMediaPlayerInterface* player = player_it->second;
 
     if (player && player->hasVideo()) {
       if (player->UpdateBoundaryRectangle())
         (*changes)[player_it->first] = player->GetBoundaryRectangle();
     }
   }
 }
 
 bool
 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() {
   const RendererPreferences& prefs = static_cast<RenderFrameImpl*>(
       render_frame())->render_view()->renderer_preferences();
   return prefs.use_video_overlay_for_embedded_encrypted_video;
 }
 #endif  // defined(VIDEO_HOLE)
 
 }  // namespace content