| OLD | NEW |
|---|
| 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 13 matching lines...) Expand all Loading... |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 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 "WebCommon.h" |
| 34 #include "WebMediaPlayer.h" | 35 #include "WebMediaPlayer.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 | 42 |
| 43 // TODO(srirama): Remove this inheritance when we get rid of the MediaPlayer | 43 class BLINK_PLATFORM_EXPORT WebMediaPlayerClient { |
| 44 // and MediaPlayerClient interfaces by having HTMLMediaElement implement | |
| 45 // WebMediaPlayerClient interface. See crbug.com/350571. | |
| 46 class WebMediaPlayerClient : public WebMediaPlayerEncryptedMediaClient { | |
| 47 public: | 44 public: |
| 48 enum VideoTrackKind { | 45 enum VideoTrackKind { |
| 49 VideoTrackKindNone, | 46 VideoTrackKindNone, |
| 50 VideoTrackKindAlternative, | 47 VideoTrackKindAlternative, |
| 51 VideoTrackKindCaptions, | 48 VideoTrackKindCaptions, |
| 52 VideoTrackKindMain, | 49 VideoTrackKindMain, |
| 53 VideoTrackKindSign, | 50 VideoTrackKindSign, |
| 54 VideoTrackKindSubtitles, | 51 VideoTrackKindSubtitles, |
| 55 VideoTrackKindCommentary | 52 VideoTrackKindCommentary |
| 56 }; | 53 }; |
| (...skipping 28 matching lines...) Expand all Loading... |
| 85 virtual void connectedToRemoteDevice() = 0; | 82 virtual void connectedToRemoteDevice() = 0; |
| 86 virtual void disconnectedFromRemoteDevice() = 0; | 83 virtual void disconnectedFromRemoteDevice() = 0; |
| 87 | 84 |
| 88 protected: | 85 protected: |
| 89 ~WebMediaPlayerClient() { } | 86 ~WebMediaPlayerClient() { } |
| 90 }; | 87 }; |
| 91 | 88 |
| 92 } // namespace blink | 89 } // namespace blink |
| 93 | 90 |
| 94 #endif | 91 #endif |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1055503002:
Eliminate MediaPlayer & MediaPlayerClient abstractions (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@master