media/filters/ffmpeg_video_decoder.cc - Issue 10539150: Add Decryptor interface.

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 10539150: Add Decryptor interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Move decryptor.* and decryptor_client.h to src/media/base/ Created 8 years, 6 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/ffmpeg_video_decoder.cc

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

index c8e512bc6ba6865066219e0ec7866125aa4db2c7..1902fd86b56fa09e93299752dd749d57a21bd72e 100644

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

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

@@ -10,6 +10,7 @@

#include "base/message_loop.h"

#include "base/string_number_conversions.h"

#include "media/base/decoder_buffer.h"

+#include "media/base/decryptor.h"

#include "media/base/demuxer_stream.h"

#include "media/base/limits.h"

#include "media/base/media_switches.h"

@@ -177,7 +178,7 @@ const gfx::Size& FFmpegVideoDecoder::natural_size() {

return natural_size_;

}

-void FFmpegVideoDecoder::set_decryptor(AesDecryptor* decryptor) {

+void FFmpegVideoDecoder::set_decryptor(Decryptor* decryptor) {

DCHECK_EQ(state_, kUninitialized);

decryptor_ = decryptor;

}