media/cdm/aes_decryptor.h - Issue 448893002: Update ClearKey to support CDM_6

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/cdm/aes_decryptor.h

Issue 448893002: Update ClearKey to support CDM_6 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cdm6

Patch Set: rebase Created 6 years, 4 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/cdm/aes_decryptor.h

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

index 3a177701960b3ddd8c3eabbd459b085d63900fab..dc08bb32b01dc50a8e95ab80f6fc4b1e34e5fcba 100644

--- a/media/cdm/aes_decryptor.h

+++ b/media/cdm/aes_decryptor.h

@@ -67,6 +67,9 @@ class MEDIA_EXPORT AesDecryptor : public MediaKeys, public Decryptor {

virtual void ResetDecoder(StreamType stream_type) OVERRIDE;

virtual void DeinitializeDecoder(StreamType stream_type) OVERRIDE;

+ void GetUsableKeyIds(const std::string& web_session_id,

+ scoped_ptr<KeyIdsPromise> promise);

private:

// TODO(fgalligan): Remove this and change KeyMap to use crypto::SymmetricKey

// as there are no decryptors that are performing an integrity check.

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