media/crypto/aes_decryptor.h - Issue 11313016: Add "type" in GenerateKeyRequest() and OnNeedKey().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/crypto/aes_decryptor.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, 2 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:

Index: media/crypto/aes_decryptor.h

diff --git a/media/crypto/aes_decryptor.h b/media/crypto/aes_decryptor.h

index 53fb813ef6bab4fb0961a5dea4c0e12225e456b5..966738b2e0ee0519a7fd56774d6ccd73c90304b2 100644

--- a/media/crypto/aes_decryptor.h

+++ b/media/crypto/aes_decryptor.h

@@ -35,6 +35,7 @@ class MEDIA_EXPORT AesDecryptor : public Decryptor {

// Decryptor implementation.

virtual bool GenerateKeyRequest(const std::string& key_system,

+ const std::string& type,

const uint8* init_data,

int init_data_length) OVERRIDE;

virtual void AddKey(const std::string& key_system,

« no previous file with comments | « media/base/stream_parser.h ('k') | media/crypto/aes_decryptor.cc » ('j') | no next file with comments »