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 #include "content/renderer/media/android/media_source_delegate.h" | 5 #include "content/renderer/media/android/media_source_delegate.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
299 } | 299 } |
300 | 300 |
301 void MediaSourceDelegate::SeekInternal(const base::TimeDelta& seek_time) { | 301 void MediaSourceDelegate::SeekInternal(const base::TimeDelta& seek_time) { |
302 DCHECK(media_task_runner_->BelongsToCurrentThread()); | 302 DCHECK(media_task_runner_->BelongsToCurrentThread()); |
303 DCHECK(IsSeeking()); | 303 DCHECK(IsSeeking()); |
304 chunk_demuxer_->Seek(seek_time, base::Bind( | 304 chunk_demuxer_->Seek(seek_time, base::Bind( |
305 &MediaSourceDelegate::OnDemuxerSeekDone, | 305 &MediaSourceDelegate::OnDemuxerSeekDone, |
306 media_weak_factory_.GetWeakPtr())); | 306 media_weak_factory_.GetWeakPtr())); |
307 } | 307 } |
308 | 308 |
309 void MediaSourceDelegate::AddBufferedTimeRange(base::TimeDelta start, | 309 void MediaSourceDelegate::OnBufferedTimeRangesChanged( |
310 base::TimeDelta end) { | 310 const Ranges<base::TimeDelta>& ranges) { |
311 buffered_time_ranges_.Add(start, end); | 311 buffered_time_ranges_ = ranges; |
312 } | 312 } |
313 | 313 |
314 void MediaSourceDelegate::SetDuration(base::TimeDelta duration) { | 314 void MediaSourceDelegate::SetDuration(base::TimeDelta duration) { |
315 DCHECK(main_task_runner_->BelongsToCurrentThread()); | 315 DCHECK(main_task_runner_->BelongsToCurrentThread()); |
316 DVLOG(1) << __FUNCTION__ << "(" << duration.InSecondsF() << ") : " | 316 DVLOG(1) << __FUNCTION__ << "(" << duration.InSecondsF() << ") : " |
317 << demuxer_client_id_; | 317 << demuxer_client_id_; |
318 | 318 |
319 // Force duration change notification to be async to avoid reentrancy into | 319 // Force duration change notification to be async to avoid reentrancy into |
320 // ChunkDemxuer. | 320 // ChunkDemxuer. |
321 main_task_runner_->PostTask(FROM_HERE, base::Bind( | 321 main_task_runner_->PostTask(FROM_HERE, base::Bind( |
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
749 configs->video_codec = config.codec(); | 749 configs->video_codec = config.codec(); |
750 configs->video_size = config.natural_size(); | 750 configs->video_size = config.natural_size(); |
751 configs->is_video_encrypted = config.is_encrypted(); | 751 configs->is_video_encrypted = config.is_encrypted(); |
752 configs->video_extra_data = config.extra_data(); | 752 configs->video_extra_data = config.extra_data(); |
753 return true; | 753 return true; |
754 } | 754 } |
755 return false; | 755 return false; |
756 } | 756 } |
757 | 757 |
758 } // namespace content | 758 } // namespace content |
OLD | NEW |