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

Side by Side Diff: media/base/decryptor_client.h

Issue 11313016: Add "type" in GenerateKeyRequest() and OnNeedKey(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix the DCHECK where init_data_type_ is set but NeedKey from decoder passes empty "type". Created 8 years, 1 month 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/decryptor.h ('k') | media/base/mock_filters.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) 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 #ifndef MEDIA_BASE_DECRYPTOR_CLIENT_H_ 5 #ifndef MEDIA_BASE_DECRYPTOR_CLIENT_H_
6 #define MEDIA_BASE_DECRYPTOR_CLIENT_H_ 6 #define MEDIA_BASE_DECRYPTOR_CLIENT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 18 matching lines...) Expand all
29 29
30 // Signals that a key message has been generated. 30 // Signals that a key message has been generated.
31 virtual void KeyMessage(const std::string& key_system, 31 virtual void KeyMessage(const std::string& key_system,
32 const std::string& session_id, 32 const std::string& session_id,
33 scoped_array<uint8> message, 33 scoped_array<uint8> message,
34 int message_length, 34 int message_length,
35 const std::string& default_url) = 0; 35 const std::string& default_url) = 0;
36 36
37 // Signals that a key is needed for decryption. |key_system| and |session_id| 37 // Signals that a key is needed for decryption. |key_system| and |session_id|
38 // can be empty if the key system has not been selected. 38 // can be empty if the key system has not been selected.
39 // TODO(xhwang): Figure out if "type" is optional for NeedKey fired from the
40 // decoder.
39 virtual void NeedKey(const std::string& key_system, 41 virtual void NeedKey(const std::string& key_system,
40 const std::string& session_id, 42 const std::string& session_id,
43 const std::string& type,
41 scoped_array<uint8> init_data, 44 scoped_array<uint8> init_data,
42 int init_data_length) = 0; 45 int init_data_length) = 0;
43 46
44 protected: 47 protected:
45 virtual ~DecryptorClient() {} 48 virtual ~DecryptorClient() {}
46 }; 49 };
47 50
48 } // namespace media 51 } // namespace media
49 52
50 #endif // MEDIA_BASE_DECRYPTOR_CLIENT_H_ 53 #endif // MEDIA_BASE_DECRYPTOR_CLIENT_H_
OLDNEW
« no previous file with comments | « media/base/decryptor.h ('k') | media/base/mock_filters.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698