media/base/encryption_scheme.h - Issue 2058113002: Add 'cbcs' encryption scheme support in Android media.

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/base/encryption_scheme.h

Issue 2058113002: Add 'cbcs' encryption scheme support in Android media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 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/base/android/java/src/org/chromium/media/MediaCodecUtil.java ('K') | « media/base/android/sdk_media_codec_bridge.cc ('k') | media/base/encryption_scheme.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/base/encryption_scheme.h

diff --git a/media/base/encryption_scheme.h b/media/base/encryption_scheme.h

index 37bea6710d264390a5b74cd920e10951ff34eba7..572db86e8ad309fe591db0731029c570e671f0d8 100644

--- a/media/base/encryption_scheme.h

+++ b/media/base/encryption_scheme.h

@@ -42,8 +42,8 @@ class MEDIA_EXPORT EncryptionScheme {

bool Matches(const Pattern& other) const;

- uint32_t encrypt_blocks() const { return encrypt_blocks_; }

- uint32_t skip_blocks() const { return skip_blocks_; }

+ uint32_t encrypt_blocks() const;

+ uint32_t skip_blocks() const;

bool IsInEffect() const;

@@ -63,9 +63,9 @@ class MEDIA_EXPORT EncryptionScheme {

bool Matches(const EncryptionScheme& other) const;

- bool is_encrypted() const { return mode_ != CIPHER_MODE_UNENCRYPTED; }

- CipherMode mode() const { return mode_; }

- const Pattern& pattern() const { return pattern_; }

+ bool is_encrypted() const;

+ CipherMode mode() const;

+ const Pattern& pattern() const;

private:

CipherMode mode_ = CIPHER_MODE_UNENCRYPTED;