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

Side by Side Diff: webkit/media/webmediaplayer_impl.h

Issue 11469040: EME v0.1: Report defaultURL in KeyMessage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | Annotate | Revision Log
OLDNEW
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 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player. 5 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
6 // It contains Pipeline which is the actual media player pipeline, it glues 6 // It contains Pipeline which is the actual media player pipeline, it glues
7 // the media player pipeline, data source, audio renderer and renderer. 7 // the media player pipeline, data source, audio renderer and renderer.
8 // Pipeline would creates multiple threads and access some public methods 8 // Pipeline would creates multiple threads and access some public methods
9 // of this class, so we need to be extra careful about concurrent access of 9 // of this class, so we need to be extra careful about concurrent access of
10 // methods and members. 10 // methods and members.
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 void OnDemuxerOpened(); 236 void OnDemuxerOpened();
237 void OnKeyAdded(const std::string& key_system, const std::string& session_id); 237 void OnKeyAdded(const std::string& key_system, const std::string& session_id);
238 void OnKeyError(const std::string& key_system, 238 void OnKeyError(const std::string& key_system,
239 const std::string& session_id, 239 const std::string& session_id,
240 media::Decryptor::KeyError error_code, 240 media::Decryptor::KeyError error_code,
241 int system_code); 241 int system_code);
242 void OnKeyMessage(const std::string& key_system, 242 void OnKeyMessage(const std::string& key_system,
243 const std::string& session_id, 243 const std::string& session_id,
244 scoped_array<uint8> message, 244 scoped_array<uint8> message,
245 int message_length, 245 int message_length,
246 const std::string& default_url); 246 const GURL& default_url);
247 void OnNeedKey(const std::string& key_system, 247 void OnNeedKey(const std::string& key_system,
248 const std::string& type, 248 const std::string& type,
249 const std::string& session_id, 249 const std::string& session_id,
250 scoped_array<uint8> init_data, 250 scoped_array<uint8> init_data,
251 int init_data_size); 251 int init_data_size);
252 void SetOpaque(bool); 252 void SetOpaque(bool);
253 253
254 private: 254 private:
255 // Called after asynchronous initialization of a data source completed. 255 // Called after asynchronous initialization of a data source completed.
256 void DataSourceInitialized(const GURL& gurl, bool success); 256 void DataSourceInitialized(const GURL& gurl, bool success);
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 // Temporary for EME v0.1. In the future the init data type should be passed 368 // Temporary for EME v0.1. In the future the init data type should be passed
369 // through GenerateKeyRequest() directly from WebKit. 369 // through GenerateKeyRequest() directly from WebKit.
370 std::string init_data_type_; 370 std::string init_data_type_;
371 371
372 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 372 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
373 }; 373 };
374 374
375 } // namespace webkit_media 375 } // namespace webkit_media
376 376
377 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 377 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698