media/filters/ffmpeg_video_decoder.cc - Issue 10822026: Implement "Key Presence" step in "Encrypted Block Encounted" algorithm in EME.

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/ffmpeg_video_decoder.cc

Issue 10822026: Implement "Key Presence" step in "Encrypted Block Encounted" algorithm in EME. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix broken ChunkDemuxerTest due to null MessageLoop::Current() Created 8 years, 5 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:

View side-by-side diff with in-line comments

Download patch

Index: media/filters/ffmpeg_video_decoder.cc

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

index 7cd2c7a95b36b234824feb0f3709d5a6f45072de..2ece14fa04d7b1d827abb23ffce5af5fa69b53b1 100644

--- a/media/filters/ffmpeg_video_decoder.cc

+++ b/media/filters/ffmpeg_video_decoder.cc

@@ -360,7 +360,8 @@ void FFmpegVideoDecoder::DoBufferDecrypted(

return;

}

- if (decrypt_status == Decryptor::kError) {

+ if (decrypt_status == Decryptor::kNoKey ||

+ decrypt_status == Decryptor::kError) {

state_ = kDecodeFinished;

base::ResetAndReturn(&read_cb_).Run(kDecryptError, NULL);

return;

« media/filters/chunk_demuxer_unittest.cc ('K') | « media/filters/chunk_demuxer_unittest.cc ('k') | media/filters/ffmpeg_video_decoder_unittest.cc » ('j') | no next file with comments »