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

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

index 149631d03611f0a1c19817b4075c43b7318947c0..6f950ccbd2dcd904097b99b6e70a58d147de0732 100644

--- a/media/filters/gpu_video_decoder.cc

+++ b/media/filters/gpu_video_decoder.cc

@@ -128,8 +128,9 @@ void GpuVideoDecoder::Initialize(const scoped_refptr<DemuxerStream>& stream,

// TODO(scherkus): this check should go in Pipeline prior to creating

// decoder objects.

const VideoDecoderConfig& config = stream->video_decoder_config();

- if (!config.IsValidConfig()) {

- DLOG(ERROR) << "Invalid video stream - " << config.AsHumanReadableString();

+ if (!config.IsValidConfig() || config.is_encrypted()) {

+ DLOG(ERROR) << "Unsupported video stream - "

+ << config.AsHumanReadableString();

status_cb.Run(PIPELINE_ERROR_DECODE);

return;

}