OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "media/base/android/media_player_android.h" | 5 #include "media/base/android/media_player_android.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "media/base/android/media_drm_bridge.h" | 8 #include "media/base/android/media_drm_bridge.h" |
9 #include "media/base/android/media_player_manager.h" | 9 #include "media/base/android/media_player_manager.h" |
10 | 10 |
11 namespace media { | 11 namespace media { |
12 | 12 |
13 MediaPlayerAndroid::MediaPlayerAndroid( | 13 MediaPlayerAndroid::MediaPlayerAndroid( |
14 int player_id, | 14 int player_id, |
15 MediaPlayerManager* manager, | 15 MediaPlayerManager* manager, |
16 const RequestMediaResourcesCB& request_media_resources_cb, | 16 const RequestMediaResourcesCB& request_media_resources_cb, |
17 const ReleaseMediaResourcesCB& release_media_resources_cb) | 17 const ReleaseMediaResourcesCB& release_media_resources_cb, |
| 18 const GURL& frame_url) |
18 : request_media_resources_cb_(request_media_resources_cb), | 19 : request_media_resources_cb_(request_media_resources_cb), |
19 release_media_resources_cb_(release_media_resources_cb), | 20 release_media_resources_cb_(release_media_resources_cb), |
20 player_id_(player_id), | 21 player_id_(player_id), |
21 manager_(manager) { | 22 manager_(manager), |
| 23 frame_url_(frame_url) { |
22 } | 24 } |
23 | 25 |
24 MediaPlayerAndroid::~MediaPlayerAndroid() {} | 26 MediaPlayerAndroid::~MediaPlayerAndroid() {} |
25 | 27 |
26 GURL MediaPlayerAndroid::GetUrl() { | 28 GURL MediaPlayerAndroid::GetUrl() { |
27 return GURL(); | 29 return GURL(); |
28 } | 30 } |
29 | 31 |
30 GURL MediaPlayerAndroid::GetFirstPartyForCookies() { | 32 GURL MediaPlayerAndroid::GetFirstPartyForCookies() { |
31 return GURL(); | 33 return GURL(); |
32 } | 34 } |
33 | 35 |
34 void MediaPlayerAndroid::SetCdm(BrowserCdm* /* cdm */) { | 36 void MediaPlayerAndroid::SetCdm(BrowserCdm* /* cdm */) { |
35 // Players that support EME should override this. | 37 // Players that support EME should override this. |
36 NOTREACHED() << "EME not supported on base MediaPlayerAndroid class."; | 38 NOTREACHED() << "EME not supported on base MediaPlayerAndroid class."; |
37 return; | 39 return; |
38 } | 40 } |
39 | 41 |
40 } // namespace media | 42 } // namespace media |
OLD | NEW |