webkit/media/webmediaplayer_proxy.h - 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: webkit/media/webmediaplayer_proxy.h

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: webkit/media/webmediaplayer_proxy.h

diff --git a/webkit/media/webmediaplayer_proxy.h b/webkit/media/webmediaplayer_proxy.h

index 241638889f284ffff12d84285c329c0daa163e0a..0fe84f132e9a5ad7f75c7247f1c5e718923f5f62 100644

--- a/webkit/media/webmediaplayer_proxy.h

+++ b/webkit/media/webmediaplayer_proxy.h

@@ -11,8 +11,8 @@

#include "base/memory/ref_counted.h"

#include "base/synchronization/lock.h"

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

#include "media/base/pipeline.h"

-#include "media/crypto/decryptor_client.h"

#include "media/filters/chunk_demuxer.h"

#include "media/filters/chunk_demuxer_client.h"

#include "media/filters/ffmpeg_video_decoder.h"

@@ -112,7 +112,7 @@ class WebMediaPlayerProxy

const std::string& session_id) OVERRIDE;

virtual void KeyError(const std::string& key_system,

const std::string& session_id,

- media::AesDecryptor::KeyError error_code,

+ media::Decryptor::KeyError error_code,

int system_code) OVERRIDE;

virtual void KeyMessage(const std::string& key_system,

const std::string& session_id,

@@ -157,7 +157,7 @@ class WebMediaPlayerProxy

// Notify |webmediaplayer_| that a key error occurred.

void KeyErrorTask(const std::string& key_system,

const std::string& session_id,

- media::AesDecryptor::KeyError error_code,

+ media::Decryptor::KeyError error_code,

int system_code);

// Notify |webmediaplayer_| that a key message has been generated.