media/base/android/ndk_media_codec_bridge.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/android/ndk_media_codec_bridge.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/mock_media_codec_bridge.cc ('k') | media/base/android/ndk_media_codec_bridge.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/base/android/ndk_media_codec_bridge.h

diff --git a/media/base/android/ndk_media_codec_bridge.h b/media/base/android/ndk_media_codec_bridge.h

index 0b93a1efc64c026816c7e2eb9d5cfcd6845ed6e8..38ad4b05c679baf27141c3f3bc4b5547ab6ddd78 100644

--- a/media/base/android/ndk_media_codec_bridge.h

+++ b/media/base/android/ndk_media_codec_bridge.h

@@ -43,6 +43,7 @@ class MEDIA_EXPORT NdkMediaCodecBridge : public MediaCodecBridge {

const std::vector<char>& iv,

const SubsampleEntry* subsamples,

int subsamples_size,

+ const EncryptionScheme& encryption_scheme,

base::TimeDelta presentation_time) override;

void QueueEOS(int input_buffer_index) override;

MediaCodecStatus DequeueInputBuffer(base::TimeDelta timeout,