OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "webkit/media/webmediaplayer_proxy.h" | 5 #include "webkit/media/webmediaplayer_proxy.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/message_loop_proxy.h" | 9 #include "base/message_loop_proxy.h" |
10 #include "media/base/pipeline_status.h" | 10 #include "media/base/pipeline_status.h" |
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
194 } | 194 } |
195 | 195 |
196 media::ChunkDemuxer::Status WebMediaPlayerProxy::DemuxerAddId( | 196 media::ChunkDemuxer::Status WebMediaPlayerProxy::DemuxerAddId( |
197 const std::string& id, | 197 const std::string& id, |
198 const std::string& type, | 198 const std::string& type, |
199 std::vector<std::string>& codecs) { | 199 std::vector<std::string>& codecs) { |
200 return chunk_demuxer_->AddId(id, type, codecs); | 200 return chunk_demuxer_->AddId(id, type, codecs); |
201 } | 201 } |
202 | 202 |
203 bool WebMediaPlayerProxy::DemuxerSetTimestampOffset( | 203 bool WebMediaPlayerProxy::DemuxerSetTimestampOffset( |
204 const std::string& id, double offset) { | 204 const std::string& id, base::TimeDelta offset) { |
205 return chunk_demuxer_->SetTimestampOffset(id, offset); | 205 return chunk_demuxer_->SetTimestampOffset(id, offset); |
206 } | 206 } |
207 | 207 |
208 void WebMediaPlayerProxy::DemuxerRemoveId(const std::string& id) { | 208 void WebMediaPlayerProxy::DemuxerRemoveId(const std::string& id) { |
209 chunk_demuxer_->RemoveId(id); | 209 chunk_demuxer_->RemoveId(id); |
210 } | 210 } |
211 | 211 |
212 media::Ranges<base::TimeDelta> WebMediaPlayerProxy::DemuxerBufferedRange( | 212 media::Ranges<base::TimeDelta> WebMediaPlayerProxy::DemuxerBufferedRange( |
213 const std::string& id) { | 213 const std::string& id) { |
214 return chunk_demuxer_->GetBufferedRanges(id); | 214 return chunk_demuxer_->GetBufferedRanges(id); |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
311 const std::string& session_id, | 311 const std::string& session_id, |
312 scoped_array<uint8> init_data, | 312 scoped_array<uint8> init_data, |
313 int init_data_size) { | 313 int init_data_size) { |
314 DCHECK(render_loop_->BelongsToCurrentThread()); | 314 DCHECK(render_loop_->BelongsToCurrentThread()); |
315 if (webmediaplayer_) | 315 if (webmediaplayer_) |
316 webmediaplayer_->OnNeedKey(key_system, session_id, | 316 webmediaplayer_->OnNeedKey(key_system, session_id, |
317 init_data.Pass(), init_data_size); | 317 init_data.Pass(), init_data_size); |
318 } | 318 } |
319 | 319 |
320 } // namespace webkit_media | 320 } // namespace webkit_media |
OLD | NEW |