OLD | NEW |
---|---|
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "config.h" | 5 #include "config.h" |
6 #include "web/WebMediaPlayerClientImpl.h" | 6 #include "web/WebMediaPlayerClientImpl.h" |
7 | 7 |
8 #include "core/frame/LocalFrame.h" | 8 #include "core/frame/LocalFrame.h" |
9 #include "core/html/HTMLMediaElement.h" | 9 #include "core/html/HTMLMediaElement.h" |
10 #include "core/html/TimeRanges.h" | 10 #include "core/html/TimeRanges.h" |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
139 void WebMediaPlayerClientImpl::keyNeeded(const WebString& contentType, const uns igned char* initData, unsigned initDataLength) | 139 void WebMediaPlayerClientImpl::keyNeeded(const WebString& contentType, const uns igned char* initData, unsigned initDataLength) |
140 { | 140 { |
141 HTMLMediaElementEncryptedMedia::keyNeeded(mediaElement(), contentType, initD ata, initDataLength); | 141 HTMLMediaElementEncryptedMedia::keyNeeded(mediaElement(), contentType, initD ata, initDataLength); |
142 } | 142 } |
143 | 143 |
144 void WebMediaPlayerClientImpl::setWebLayer(blink::WebLayer* layer) | 144 void WebMediaPlayerClientImpl::setWebLayer(blink::WebLayer* layer) |
145 { | 145 { |
146 m_client->mediaPlayerSetWebLayer(layer); | 146 m_client->mediaPlayerSetWebLayer(layer); |
147 } | 147 } |
148 | 148 |
149 void WebMediaPlayerClientImpl::addAudioTrack(uintptr_t handle, const WebString& id, AudioTrackKind kind, const WebString& label, const WebString& language, bool enabled) | |
150 { | |
151 mediaElement().addAudioTrack(id, kind, label, language, enabled); | |
acolwell GONE FROM CHROMIUM
2014/05/12 18:23:11
I'm assuming you'll add handle here.
philipj_slow
2014/05/15 14:55:53
Yes, I didn't want to go all the way before the ou
| |
152 } | |
153 | |
154 void WebMediaPlayerClientImpl::removeAudioTrack(uintptr_t handle) | |
155 { | |
156 mediaElement().removeAudioTrack(id); | |
acolwell GONE FROM CHROMIUM
2014/05/12 18:23:11
s/id/handle/?
| |
157 } | |
158 | |
159 void WebMediaPlayerClientImpl::addVideoTrack(uintptr_t handle, const WebString& id, VideoTrackKind kind, const WebString& label, const WebString& language, bool selected) | |
160 { | |
161 mediaElement().addVideoTrack(id, kind, label, language, selected); | |
162 } | |
163 | |
164 void WebMediaPlayerClientImpl::removeVideoTrack(uintptr_t handle) | |
165 { | |
166 mediaElement().removeVideoTrack(id); | |
167 } | |
168 | |
149 void WebMediaPlayerClientImpl::addTextTrack(WebInbandTextTrack* textTrack) | 169 void WebMediaPlayerClientImpl::addTextTrack(WebInbandTextTrack* textTrack) |
150 { | 170 { |
151 m_client->mediaPlayerDidAddTextTrack(textTrack); | 171 m_client->mediaPlayerDidAddTextTrack(textTrack); |
152 } | 172 } |
153 | 173 |
154 void WebMediaPlayerClientImpl::removeTextTrack(WebInbandTextTrack* textTrack) | 174 void WebMediaPlayerClientImpl::removeTextTrack(WebInbandTextTrack* textTrack) |
155 { | 175 { |
156 m_client->mediaPlayerDidRemoveTextTrack(textTrack); | 176 m_client->mediaPlayerDidRemoveTextTrack(textTrack); |
157 } | 177 } |
158 | 178 |
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
554 | 574 |
555 void WebMediaPlayerClientImpl::AudioClientImpl::setFormat(size_t numberOfChannel s, float sampleRate) | 575 void WebMediaPlayerClientImpl::AudioClientImpl::setFormat(size_t numberOfChannel s, float sampleRate) |
556 { | 576 { |
557 if (m_client) | 577 if (m_client) |
558 m_client->setFormat(numberOfChannels, sampleRate); | 578 m_client->setFormat(numberOfChannels, sampleRate); |
559 } | 579 } |
560 | 580 |
561 #endif | 581 #endif |
562 | 582 |
563 } // namespace blink | 583 } // namespace blink |
OLD | NEW |