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

Side by Side Diff: content/browser/media/android/browser_media_player_manager.h

Issue 100323004: Update Android IPC messages to EME WD (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ 5 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
6 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ 6 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 int demuxer_client_id); 128 int demuxer_client_id);
129 virtual void OnStart(int player_id); 129 virtual void OnStart(int player_id);
130 virtual void OnSeek(int player_id, const base::TimeDelta& time); 130 virtual void OnSeek(int player_id, const base::TimeDelta& time);
131 virtual void OnPause(int player_id, bool is_media_related_action); 131 virtual void OnPause(int player_id, bool is_media_related_action);
132 virtual void OnSetVolume(int player_id, double volume); 132 virtual void OnSetVolume(int player_id, double volume);
133 virtual void OnReleaseResources(int player_id); 133 virtual void OnReleaseResources(int player_id);
134 virtual void OnDestroyPlayer(int player_id); 134 virtual void OnDestroyPlayer(int player_id);
135 void OnInitializeCDM(int media_keys_id, 135 void OnInitializeCDM(int media_keys_id,
136 const std::vector<uint8>& uuid, 136 const std::vector<uint8>& uuid,
137 const GURL& frame_url); 137 const GURL& frame_url);
138 void OnGenerateKeyRequest(int media_keys_id, 138 void OnCreateSession(int media_keys_id,
139 uint32 reference_id, 139 uint32 reference_id,
140 const std::string& type, 140 const std::string& type,
141 const std::vector<uint8>& init_data); 141 const std::vector<uint8>& init_data);
142 void OnAddKey(int media_keys_id, 142 void OnUpdateSession(int media_keys_id,
143 uint32 reference_id, 143 uint32 reference_id,
144 const std::vector<uint8>& key, 144 const std::vector<uint8>& key,
ddorwin 2013/12/03 18:11:30 |response|
jrummell 2013/12/03 19:33:16 Done.
145 const std::vector<uint8>& init_data); 145 const std::vector<uint8>& init_data);
ddorwin 2013/12/03 18:11:30 drop
jrummell 2013/12/03 19:33:16 Done.
146 void OnCancelKeyRequest(int media_keys_id, uint32 reference_id); 146 void OnReleaseSession(int media_keys_id, uint32 reference_id);
147 void OnSetMediaKeys(int player_id, int media_keys_id); 147 void OnSetMediaKeys(int player_id, int media_keys_id);
148 148
149 #if defined(GOOGLE_TV) 149 #if defined(GOOGLE_TV)
150 virtual void OnNotifyExternalSurface( 150 virtual void OnNotifyExternalSurface(
151 int player_id, bool is_request, const gfx::RectF& rect); 151 int player_id, bool is_request, const gfx::RectF& rect);
152 #endif 152 #endif
153 153
154 // Adds a given player to the list. 154 // Adds a given player to the list.
155 void AddPlayer(media::MediaPlayerAndroid* player); 155 void AddPlayer(media::MediaPlayerAndroid* player);
156 156
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 scoped_ptr<media::MediaResourceGetter> media_resource_getter_; 229 scoped_ptr<media::MediaResourceGetter> media_resource_getter_;
230 230
231 base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_; 231 base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_;
232 232
233 DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager); 233 DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager);
234 }; 234 };
235 235
236 } // namespace content 236 } // namespace content
237 237
238 #endif // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ 238 #endif // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698