OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/browser/android/media_player_manager_impl.h" | 5 #include "content/browser/android/media_player_manager_impl.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "content/browser/android/media_resource_getter_impl.h" | 8 #include "content/browser/android/media_resource_getter_impl.h" |
9 #include "content/browser/web_contents/web_contents_view_android.h" | 9 #include "content/browser/web_contents/web_contents_view_android.h" |
10 #include "content/common/media/media_player_messages.h" | 10 #include "content/common/media/media_player_messages.h" |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
100 void MediaPlayerManagerImpl::SetVideoSurface(jobject surface) { | 100 void MediaPlayerManagerImpl::SetVideoSurface(jobject surface) { |
101 MediaPlayerBridge* player = GetFullscreenPlayer(); | 101 MediaPlayerBridge* player = GetFullscreenPlayer(); |
102 if (player) { | 102 if (player) { |
103 player->SetVideoSurface(surface); | 103 player->SetVideoSurface(surface); |
104 Send(new MediaPlayerMsg_DidEnterFullscreen( | 104 Send(new MediaPlayerMsg_DidEnterFullscreen( |
105 routing_id(), player->player_id())); | 105 routing_id(), player->player_id())); |
106 } | 106 } |
107 } | 107 } |
108 | 108 |
109 void MediaPlayerManagerImpl::OnInitialize( | 109 void MediaPlayerManagerImpl::OnInitialize( |
110 int player_id, const GURL& url, | 110 int player_id, |
111 bool is_media_source, | 111 const GURL& url, |
| 112 media::MediaPlayerBridge::MediaSource media_source, |
112 const GURL& first_party_for_cookies) { | 113 const GURL& first_party_for_cookies) { |
113 for (ScopedVector<MediaPlayerBridge>::iterator it = players_.begin(); | 114 for (ScopedVector<MediaPlayerBridge>::iterator it = players_.begin(); |
114 it != players_.end(); ++it) { | 115 it != players_.end(); ++it) { |
115 if ((*it)->player_id() == player_id) { | 116 if ((*it)->player_id() == player_id) { |
116 players_.erase(it); | 117 players_.erase(it); |
117 break; | 118 break; |
118 } | 119 } |
119 } | 120 } |
120 | 121 |
121 RenderProcessHost* host = render_view_host()->GetProcess(); | 122 RenderProcessHost* host = render_view_host()->GetProcess(); |
122 players_.push_back(media::MediaPlayerBridge::Create( | 123 players_.push_back(media::MediaPlayerBridge::Create( |
123 player_id, url, is_media_source, first_party_for_cookies, | 124 player_id, url, media_source, first_party_for_cookies, |
124 host->GetBrowserContext()->IsOffTheRecord(), this, | 125 host->GetBrowserContext()->IsOffTheRecord(), this, |
125 #if defined(GOOGLE_TV) | 126 #if defined(GOOGLE_TV) |
126 base::Bind(&MediaPlayerManagerImpl::OnReadFromDemuxer, | 127 base::Bind(&MediaPlayerManagerImpl::OnReadFromDemuxer, |
127 base::Unretained(this)), | 128 base::Unretained(this)), |
128 #endif | 129 #endif |
129 base::Bind(&MediaPlayerManagerImpl::OnError, base::Unretained(this)), | 130 base::Bind(&MediaPlayerManagerImpl::OnError, base::Unretained(this)), |
130 base::Bind(&MediaPlayerManagerImpl::OnVideoSizeChanged, | 131 base::Bind(&MediaPlayerManagerImpl::OnVideoSizeChanged, |
131 base::Unretained(this)), | 132 base::Unretained(this)), |
132 base::Bind(&MediaPlayerManagerImpl::OnBufferingUpdate, | 133 base::Bind(&MediaPlayerManagerImpl::OnBufferingUpdate, |
133 base::Unretained(this)), | 134 base::Unretained(this)), |
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
379 } | 380 } |
380 } | 381 } |
381 } | 382 } |
382 | 383 |
383 void MediaPlayerManagerImpl::ReleaseMediaResources( | 384 void MediaPlayerManagerImpl::ReleaseMediaResources( |
384 MediaPlayerBridge* player) { | 385 MediaPlayerBridge* player) { |
385 // Nothing needs to be done. | 386 // Nothing needs to be done. |
386 } | 387 } |
387 | 388 |
388 } // namespace content | 389 } // namespace content |
OLD | NEW |