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_player_manager.h" | 9 #include "media/base/android/media_player_manager.h" |
9 | 10 |
10 namespace media { | 11 namespace media { |
11 | 12 |
12 MediaPlayerAndroid::MediaPlayerAndroid( | 13 MediaPlayerAndroid::MediaPlayerAndroid( |
13 int player_id, | 14 int player_id, |
14 MediaPlayerManager* manager, | 15 MediaPlayerManager* manager, |
15 const RequestMediaResourcesCB& request_media_resources_cb, | 16 const RequestMediaResourcesCB& request_media_resources_cb, |
16 const ReleaseMediaResourcesCB& release_media_resources_cb) | 17 const ReleaseMediaResourcesCB& release_media_resources_cb) |
17 : request_media_resources_cb_(request_media_resources_cb), | 18 : request_media_resources_cb_(request_media_resources_cb), |
(...skipping 12 matching lines...) Expand all Loading... |
30 return GURL(); | 31 return GURL(); |
31 } | 32 } |
32 | 33 |
33 void MediaPlayerAndroid::SetCdm(BrowserCdm* /* cdm */) { | 34 void MediaPlayerAndroid::SetCdm(BrowserCdm* /* cdm */) { |
34 // Players that support EME should override this. | 35 // Players that support EME should override this. |
35 NOTREACHED() << "EME not supported on base MediaPlayerAndroid class."; | 36 NOTREACHED() << "EME not supported on base MediaPlayerAndroid class."; |
36 return; | 37 return; |
37 } | 38 } |
38 | 39 |
39 } // namespace media | 40 } // namespace media |
OLD | NEW |