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