| 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 <limits> | 8 #include <limits> |
| 9 #include <list> | 9 #include <list> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 1008 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1019 video_.reset( | 1019 video_.reset( |
| 1020 new ChunkDemuxerStream(DemuxerStream::VIDEO, splice_frames_enabled_)); | 1020 new ChunkDemuxerStream(DemuxerStream::VIDEO, splice_frames_enabled_)); |
| 1021 return video_.get(); | 1021 return video_.get(); |
| 1022 break; | 1022 break; |
| 1023 case DemuxerStream::TEXT: { | 1023 case DemuxerStream::TEXT: { |
| 1024 return new ChunkDemuxerStream(DemuxerStream::TEXT, | 1024 return new ChunkDemuxerStream(DemuxerStream::TEXT, |
| 1025 splice_frames_enabled_); | 1025 splice_frames_enabled_); |
| 1026 break; | 1026 break; |
| 1027 } | 1027 } |
| 1028 case DemuxerStream::UNKNOWN: | 1028 case DemuxerStream::UNKNOWN: |
| 1029 case DemuxerStream::URL: |
| 1029 case DemuxerStream::NUM_TYPES: | 1030 case DemuxerStream::NUM_TYPES: |
| 1030 NOTREACHED(); | 1031 NOTREACHED(); |
| 1031 return NULL; | 1032 return NULL; |
| 1032 } | 1033 } |
| 1033 NOTREACHED(); | 1034 NOTREACHED(); |
| 1034 return NULL; | 1035 return NULL; |
| 1035 } | 1036 } |
| 1036 | 1037 |
| 1037 void ChunkDemuxer::OnNewTextTrack(ChunkDemuxerStream* text_stream, | 1038 void ChunkDemuxer::OnNewTextTrack(ChunkDemuxerStream* text_stream, |
| 1038 const TextTrackConfig& config) { | 1039 const TextTrackConfig& config) { |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1140 } | 1141 } |
| 1141 | 1142 |
| 1142 void ChunkDemuxer::ShutdownAllStreams() { | 1143 void ChunkDemuxer::ShutdownAllStreams() { |
| 1143 for (MediaSourceStateMap::iterator itr = source_state_map_.begin(); | 1144 for (MediaSourceStateMap::iterator itr = source_state_map_.begin(); |
| 1144 itr != source_state_map_.end(); ++itr) { | 1145 itr != source_state_map_.end(); ++itr) { |
| 1145 itr->second->Shutdown(); | 1146 itr->second->Shutdown(); |
| 1146 } | 1147 } |
| 1147 } | 1148 } |
| 1148 | 1149 |
| 1149 } // namespace media | 1150 } // namespace media |
| OLD | NEW |