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 MediaPlayerAndroid* player = GetFullscreenPlayer(); | 99 MediaPlayerAndroid* 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::MediaPlayerAndroid::MediaSourceType media_source_type, |
110 const GURL& first_party_for_cookies) { | 111 const GURL& first_party_for_cookies) { |
111 for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin(); | 112 for (ScopedVector<MediaPlayerAndroid>::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::MediaPlayerAndroid::Create( | 121 players_.push_back(media::MediaPlayerAndroid::Create( |
121 player_id, url, is_media_source, first_party_for_cookies, | 122 player_id, |
122 host->GetBrowserContext()->IsOffTheRecord(), this, | 123 url, |
| 124 media_source_type, |
| 125 first_party_for_cookies, |
| 126 host->GetBrowserContext()->IsOffTheRecord(), |
| 127 this, |
123 #if defined(GOOGLE_TV) | 128 #if defined(GOOGLE_TV) |
124 base::Bind(&MediaPlayerManagerImpl::OnReadFromDemuxer, | 129 base::Bind(&MediaPlayerManagerImpl::OnReadFromDemuxer, |
125 base::Unretained(this)), | 130 base::Unretained(this)), |
126 #endif | 131 #endif |
127 base::Bind(&MediaPlayerManagerImpl::OnError, base::Unretained(this)), | 132 base::Bind(&MediaPlayerManagerImpl::OnError, base::Unretained(this)), |
128 base::Bind(&MediaPlayerManagerImpl::OnVideoSizeChanged, | 133 base::Bind(&MediaPlayerManagerImpl::OnVideoSizeChanged, |
129 base::Unretained(this)), | 134 base::Unretained(this)), |
130 base::Bind(&MediaPlayerManagerImpl::OnBufferingUpdate, | 135 base::Bind(&MediaPlayerManagerImpl::OnBufferingUpdate, |
131 base::Unretained(this)), | 136 base::Unretained(this)), |
132 base::Bind(&MediaPlayerManagerImpl::OnMediaMetadataChanged, | 137 base::Bind(&MediaPlayerManagerImpl::OnMediaMetadataChanged, |
133 base::Unretained(this)), | 138 base::Unretained(this)), |
134 base::Bind(&MediaPlayerManagerImpl::OnPlaybackComplete, | 139 base::Bind(&MediaPlayerManagerImpl::OnPlaybackComplete, |
135 base::Unretained(this)), | 140 base::Unretained(this)), |
136 base::Bind(&MediaPlayerManagerImpl::OnSeekComplete, | 141 base::Bind(&MediaPlayerManagerImpl::OnSeekComplete, |
137 base::Unretained(this)), | 142 base::Unretained(this)), |
138 base::Bind(&MediaPlayerManagerImpl::OnTimeUpdate, | 143 base::Bind(&MediaPlayerManagerImpl::OnTimeUpdate, base::Unretained(this)), |
139 base::Unretained(this)), | |
140 base::Bind(&MediaPlayerManagerImpl::OnMediaInterrupted, | 144 base::Bind(&MediaPlayerManagerImpl::OnMediaInterrupted, |
141 base::Unretained(this)))); | 145 base::Unretained(this)))); |
142 } | 146 } |
143 | 147 |
144 media::MediaResourceGetter* MediaPlayerManagerImpl::GetMediaResourceGetter() { | 148 media::MediaResourceGetter* MediaPlayerManagerImpl::GetMediaResourceGetter() { |
145 if (!media_resource_getter_.get()) { | 149 if (!media_resource_getter_.get()) { |
146 RenderProcessHost* host = render_view_host()->GetProcess(); | 150 RenderProcessHost* host = render_view_host()->GetProcess(); |
147 BrowserContext* context = host->GetBrowserContext(); | 151 BrowserContext* context = host->GetBrowserContext(); |
148 StoragePartition* partition = host->GetStoragePartition(); | 152 StoragePartition* partition = host->GetStoragePartition(); |
149 fileapi::FileSystemContext* file_system_context = | 153 fileapi::FileSystemContext* file_system_context = |
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
367 } | 371 } |
368 } | 372 } |
369 } | 373 } |
370 | 374 |
371 void MediaPlayerManagerImpl::ReleaseMediaResources( | 375 void MediaPlayerManagerImpl::ReleaseMediaResources( |
372 MediaPlayerAndroid* player) { | 376 MediaPlayerAndroid* player) { |
373 // Nothing needs to be done. | 377 // Nothing needs to be done. |
374 } | 378 } |
375 | 379 |
376 } // namespace content | 380 } // namespace content |
OLD | NEW |