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

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

Issue 2416183002: media: Use native DemuxerStream enum types in media mojo interfaces (Closed)
Patch Set: comments addressed Created 4 years, 2 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_unittest.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 <utility> 9 #include <utility>
10 10
(...skipping 1173 matching lines...) Expand 10 before | Expand all | Expand 10 after
1184 1184
1185 case DemuxerStream::VIDEO: 1185 case DemuxerStream::VIDEO:
1186 owning_vector = &video_streams_; 1186 owning_vector = &video_streams_;
1187 break; 1187 break;
1188 1188
1189 case DemuxerStream::TEXT: 1189 case DemuxerStream::TEXT:
1190 owning_vector = &text_streams_; 1190 owning_vector = &text_streams_;
1191 break; 1191 break;
1192 1192
1193 case DemuxerStream::UNKNOWN: 1193 case DemuxerStream::UNKNOWN:
1194 case DemuxerStream::NUM_TYPES:
1195 NOTREACHED(); 1194 NOTREACHED();
1196 return nullptr; 1195 return nullptr;
1197 } 1196 }
1198 1197
1199 std::unique_ptr<ChunkDemuxerStream> stream = 1198 std::unique_ptr<ChunkDemuxerStream> stream =
1200 base::MakeUnique<ChunkDemuxerStream>(type, splice_frames_enabled_, 1199 base::MakeUnique<ChunkDemuxerStream>(type, splice_frames_enabled_,
1201 media_track_id); 1200 media_track_id);
1202 DCHECK(track_id_to_demux_stream_map_.find(media_track_id) == 1201 DCHECK(track_id_to_demux_stream_map_.find(media_track_id) ==
1203 track_id_to_demux_stream_map_.end()); 1202 track_id_to_demux_stream_map_.end());
1204 track_id_to_demux_stream_map_[media_track_id] = stream.get(); 1203 track_id_to_demux_stream_map_[media_track_id] = stream.get();
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
1313 } 1312 }
1314 1313
1315 void ChunkDemuxer::ShutdownAllStreams() { 1314 void ChunkDemuxer::ShutdownAllStreams() {
1316 for (auto itr = source_state_map_.begin(); itr != source_state_map_.end(); 1315 for (auto itr = source_state_map_.begin(); itr != source_state_map_.end();
1317 ++itr) { 1316 ++itr) {
1318 itr->second->Shutdown(); 1317 itr->second->Shutdown();
1319 } 1318 }
1320 } 1319 }
1321 1320
1322 } // namespace media 1321 } // namespace media
OLDNEW
« no previous file with comments | « media/base/stream_parser_unittest.cc ('k') | media/filters/decoder_selector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698