media/cdm/ppapi/supported_cdm_versions.h - Issue 811923002: Changes to support CDM_7

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/ppapi/supported_cdm_versions.h

Issue 811923002: Changes to support CDM_7 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: cdm_7 changes Created 6 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 side-by-side diff with in-line comments

Download patch

« media/cdm/ppapi/cdm_wrapper.h ('K') | « media/cdm/ppapi/external_clear_key/clear_key_cdm.cc ('k') | ppapi/api/private/pp_content_decryptor.idl » ('j') | ppapi/api/private/ppp_content_decryptor_private.idl » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/cdm/ppapi/supported_cdm_versions.h

diff --git a/media/cdm/ppapi/supported_cdm_versions.h b/media/cdm/ppapi/supported_cdm_versions.h

index ae6e567c0e01076571fcc48ed9ebf6f3a2181e97..aae2d62e706043ded356ba798232f7ecaaded8f8 100644

--- a/media/cdm/ppapi/supported_cdm_versions.h

+++ b/media/cdm/ppapi/supported_cdm_versions.h

@@ -10,7 +10,7 @@

namespace media {

bool IsSupportedCdmModuleVersion(int version) {

- switch(version) {

+ switch (version) {

// Latest.

case CDM_MODULE_VERSION:

return true;

@@ -21,10 +21,11 @@ bool IsSupportedCdmModuleVersion(int version) {

bool IsSupportedCdmInterfaceVersion(int version) {

COMPILE_ASSERT(cdm::ContentDecryptionModule::kVersion ==

- cdm::ContentDecryptionModule_6::kVersion,

+ cdm::ContentDecryptionModule_7::kVersion,

update_code_below);

- switch(version) {

+ switch (version) {

// Supported versions in decreasing order.

+ case cdm::ContentDecryptionModule_7::kVersion:

case cdm::ContentDecryptionModule_6::kVersion:

return true;

default:

@@ -34,10 +35,11 @@ bool IsSupportedCdmInterfaceVersion(int version) {

bool IsSupportedCdmHostVersion(int version) {

COMPILE_ASSERT(cdm::ContentDecryptionModule::Host::kVersion ==

- cdm::ContentDecryptionModule_6::Host::kVersion,

+ cdm::ContentDecryptionModule_7::Host::kVersion,

update_code_below);

- switch(version) {

+ switch (version) {

// Supported versions in decreasing order.

+ case cdm::Host_7::kVersion:

case cdm::Host_6::kVersion:

return true;

default: