Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Side by Side Diff: media/filters/chunk_demuxer.cc

Issue 2099453002: [DO NOT COMMIT/REVIEW] For reference: UrlDemuxerStreamProvider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/base/stream_parser_buffer.cc ('k') | media/filters/decoder_selector.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1024 matching lines...) Expand 10 before | Expand all | Expand 10 after
1035 video_.reset(new ChunkDemuxerStream( 1035 video_.reset(new ChunkDemuxerStream(
1036 DemuxerStream::VIDEO, splice_frames_enabled_, media_track_id)); 1036 DemuxerStream::VIDEO, splice_frames_enabled_, media_track_id));
1037 return video_.get(); 1037 return video_.get();
1038 break; 1038 break;
1039 case DemuxerStream::TEXT: { 1039 case DemuxerStream::TEXT: {
1040 return new ChunkDemuxerStream(DemuxerStream::TEXT, splice_frames_enabled_, 1040 return new ChunkDemuxerStream(DemuxerStream::TEXT, splice_frames_enabled_,
1041 media_track_id); 1041 media_track_id);
1042 break; 1042 break;
1043 } 1043 }
1044 case DemuxerStream::UNKNOWN: 1044 case DemuxerStream::UNKNOWN:
1045 case DemuxerStream::URL:
1045 case DemuxerStream::NUM_TYPES: 1046 case DemuxerStream::NUM_TYPES:
1046 NOTREACHED(); 1047 NOTREACHED();
1047 return NULL; 1048 return NULL;
1048 } 1049 }
1049 NOTREACHED(); 1050 NOTREACHED();
1050 return NULL; 1051 return NULL;
1051 } 1052 }
1052 1053
1053 void ChunkDemuxer::OnNewTextTrack(ChunkDemuxerStream* text_stream, 1054 void ChunkDemuxer::OnNewTextTrack(ChunkDemuxerStream* text_stream,
1054 const TextTrackConfig& config) { 1055 const TextTrackConfig& config) {
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
1156 } 1157 }
1157 1158
1158 void ChunkDemuxer::ShutdownAllStreams() { 1159 void ChunkDemuxer::ShutdownAllStreams() {
1159 for (MediaSourceStateMap::iterator itr = source_state_map_.begin(); 1160 for (MediaSourceStateMap::iterator itr = source_state_map_.begin();
1160 itr != source_state_map_.end(); ++itr) { 1161 itr != source_state_map_.end(); ++itr) {
1161 itr->second->Shutdown(); 1162 itr->second->Shutdown();
1162 } 1163 }
1163 } 1164 }
1164 1165
1165 } // namespace media 1166 } // namespace media
OLDNEW
« no previous file with comments | « media/base/stream_parser_buffer.cc ('k') | media/filters/decoder_selector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698