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: Rebase 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 dcc9a6d3b7045ba1f8da9ad1e4e417dd1ece9934..8f6619e0a8d8f610b2a1edf82cd7908a596d0e8f 100644

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

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

@@ -228,6 +228,10 @@ void FFmpegVideoDecoder::Stop(const base::Closure& closure) {

return;

}

+ // Tell the ProxyDecryptor to abort any pending decryptions.

scherkus (not reviewing) 2012/08/02 18:05:32 we don't know this is a ProxyDecyptor I also don'

xhwang 2012/08/03 20:08:10 Done.

+ if (decryptor_)

+ decryptor_->Stop();

stop_cb_ = closure;

// Defer stopping if a read is pending.

« media/base/decryptor.h ('K') | « media/filters/chunk_demuxer_unittest.cc ('k') | webkit/media/crypto/ppapi_decryptor.h » ('j') | webkit/media/crypto/proxy_decryptor.h » ('J')