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

Side by Side Diff: media/base/media_tracks.cc

Issue 2253943004: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/base/fake_demuxer_stream.cc ('k') | media/base/stream_parser_buffer.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/base/media_tracks.h" 5 #include "media/base/media_tracks.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "media/base/audio_decoder_config.h" 9 #include "media/base/audio_decoder_config.h"
10 #include "media/base/video_decoder_config.h" 10 #include "media/base/video_decoder_config.h"
11 11
12 namespace media { 12 namespace media {
13 13
14 MediaTracks::MediaTracks() {} 14 MediaTracks::MediaTracks() {}
15 15
16 MediaTracks::~MediaTracks() {} 16 MediaTracks::~MediaTracks() {}
17 17
18 MediaTrack* MediaTracks::AddAudioTrack( 18 MediaTrack* MediaTracks::AddAudioTrack(
19 const AudioDecoderConfig& config, 19 const AudioDecoderConfig& config,
20 StreamParser::TrackId bytestream_track_id, 20 StreamParser::TrackId bytestream_track_id,
21 const std::string& kind, 21 const std::string& kind,
22 const std::string& label, 22 const std::string& label,
23 const std::string& language) { 23 const std::string& language) {
24 DCHECK(config.IsValidConfig()); 24 DCHECK(config.IsValidConfig());
25 CHECK(audio_configs_.find(bytestream_track_id) == audio_configs_.end()); 25 CHECK(audio_configs_.find(bytestream_track_id) == audio_configs_.end());
26 std::unique_ptr<MediaTrack> track = base::WrapUnique(new MediaTrack( 26 std::unique_ptr<MediaTrack> track = base::MakeUnique<MediaTrack>(
27 MediaTrack::Audio, bytestream_track_id, kind, label, language)); 27 MediaTrack::Audio, bytestream_track_id, kind, label, language);
28 MediaTrack* track_ptr = track.get(); 28 MediaTrack* track_ptr = track.get();
29 tracks_.push_back(std::move(track)); 29 tracks_.push_back(std::move(track));
30 audio_configs_[bytestream_track_id] = config; 30 audio_configs_[bytestream_track_id] = config;
31 return track_ptr; 31 return track_ptr;
32 } 32 }
33 33
34 MediaTrack* MediaTracks::AddVideoTrack( 34 MediaTrack* MediaTracks::AddVideoTrack(
35 const VideoDecoderConfig& config, 35 const VideoDecoderConfig& config,
36 StreamParser::TrackId bytestream_track_id, 36 StreamParser::TrackId bytestream_track_id,
37 const std::string& kind, 37 const std::string& kind,
38 const std::string& label, 38 const std::string& label,
39 const std::string& language) { 39 const std::string& language) {
40 DCHECK(config.IsValidConfig()); 40 DCHECK(config.IsValidConfig());
41 CHECK(video_configs_.find(bytestream_track_id) == video_configs_.end()); 41 CHECK(video_configs_.find(bytestream_track_id) == video_configs_.end());
42 std::unique_ptr<MediaTrack> track = base::WrapUnique(new MediaTrack( 42 std::unique_ptr<MediaTrack> track = base::MakeUnique<MediaTrack>(
43 MediaTrack::Video, bytestream_track_id, kind, label, language)); 43 MediaTrack::Video, bytestream_track_id, kind, label, language);
44 MediaTrack* track_ptr = track.get(); 44 MediaTrack* track_ptr = track.get();
45 tracks_.push_back(std::move(track)); 45 tracks_.push_back(std::move(track));
46 video_configs_[bytestream_track_id] = config; 46 video_configs_[bytestream_track_id] = config;
47 return track_ptr; 47 return track_ptr;
48 } 48 }
49 49
50 const AudioDecoderConfig& MediaTracks::getAudioConfig( 50 const AudioDecoderConfig& MediaTracks::getAudioConfig(
51 StreamParser::TrackId bytestream_track_id) const { 51 StreamParser::TrackId bytestream_track_id) const {
52 auto it = audio_configs_.find(bytestream_track_id); 52 auto it = audio_configs_.find(bytestream_track_id);
53 if (it != audio_configs_.end()) 53 if (it != audio_configs_.end())
54 return it->second; 54 return it->second;
55 static AudioDecoderConfig invalidConfig; 55 static AudioDecoderConfig invalidConfig;
56 return invalidConfig; 56 return invalidConfig;
57 } 57 }
58 58
59 const VideoDecoderConfig& MediaTracks::getVideoConfig( 59 const VideoDecoderConfig& MediaTracks::getVideoConfig(
60 StreamParser::TrackId bytestream_track_id) const { 60 StreamParser::TrackId bytestream_track_id) const {
61 auto it = video_configs_.find(bytestream_track_id); 61 auto it = video_configs_.find(bytestream_track_id);
62 if (it != video_configs_.end()) 62 if (it != video_configs_.end())
63 return it->second; 63 return it->second;
64 static VideoDecoderConfig invalidConfig; 64 static VideoDecoderConfig invalidConfig;
65 return invalidConfig; 65 return invalidConfig;
66 } 66 }
67 67
68 } // namespace media 68 } // namespace media
OLDNEW
« no previous file with comments | « media/base/fake_demuxer_stream.cc ('k') | media/base/stream_parser_buffer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698