| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #ifndef MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ | 5 #ifndef MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ |
| 6 #define MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ | 6 #define MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 const blink::WebString& key_system, | 154 const blink::WebString& key_system, |
| 155 const blink::WebString& session_id); | 155 const blink::WebString& session_id); |
| 156 | 156 |
| 157 // TODO(jrummell): Remove this method once Blink updated to use the other | 157 // TODO(jrummell): Remove this method once Blink updated to use the other |
| 158 // two methods. | 158 // two methods. |
| 159 virtual void setContentDecryptionModule( | 159 virtual void setContentDecryptionModule( |
| 160 blink::WebContentDecryptionModule* cdm); | 160 blink::WebContentDecryptionModule* cdm); |
| 161 virtual void setContentDecryptionModule( | 161 virtual void setContentDecryptionModule( |
| 162 blink::WebContentDecryptionModule* cdm, | 162 blink::WebContentDecryptionModule* cdm, |
| 163 blink::WebContentDecryptionModuleResult result); | 163 blink::WebContentDecryptionModuleResult result); |
| 164 virtual void setContentDecryptionModuleSync( | |
| 165 blink::WebContentDecryptionModule* cdm); | |
| 166 | 164 |
| 167 void OnPipelineSeeked(bool time_changed, PipelineStatus status); | 165 void OnPipelineSeeked(bool time_changed, PipelineStatus status); |
| 168 void OnPipelineEnded(); | 166 void OnPipelineEnded(); |
| 169 void OnPipelineError(PipelineStatus error); | 167 void OnPipelineError(PipelineStatus error); |
| 170 void OnPipelineMetadata(PipelineMetadata metadata); | 168 void OnPipelineMetadata(PipelineMetadata metadata); |
| 171 void OnPipelineBufferingStateChanged(BufferingState buffering_state); | 169 void OnPipelineBufferingStateChanged(BufferingState buffering_state); |
| 172 void OnDemuxerOpened(); | 170 void OnDemuxerOpened(); |
| 173 void OnAddTextTrack(const TextTrackConfig& config, | 171 void OnAddTextTrack(const TextTrackConfig& config, |
| 174 const AddTextTrackDoneCB& done_cb); | 172 const AddTextTrackDoneCB& done_cb); |
| 175 | 173 |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 310 scoped_ptr<EncryptedMediaPlayerSupport> encrypted_media_support_; | 308 scoped_ptr<EncryptedMediaPlayerSupport> encrypted_media_support_; |
| 311 | 309 |
| 312 const AudioHardwareConfig& audio_hardware_config_; | 310 const AudioHardwareConfig& audio_hardware_config_; |
| 313 | 311 |
| 314 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); | 312 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); |
| 315 }; | 313 }; |
| 316 | 314 |
| 317 } // namespace media | 315 } // namespace media |
| 318 | 316 |
| 319 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ | 317 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_IMPL_H_ |
| OLD | NEW |