media/filters/source_buffer_stream.cc - Issue 10910293: Add is_encrypted() in VideoDecoderConfig.

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/filters/source_buffer_stream.cc

Issue 10910293: Add is_encrypted() in VideoDecoderConfig. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Resolve comments. Created 8 years, 3 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/filters/source_buffer_stream.cc

diff --git a/media/filters/source_buffer_stream.cc b/media/filters/source_buffer_stream.cc

index 478b7d5d274feec7d66d72b67e995368b237edf0..de1a9c943c5c0fb50f42c1dc52ad15721599f429 100644

--- a/media/filters/source_buffer_stream.cc

+++ b/media/filters/source_buffer_stream.cc

@@ -940,6 +940,11 @@ bool SourceBufferStream::UpdateVideoConfig(const VideoDecoderConfig& config) {

DCHECK(!video_configs_.empty());

DCHECK(audio_configs_.empty());

+ if (video_configs_[0]->is_encrypted() != config.is_encrypted()) {

+ DVLOG(1) << "UpdateVideoConfig() : Encryption changes not allowed.";

+ return false;

+ }

if (video_configs_[0]->codec() != config.codec()) {

DVLOG(1) << "UpdateVideoConfig() : Codec changes not allowed.";

return false;