media/filters/decrypting_video_decoder.h - Issue 11420070: Remove locking from FFmpegDemuxerStream and associated TODOs from media code.

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

Issue 11420070: Remove locking from FFmpegDemuxerStream and associated TODOs from media code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 1 month 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.cc ('K') | « media/filters/decrypting_audio_decoder.cc ('k') | media/filters/decrypting_video_decoder.cc » ('j') | media/filters/decrypting_video_decoder.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/filters/decrypting_video_decoder.h

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

index ac9136e1fec167209ff87c8305acf7cf31204cf5..5cf22842009b23e5d9a884ead8ab25e10334c97c 100644

--- a/media/filters/decrypting_video_decoder.h

+++ b/media/filters/decrypting_video_decoder.h

@@ -93,10 +93,6 @@ class MEDIA_EXPORT DecryptingVideoDecoder : public VideoDecoder {

void ReadFromDemuxerStream();

- // Callback for DemuxerStream::Read().

- void DecryptAndDecodeBuffer(DemuxerStream::Status status,

- const scoped_refptr<DecoderBuffer>& buffer);

// Carries out the buffer decrypting/decoding operation scheduled by

// DecryptAndDecodeBuffer().

xhwang 2012/11/20 17:54:34 ditto

scherkus (not reviewing) 2012/11/20 19:16:07 Done.

void DoDecryptAndDecodeBuffer(DemuxerStream::Status status,