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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
98 void MediaPlayerManagerImpl::SetVideoSurface(jobject surface) { | 98 void MediaPlayerManagerImpl::SetVideoSurface(jobject surface) { |
99 MediaPlayerBridge* player = GetFullscreenPlayer(); | 99 MediaPlayerBridge* player = GetFullscreenPlayer(); |
100 if (player) { | 100 if (player) { |
101 player->SetVideoSurface(surface); | 101 player->SetVideoSurface(surface); |
102 Send(new MediaPlayerMsg_DidEnterFullscreen( | 102 Send(new MediaPlayerMsg_DidEnterFullscreen( |
103 routing_id(), player->player_id())); | 103 routing_id(), player->player_id())); |
104 } | 104 } |
105 } | 105 } |
106 | 106 |
107 void MediaPlayerManagerImpl::OnInitialize( | 107 void MediaPlayerManagerImpl::OnInitialize( |
108 int player_id, const GURL& url, | 108 int player_id, |
109 bool is_media_source, | 109 const GURL& url, |
| 110 media::MediaPlayerBridge::MediaSource media_source, |
110 const GURL& first_party_for_cookies) { | 111 const GURL& first_party_for_cookies) { |
111 for (ScopedVector<MediaPlayerBridge>::iterator it = players_.begin(); | 112 for (ScopedVector<MediaPlayerBridge>::iterator it = players_.begin(); |
112 it != players_.end(); ++it) { | 113 it != players_.end(); ++it) { |
113 if ((*it)->player_id() == player_id) { | 114 if ((*it)->player_id() == player_id) { |
114 players_.erase(it); | 115 players_.erase(it); |
115 break; | 116 break; |
116 } | 117 } |
117 } | 118 } |
118 | 119 |
119 RenderProcessHost* host = render_view_host()->GetProcess(); | 120 RenderProcessHost* host = render_view_host()->GetProcess(); |
120 players_.push_back(media::MediaPlayerBridge::Create( | 121 players_.push_back(media::MediaPlayerBridge::Create( |
121 player_id, url, is_media_source, first_party_for_cookies, | 122 player_id, url, media_source, first_party_for_cookies, |
122 host->GetBrowserContext()->IsOffTheRecord(), this, | 123 host->GetBrowserContext()->IsOffTheRecord(), this, |
123 #if defined(GOOGLE_TV) | 124 #if defined(GOOGLE_TV) |
124 base::Bind(&MediaPlayerManagerImpl::OnReadFromDemuxer, | 125 base::Bind(&MediaPlayerManagerImpl::OnReadFromDemuxer, |
125 base::Unretained(this)), | 126 base::Unretained(this)), |
126 #endif | 127 #endif |
127 base::Bind(&MediaPlayerManagerImpl::OnError, base::Unretained(this)), | 128 base::Bind(&MediaPlayerManagerImpl::OnError, base::Unretained(this)), |
128 base::Bind(&MediaPlayerManagerImpl::OnVideoSizeChanged, | 129 base::Bind(&MediaPlayerManagerImpl::OnVideoSizeChanged, |
129 base::Unretained(this)), | 130 base::Unretained(this)), |
130 base::Bind(&MediaPlayerManagerImpl::OnBufferingUpdate, | 131 base::Bind(&MediaPlayerManagerImpl::OnBufferingUpdate, |
131 base::Unretained(this)), | 132 base::Unretained(this)), |
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
367 } | 368 } |
368 } | 369 } |
369 } | 370 } |
370 | 371 |
371 void MediaPlayerManagerImpl::ReleaseMediaResources( | 372 void MediaPlayerManagerImpl::ReleaseMediaResources( |
372 MediaPlayerBridge* player) { | 373 MediaPlayerBridge* player) { |
373 // Nothing needs to be done. | 374 // Nothing needs to be done. |
374 } | 375 } |
375 | 376 |
376 } // namespace content | 377 } // namespace content |
OLD | NEW |