media/blink/encrypted_media_player_support.cc - Issue 912233004: Explicitly differentiate key system support functions by EME version.

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/blink/encrypted_media_player_support.cc

Issue 912233004: Explicitly differentiate key system support functions by EME version. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 5 years, 10 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:

View side-by-side diff with in-line comments

Download patch

Index: media/blink/encrypted_media_player_support.cc

diff --git a/media/blink/encrypted_media_player_support.cc b/media/blink/encrypted_media_player_support.cc

index 920bfc94d224f40ccf7444e85d6661de15728f3b..7b7669d5642dadfeb328ce3447c55ebd66d5721b 100644

--- a/media/blink/encrypted_media_player_support.cc

+++ b/media/blink/encrypted_media_player_support.cc

@@ -151,7 +151,7 @@ EncryptedMediaPlayerSupport::GenerateKeyRequestInternal(

const std::string& key_system,

const unsigned char* init_data,

unsigned init_data_length) {

- if (!IsConcreteSupportedKeySystem(key_system))

+ if (!PrefixedIsSupportedConcreteKeySystem(key_system))

return WebMediaPlayer::MediaKeyExceptionKeySystemNotSupported;

// We do not support run-time switching between key systems for now.

@@ -234,7 +234,7 @@ EncryptedMediaPlayerSupport::AddKeyInternal(

DCHECK(key);

DCHECK_GT(key_length, 0u);

- if (!IsConcreteSupportedKeySystem(key_system))

+ if (!PrefixedIsSupportedConcreteKeySystem(key_system))

return WebMediaPlayer::MediaKeyExceptionKeySystemNotSupported;

if (current_key_system_.empty() || key_system != current_key_system_)

@@ -266,7 +266,7 @@ WebMediaPlayer::MediaKeyException

EncryptedMediaPlayerSupport::CancelKeyRequestInternal(

const std::string& key_system,

const std::string& session_id) {

- if (!IsConcreteSupportedKeySystem(key_system))

+ if (!PrefixedIsSupportedConcreteKeySystem(key_system))

return WebMediaPlayer::MediaKeyExceptionKeySystemNotSupported;

if (current_key_system_.empty() || key_system != current_key_system_)

« no previous file with comments | « media/base/key_systems_unittest.cc ('k') | media/blink/webcontentdecryptionmodule_impl.cc » ('j') | no next file with comments »