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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side 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: Remove unnecessary code Created 5 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:
View unified diff | Download patch
« no previous file with comments | « no previous file | public/platform/WebMediaPlayerEncryptedMediaClient.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 14 matching lines...) Expand all
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef WebMediaPlayerClient_h 31 #ifndef WebMediaPlayerClient_h
32 #define WebMediaPlayerClient_h 32 #define WebMediaPlayerClient_h
33 33
34 #include "WebMediaPlayer.h" 34 #include "WebMediaPlayer.h"
35 #include "public/platform/WebEncryptedMediaTypes.h" 35 #include "WebMediaPlayerEncryptedMediaClient.h"
36 36
37 namespace blink { 37 namespace blink {
38 38
39 class WebInbandTextTrack; 39 class WebInbandTextTrack;
40 class WebLayer; 40 class WebLayer;
41 class WebMediaSource; 41 class WebMediaSource;
42 class WebURL;
43 42
44 class WebMediaPlayerClient { 43 class WebMediaPlayerClient : public WebMediaPlayerEncryptedMediaClient {
ddorwin 2015/06/04 20:17:06 Add a TODO to remove this inheritance when <someth
45 public: 44 public:
46 enum MediaKeyErrorCode {
47 MediaKeyErrorCodeUnknown = 1,
48 MediaKeyErrorCodeClient,
49 MediaKeyErrorCodeService,
50 MediaKeyErrorCodeOutput,
51 MediaKeyErrorCodeHardwareChange,
52 MediaKeyErrorCodeDomain,
53 };
54
55 enum VideoTrackKind { 45 enum VideoTrackKind {
56 VideoTrackKindNone, 46 VideoTrackKindNone,
57 VideoTrackKindAlternative, 47 VideoTrackKindAlternative,
58 VideoTrackKindCaptions, 48 VideoTrackKindCaptions,
59 VideoTrackKindMain, 49 VideoTrackKindMain,
60 VideoTrackKindSign, 50 VideoTrackKindSign,
61 VideoTrackKindSubtitles, 51 VideoTrackKindSubtitles,
62 VideoTrackKindCommentary 52 VideoTrackKindCommentary
63 }; 53 };
64 54
65 enum AudioTrackKind { 55 enum AudioTrackKind {
66 AudioTrackKindNone, 56 AudioTrackKindNone,
67 AudioTrackKindAlternative, 57 AudioTrackKindAlternative,
68 AudioTrackKindDescriptions, 58 AudioTrackKindDescriptions,
69 AudioTrackKindMain, 59 AudioTrackKindMain,
70 AudioTrackKindMainDescriptions, 60 AudioTrackKindMainDescriptions,
71 AudioTrackKindTranslation, 61 AudioTrackKindTranslation,
72 AudioTrackKindCommentary 62 AudioTrackKindCommentary
73 }; 63 };
74 64
75 virtual void networkStateChanged() = 0; 65 virtual void networkStateChanged() = 0;
76 virtual void readyStateChanged() = 0; 66 virtual void readyStateChanged() = 0;
77 virtual void timeChanged() = 0; 67 virtual void timeChanged() = 0;
78 virtual void repaint() = 0; 68 virtual void repaint() = 0;
79 virtual void durationChanged() = 0; 69 virtual void durationChanged() = 0;
80 virtual void sizeChanged() = 0; 70 virtual void sizeChanged() = 0;
81 virtual void playbackStateChanged() = 0; 71 virtual void playbackStateChanged() = 0;
82 virtual void keyAdded(const WebString& keySystem, const WebString& sessionId ) = 0;
83 virtual void keyError(const WebString& keySystem, const WebString& sessionId , MediaKeyErrorCode, unsigned short systemCode) = 0;
84 virtual void keyMessage(const WebString& keySystem, const WebString& session Id, const unsigned char* message, unsigned messageLength, const WebURL& defaultU RL) = 0;
85 virtual void encrypted(WebEncryptedMediaInitDataType, const unsigned char* i nitData, unsigned initDataLength) = 0;
86 virtual void didBlockPlaybackWaitingForKey() = 0;
87 virtual void didResumePlaybackBlockedForKey() = 0;
88 virtual void setWebLayer(WebLayer*) = 0; 72 virtual void setWebLayer(WebLayer*) = 0;
89 virtual WebMediaPlayer::TrackId addAudioTrack(const WebString& id, AudioTrac kKind, const WebString& label, const WebString& language, bool enabled) = 0; 73 virtual WebMediaPlayer::TrackId addAudioTrack(const WebString& id, AudioTrac kKind, const WebString& label, const WebString& language, bool enabled) = 0;
90 virtual void removeAudioTrack(WebMediaPlayer::TrackId) = 0; 74 virtual void removeAudioTrack(WebMediaPlayer::TrackId) = 0;
91 virtual WebMediaPlayer::TrackId addVideoTrack(const WebString& id, VideoTrac kKind, const WebString& label, const WebString& language, bool selected) = 0; 75 virtual WebMediaPlayer::TrackId addVideoTrack(const WebString& id, VideoTrac kKind, const WebString& label, const WebString& language, bool selected) = 0;
92 virtual void removeVideoTrack(WebMediaPlayer::TrackId) = 0; 76 virtual void removeVideoTrack(WebMediaPlayer::TrackId) = 0;
93 virtual void addTextTrack(WebInbandTextTrack*) = 0; 77 virtual void addTextTrack(WebInbandTextTrack*) = 0;
94 virtual void removeTextTrack(WebInbandTextTrack*) = 0; 78 virtual void removeTextTrack(WebInbandTextTrack*) = 0;
95 virtual void mediaSourceOpened(WebMediaSource*) = 0; 79 virtual void mediaSourceOpened(WebMediaSource*) = 0;
96 virtual void requestFullscreen() = 0; 80 virtual void requestFullscreen() = 0;
97 virtual void requestSeek(double) = 0; 81 virtual void requestSeek(double) = 0;
98 virtual void remoteRouteAvailabilityChanged(bool) = 0; 82 virtual void remoteRouteAvailabilityChanged(bool) = 0;
99 virtual void connectedToRemoteDevice() = 0; 83 virtual void connectedToRemoteDevice() = 0;
100 virtual void disconnectedFromRemoteDevice() = 0; 84 virtual void disconnectedFromRemoteDevice() = 0;
101 85
102 protected: 86 protected:
103 ~WebMediaPlayerClient() { } 87 ~WebMediaPlayerClient() { }
104 }; 88 };
105 89
106 } // namespace blink 90 } // namespace blink
107 91
108 #endif 92 #endif
OLDNEW
« 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