| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 #include "webkit/media/android/media_source_delegate.h" | 5 #include "webkit/media/android/media_source_delegate.h" |
| 6 | 6 |
| 7 #include "base/message_loop_proxy.h" | 7 #include "base/message_loop_proxy.h" |
| 8 #include "base/strings/string_number_conversions.h" | 8 #include "base/strings/string_number_conversions.h" |
| 9 #include "media/base/android/demuxer_stream_player_params.h" | 9 #include "media/base/android/demuxer_stream_player_params.h" |
| 10 #include "media/base/bind_to_loop.h" | 10 #include "media/base/bind_to_loop.h" |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 << player_id_; | 222 << player_id_; |
| 223 seeking_ = true; | 223 seeking_ = true; |
| 224 DCHECK(chunk_demuxer_); | 224 DCHECK(chunk_demuxer_); |
| 225 if (!chunk_demuxer_) | 225 if (!chunk_demuxer_) |
| 226 return; | 226 return; |
| 227 chunk_demuxer_->StartWaitingForSeek(); | 227 chunk_demuxer_->StartWaitingForSeek(); |
| 228 chunk_demuxer_->Seek(time, | 228 chunk_demuxer_->Seek(time, |
| 229 BIND_TO_RENDER_LOOP(&MediaSourceDelegate::OnDemuxerError)); | 229 BIND_TO_RENDER_LOOP(&MediaSourceDelegate::OnDemuxerError)); |
| 230 } | 230 } |
| 231 | 231 |
| 232 void MediaSourceDelegate::CancelPendingSeek() { |
| 233 if (chunk_demuxer_) |
| 234 chunk_demuxer_->CancelPendingSeek(); |
| 235 } |
| 236 |
| 232 void MediaSourceDelegate::SetTotalBytes(int64 total_bytes) { | 237 void MediaSourceDelegate::SetTotalBytes(int64 total_bytes) { |
| 233 NOTIMPLEMENTED(); | 238 NOTIMPLEMENTED(); |
| 234 } | 239 } |
| 235 | 240 |
| 236 void MediaSourceDelegate::AddBufferedByteRange(int64 start, int64 end) { | 241 void MediaSourceDelegate::AddBufferedByteRange(int64 start, int64 end) { |
| 237 NOTIMPLEMENTED(); | 242 NOTIMPLEMENTED(); |
| 238 } | 243 } |
| 239 | 244 |
| 240 void MediaSourceDelegate::AddBufferedTimeRange(base::TimeDelta start, | 245 void MediaSourceDelegate::AddBufferedTimeRange(base::TimeDelta start, |
| 241 base::TimeDelta end) { | 246 base::TimeDelta end) { |
| (...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 506 void MediaSourceDelegate::OnDecryptorReady(media::Decryptor* decryptor) {} | 511 void MediaSourceDelegate::OnDecryptorReady(media::Decryptor* decryptor) {} |
| 507 | 512 |
| 508 scoped_ptr<media::TextTrack> MediaSourceDelegate::OnAddTextTrack( | 513 scoped_ptr<media::TextTrack> MediaSourceDelegate::OnAddTextTrack( |
| 509 media::TextKind kind, | 514 media::TextKind kind, |
| 510 const std::string& label, | 515 const std::string& label, |
| 511 const std::string& language) { | 516 const std::string& language) { |
| 512 return scoped_ptr<media::TextTrack>(); | 517 return scoped_ptr<media::TextTrack>(); |
| 513 } | 518 } |
| 514 | 519 |
| 515 } // namespace webkit_media | 520 } // namespace webkit_media |
| OLD | NEW |