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

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

Issue 2234753002: media: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 4 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/cdm/player_tracker_impl.cc ('k') | media/filters/frame_processor.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 973 matching lines...) Expand 10 before | Expand all | Expand 10 after
984 void ChunkDemuxer::ChangeState_Locked(State new_state) { 984 void ChunkDemuxer::ChangeState_Locked(State new_state) {
985 lock_.AssertAcquired(); 985 lock_.AssertAcquired();
986 DVLOG(1) << "ChunkDemuxer::ChangeState_Locked() : " 986 DVLOG(1) << "ChunkDemuxer::ChangeState_Locked() : "
987 << state_ << " -> " << new_state; 987 << state_ << " -> " << new_state;
988 state_ = new_state; 988 state_ = new_state;
989 } 989 }
990 990
991 ChunkDemuxer::~ChunkDemuxer() { 991 ChunkDemuxer::~ChunkDemuxer() {
992 DCHECK_NE(state_, INITIALIZED); 992 DCHECK_NE(state_, INITIALIZED);
993 993
994 STLDeleteValues(&source_state_map_); 994 base::STLDeleteValues(&source_state_map_);
995 } 995 }
996 996
997 void ChunkDemuxer::ReportError_Locked(PipelineStatus error) { 997 void ChunkDemuxer::ReportError_Locked(PipelineStatus error) {
998 DVLOG(1) << "ReportError_Locked(" << error << ")"; 998 DVLOG(1) << "ReportError_Locked(" << error << ")";
999 lock_.AssertAcquired(); 999 lock_.AssertAcquired();
1000 DCHECK_NE(error, PIPELINE_OK); 1000 DCHECK_NE(error, PIPELINE_OK);
1001 1001
1002 ChangeState_Locked(PARSE_ERROR); 1002 ChangeState_Locked(PARSE_ERROR);
1003 1003
1004 PipelineStatusCB cb; 1004 PipelineStatusCB cb;
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
1260 } 1260 }
1261 1261
1262 void ChunkDemuxer::ShutdownAllStreams() { 1262 void ChunkDemuxer::ShutdownAllStreams() {
1263 for (MediaSourceStateMap::iterator itr = source_state_map_.begin(); 1263 for (MediaSourceStateMap::iterator itr = source_state_map_.begin();
1264 itr != source_state_map_.end(); ++itr) { 1264 itr != source_state_map_.end(); ++itr) {
1265 itr->second->Shutdown(); 1265 itr->second->Shutdown();
1266 } 1266 }
1267 } 1267 }
1268 1268
1269 } // namespace media 1269 } // namespace media
OLDNEW
« no previous file with comments | « media/cdm/player_tracker_impl.cc ('k') | media/filters/frame_processor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698