media/filters/decrypting_audio_decoder.h - Issue 11342031: Add DecryptingDemuxerStream.

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_audio_decoder.h

Issue 11342031: Add DecryptingDemuxerStream. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: needs to add RegisterKeyAddedCB() Created 8 years, 2 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/decrypting_audio_decoder.h

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

index 533b9a244905ab9c60766d58ec5766233d71df84..bf6fd544e5bcd7d7dc0b7e7a02334a16ee318e7a 100644

--- a/media/filters/decrypting_audio_decoder.h

+++ b/media/filters/decrypting_audio_decoder.h

@@ -68,7 +68,7 @@ class MEDIA_EXPORT DecryptingAudioDecoder : public AudioDecoder {

// TODO(xhwang): Add a ASCII state diagram in this file after this class

// stabilizes.

// TODO(xhwang): Update this diagram for DecryptingAudioDecoder.

- enum DecoderState {

+ enum State {

kUninitialized = 0,

kDecryptorRequested,

kPendingDecoderInit,

@@ -136,7 +136,7 @@ class MEDIA_EXPORT DecryptingAudioDecoder : public AudioDecoder {

scoped_refptr<base::MessageLoopProxy> message_loop_;

// Current state of the DecryptingAudioDecoder.

- DecoderState state_;

+ State state_;

PipelineStatusCB init_cb_;

StatisticsCB statistics_cb_;