| 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 |
| (...skipping 1324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1335 audio_.reset(new ChunkDemuxerStream(DemuxerStream::AUDIO)); | 1335 audio_.reset(new ChunkDemuxerStream(DemuxerStream::AUDIO)); |
| 1336 return audio_.get(); | 1336 return audio_.get(); |
| 1337 break; | 1337 break; |
| 1338 case DemuxerStream::VIDEO: | 1338 case DemuxerStream::VIDEO: |
| 1339 if (video_) | 1339 if (video_) |
| 1340 return NULL; | 1340 return NULL; |
| 1341 video_.reset(new ChunkDemuxerStream(DemuxerStream::VIDEO)); | 1341 video_.reset(new ChunkDemuxerStream(DemuxerStream::VIDEO)); |
| 1342 return video_.get(); | 1342 return video_.get(); |
| 1343 break; | 1343 break; |
| 1344 case DemuxerStream::UNKNOWN: | 1344 case DemuxerStream::UNKNOWN: |
| 1345 case DemuxerStream::TEXT: |
| 1345 case DemuxerStream::NUM_TYPES: | 1346 case DemuxerStream::NUM_TYPES: |
| 1346 NOTREACHED(); | 1347 NOTREACHED(); |
| 1347 return NULL; | 1348 return NULL; |
| 1348 } | 1349 } |
| 1349 NOTREACHED(); | 1350 NOTREACHED(); |
| 1350 return NULL; | 1351 return NULL; |
| 1351 } | 1352 } |
| 1352 | 1353 |
| 1353 bool ChunkDemuxer::OnTextBuffers( | 1354 bool ChunkDemuxer::OnTextBuffers( |
| 1354 TextTrack* text_track, | 1355 TextTrack* text_track, |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1447 | 1448 |
| 1448 void ChunkDemuxer::CompletePendingReadsIfPossible() { | 1449 void ChunkDemuxer::CompletePendingReadsIfPossible() { |
| 1449 if (audio_) | 1450 if (audio_) |
| 1450 audio_->CompletePendingReadIfPossible(); | 1451 audio_->CompletePendingReadIfPossible(); |
| 1451 | 1452 |
| 1452 if (video_) | 1453 if (video_) |
| 1453 video_->CompletePendingReadIfPossible(); | 1454 video_->CompletePendingReadIfPossible(); |
| 1454 } | 1455 } |
| 1455 | 1456 |
| 1456 } // namespace media | 1457 } // namespace media |
| OLD | NEW |