| 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 "media/filters/chunk_demuxer.h" | 5 #include "media/filters/chunk_demuxer.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <deque> | 8 #include <deque> |
| 9 #include <limits> | 9 #include <limits> |
| 10 | 10 |
| 11 #include "base/bind.h" | 11 #include "base/bind.h" |
| 12 #include "base/callback_helpers.h" | 12 #include "base/callback_helpers.h" |
| 13 #include "base/location.h" | 13 #include "base/location.h" |
| 14 #include "base/message_loop_proxy.h" | 14 #include "base/message_loop/message_loop_proxy.h" |
| 15 #include "media/base/audio_decoder_config.h" | 15 #include "media/base/audio_decoder_config.h" |
| 16 #include "media/base/stream_parser_buffer.h" | 16 #include "media/base/stream_parser_buffer.h" |
| 17 #include "media/base/video_decoder_config.h" | 17 #include "media/base/video_decoder_config.h" |
| 18 #include "media/filters/stream_parser_factory.h" | 18 #include "media/filters/stream_parser_factory.h" |
| 19 #include "media/webm/webm_webvtt_parser.h" | 19 #include "media/webm/webm_webvtt_parser.h" |
| 20 | 20 |
| 21 using base::TimeDelta; | 21 using base::TimeDelta; |
| 22 | 22 |
| 23 namespace media { | 23 namespace media { |
| 24 | 24 |
| (...skipping 1284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1309 | 1309 |
| 1310 Ranges<TimeDelta> ChunkDemuxer::GetBufferedRanges() const { | 1310 Ranges<TimeDelta> ChunkDemuxer::GetBufferedRanges() const { |
| 1311 if (audio_ && !video_) | 1311 if (audio_ && !video_) |
| 1312 return audio_->GetBufferedRanges(duration_); | 1312 return audio_->GetBufferedRanges(duration_); |
| 1313 else if (!audio_ && video_) | 1313 else if (!audio_ && video_) |
| 1314 return video_->GetBufferedRanges(duration_); | 1314 return video_->GetBufferedRanges(duration_); |
| 1315 return ComputeIntersection(); | 1315 return ComputeIntersection(); |
| 1316 } | 1316 } |
| 1317 | 1317 |
| 1318 } // namespace media | 1318 } // namespace media |
| OLD | NEW |