Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(280)

Unified Diff: public/platform/WebMediaPlayerClient.h

Issue 1125353004: Separate encrypted media functions out of WebMediaPlayerClient interface (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Implement WebMediaPlayerEncryptedMediaClient in WebMediaPlayerClient Created 5 years, 7 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
« no previous file with comments | « no previous file | public/platform/WebMediaPlayerEncryptedMediaClient.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: public/platform/WebMediaPlayerClient.h
diff --git a/public/platform/WebMediaPlayerClient.h b/public/platform/WebMediaPlayerClient.h
index 8f5e7ff15528050751c6b6e0344e0f55e9dec48e..2ca834c9aa1e669e060889ef9fb89b68b5aab801 100644
--- a/public/platform/WebMediaPlayerClient.h
+++ b/public/platform/WebMediaPlayerClient.h
@@ -31,8 +31,9 @@
#ifndef WebMediaPlayerClient_h
#define WebMediaPlayerClient_h
+#include "WebEncryptedMediaTypes.h"
ddorwin 2015/05/29 19:53:14 Why is this necessary?
Srirama 2015/05/29 20:06:25 Not required, i will remove it.
Srirama 2015/06/01 06:18:34 Done.
#include "WebMediaPlayer.h"
-#include "public/platform/WebEncryptedMediaTypes.h"
+#include "WebMediaPlayerEncryptedMediaClient.h"
namespace blink {
@@ -41,17 +42,8 @@ class WebLayer;
class WebMediaSource;
class WebURL;
-class WebMediaPlayerClient {
+class WebMediaPlayerClient: public WebMediaPlayerEncryptedMediaClient {
public:
- enum MediaKeyErrorCode {
- MediaKeyErrorCodeUnknown = 1,
- MediaKeyErrorCodeClient,
- MediaKeyErrorCodeService,
- MediaKeyErrorCodeOutput,
- MediaKeyErrorCodeHardwareChange,
- MediaKeyErrorCodeDomain,
- };
-
enum VideoTrackKind {
VideoTrackKindNone,
VideoTrackKindAlternative,
@@ -79,12 +71,6 @@ public:
virtual void durationChanged() = 0;
virtual void sizeChanged() = 0;
virtual void playbackStateChanged() = 0;
- virtual void keyAdded(const WebString& keySystem, const WebString& sessionId) = 0;
- virtual void keyError(const WebString& keySystem, const WebString& sessionId, MediaKeyErrorCode, unsigned short systemCode) = 0;
- virtual void keyMessage(const WebString& keySystem, const WebString& sessionId, const unsigned char* message, unsigned messageLength, const WebURL& defaultURL) = 0;
- virtual void encrypted(WebEncryptedMediaInitDataType, const unsigned char* initData, unsigned initDataLength) = 0;
- virtual void didBlockPlaybackWaitingForKey() = 0;
- virtual void didResumePlaybackBlockedForKey() = 0;
virtual void setWebLayer(WebLayer*) = 0;
virtual WebMediaPlayer::TrackId addAudioTrack(const WebString& id, AudioTrackKind, const WebString& label, const WebString& language, bool enabled) = 0;
virtual void removeAudioTrack(WebMediaPlayer::TrackId) = 0;
« no previous file with comments | « no previous file | public/platform/WebMediaPlayerEncryptedMediaClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698