media/filters/decrypting_demuxer_stream.h - Issue 416333011: Allow setContentDecryptionModule() to get called when setting is done.

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/decrypting_demuxer_stream.h

Issue 416333011: Allow setContentDecryptionModule() to get called when setting is done. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: enhance tests Created 6 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

« media/filters/decrypting_audio_decoder_unittest.cc ('K') | « media/filters/decrypting_audio_decoder_unittest.cc ('k') | media/filters/decrypting_demuxer_stream.cc » ('j') | media/filters/decrypting_video_decoder_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/filters/decrypting_demuxer_stream.h

diff --git a/media/filters/decrypting_demuxer_stream.h b/media/filters/decrypting_demuxer_stream.h

index c65df176fa003432d12d4db8932dc8a7fa9cc37e..66300055ad8f8769098dc52b85dfcaedbe0075f8 100644

--- a/media/filters/decrypting_demuxer_stream.h

+++ b/media/filters/decrypting_demuxer_stream.h

@@ -67,8 +67,10 @@ class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream {

kWaitingForKey

};

- // Callback for DecryptorHost::RequestDecryptor().

- void SetDecryptor(Decryptor* decryptor);

+ // Callback for DecryptorHost::RequestDecryptor(). |insert_done_cb| is called

+ // when the decryptor has been completely inserted into the pipeline.

+ void SetDecryptor(Decryptor* decryptor,

+ const DecryptorInsertedCB& insert_done_cb);

// Callback for DemuxerStream::Read().

void DecryptBuffer(DemuxerStream::Status status,