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

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

Issue 1861963008: Use StreamParser::TrackId instead of string for MediaTrack::byteStreamTrackId (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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
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 "media/base/audio_decoder_config.h" 8 #include "media/base/audio_decoder_config.h"
9 #include "media/base/video_decoder_config.h" 9 #include "media/base/video_decoder_config.h"
10 10
11 namespace media { 11 namespace media {
12 12
13 MediaTracks::MediaTracks() {} 13 MediaTracks::MediaTracks() {}
14 14
15 MediaTracks::~MediaTracks() {} 15 MediaTracks::~MediaTracks() {}
16 16
17 void MediaTracks::AddAudioTrack(const AudioDecoderConfig& config, 17 void MediaTracks::AddAudioTrack(const AudioDecoderConfig& config,
18 const std::string& id, 18 StreamParser::TrackId id,
19 const std::string& kind, 19 const std::string& kind,
20 const std::string& label, 20 const std::string& label,
21 const std::string& language) { 21 const std::string& language) {
22 DCHECK(config.IsValidConfig()); 22 DCHECK(config.IsValidConfig());
23 CHECK(audio_configs_.find(id) == audio_configs_.end()); 23 CHECK(audio_configs_.find(id) == audio_configs_.end());
24 scoped_ptr<MediaTrack> track = make_scoped_ptr( 24 scoped_ptr<MediaTrack> track = make_scoped_ptr(
25 new MediaTrack(MediaTrack::Audio, id, kind, label, language)); 25 new MediaTrack(MediaTrack::Audio, id, kind, label, language));
26 tracks_.push_back(std::move(track)); 26 tracks_.push_back(std::move(track));
27 audio_configs_[id] = config; 27 audio_configs_[id] = config;
28 } 28 }
29 29
30 void MediaTracks::AddVideoTrack(const VideoDecoderConfig& config, 30 void MediaTracks::AddVideoTrack(const VideoDecoderConfig& config,
31 const std::string& id, 31 StreamParser::TrackId id,
32 const std::string& kind, 32 const std::string& kind,
33 const std::string& label, 33 const std::string& label,
34 const std::string& language) { 34 const std::string& language) {
35 DCHECK(config.IsValidConfig()); 35 DCHECK(config.IsValidConfig());
36 CHECK(video_configs_.find(id) == video_configs_.end()); 36 CHECK(video_configs_.find(id) == video_configs_.end());
37 scoped_ptr<MediaTrack> track = make_scoped_ptr( 37 scoped_ptr<MediaTrack> track = make_scoped_ptr(
38 new MediaTrack(MediaTrack::Video, id, kind, label, language)); 38 new MediaTrack(MediaTrack::Video, id, kind, label, language));
39 tracks_.push_back(std::move(track)); 39 tracks_.push_back(std::move(track));
40 video_configs_[id] = config; 40 video_configs_[id] = config;
41 } 41 }
42 42
43 const AudioDecoderConfig& MediaTracks::getAudioConfig( 43 const AudioDecoderConfig& MediaTracks::getAudioConfig(
44 const std::string& id) const { 44 StreamParser::TrackId id) const {
45 auto it = audio_configs_.find(id); 45 auto it = audio_configs_.find(id);
46 if (it != audio_configs_.end()) 46 if (it != audio_configs_.end())
47 return it->second; 47 return it->second;
48 static AudioDecoderConfig invalidConfig; 48 static AudioDecoderConfig invalidConfig;
49 return invalidConfig; 49 return invalidConfig;
50 } 50 }
51 51
52 const VideoDecoderConfig& MediaTracks::getVideoConfig( 52 const VideoDecoderConfig& MediaTracks::getVideoConfig(
53 const std::string& id) const { 53 StreamParser::TrackId id) const {
54 auto it = video_configs_.find(id); 54 auto it = video_configs_.find(id);
55 if (it != video_configs_.end()) 55 if (it != video_configs_.end())
56 return it->second; 56 return it->second;
57 static VideoDecoderConfig invalidConfig; 57 static VideoDecoderConfig invalidConfig;
58 return invalidConfig; 58 return invalidConfig;
59 } 59 }
60 60
61 const AudioDecoderConfig& MediaTracks::getFirstAudioConfig() const { 61 const AudioDecoderConfig& MediaTracks::getFirstAudioConfig() const {
62 for (const auto& track : tracks()) { 62 for (const auto& track : tracks()) {
63 if (track->type() == MediaTrack::Audio) { 63 if (track->type() == MediaTrack::Audio) {
64 return getAudioConfig(track->id()); 64 return getAudioConfig(track->id());
65 } 65 }
66 } 66 }
67 static AudioDecoderConfig invalidConfig; 67 static AudioDecoderConfig invalidConfig;
68 return invalidConfig; 68 return invalidConfig;
69 } 69 }
70 70
71 const VideoDecoderConfig& MediaTracks::getFirstVideoConfig() const { 71 const VideoDecoderConfig& MediaTracks::getFirstVideoConfig() const {
72 for (const auto& track : tracks()) { 72 for (const auto& track : tracks()) {
73 if (track->type() == MediaTrack::Video) { 73 if (track->type() == MediaTrack::Video) {
74 return getVideoConfig(track->id()); 74 return getVideoConfig(track->id());
75 } 75 }
76 } 76 }
77 static VideoDecoderConfig invalidConfig; 77 static VideoDecoderConfig invalidConfig;
78 return invalidConfig; 78 return invalidConfig;
79 } 79 }
80 80
81 } // namespace media 81 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698