Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(203)

Side by Side Diff: media/base/android/media_player_android.cc

Issue 308073004: Add PlayerTracker and BrowserCdm interfaces. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments addressed Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/base/android/media_player_android.h ('k') | media/base/android/media_player_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_player_manager.h" 8 #include "media/base/android/media_player_manager.h"
9 #include "media/base/media_keys.h"
10 9
11 namespace media { 10 namespace media {
12 11
13 MediaPlayerAndroid::MediaPlayerAndroid( 12 MediaPlayerAndroid::MediaPlayerAndroid(
14 int player_id, 13 int player_id,
15 MediaPlayerManager* manager, 14 MediaPlayerManager* manager,
16 const RequestMediaResourcesCB& request_media_resources_cb, 15 const RequestMediaResourcesCB& request_media_resources_cb,
17 const ReleaseMediaResourcesCB& release_media_resources_cb) 16 const ReleaseMediaResourcesCB& release_media_resources_cb)
18 : request_media_resources_cb_(request_media_resources_cb), 17 : request_media_resources_cb_(request_media_resources_cb),
19 release_media_resources_cb_(release_media_resources_cb), 18 release_media_resources_cb_(release_media_resources_cb),
20 player_id_(player_id), 19 player_id_(player_id),
21 manager_(manager) { 20 manager_(manager) {
22 } 21 }
23 22
24 MediaPlayerAndroid::~MediaPlayerAndroid() {} 23 MediaPlayerAndroid::~MediaPlayerAndroid() {}
25 24
26 GURL MediaPlayerAndroid::GetUrl() { 25 GURL MediaPlayerAndroid::GetUrl() {
27 return GURL(); 26 return GURL();
28 } 27 }
29 28
30 GURL MediaPlayerAndroid::GetFirstPartyForCookies() { 29 GURL MediaPlayerAndroid::GetFirstPartyForCookies() {
31 return GURL(); 30 return GURL();
32 } 31 }
33 32
34 void MediaPlayerAndroid::SetCdm(MediaKeys* cdm) { 33 void MediaPlayerAndroid::SetCdm(BrowserCdm* /* cdm */) {
35 // Not all players support CDMs. Do nothing by default. 34 // Players that support EME should override this.
35 NOTREACHED() << "EME not supported on base MediaPlayerAndroid class.";
36 return; 36 return;
37 } 37 }
38 38
39 void MediaPlayerAndroid::OnKeyAdded() {
40 // Not all players care about the decryption key. Do nothing by default.
41 return;
42 }
43
44 } // namespace media 39 } // namespace media
OLDNEW
« no previous file with comments | « media/base/android/media_player_android.h ('k') | media/base/android/media_player_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698