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

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

Issue 2050043002: Generate and assign media track ids in demuxers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use-streamparser-trackid
Patch Set: rebase to ToT Created 4 years, 6 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/media_track.h ('k') | media/base/media_tracks.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 #ifndef MEDIA_BASE_MEDIA_TRACKS_H_ 5 #ifndef MEDIA_BASE_MEDIA_TRACKS_H_
6 #define MEDIA_BASE_MEDIA_TRACKS_H_ 6 #define MEDIA_BASE_MEDIA_TRACKS_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
(...skipping 10 matching lines...) Expand all
21 21
22 class MEDIA_EXPORT MediaTracks { 22 class MEDIA_EXPORT MediaTracks {
23 public: 23 public:
24 using MediaTracksCollection = std::vector<std::unique_ptr<MediaTrack>>; 24 using MediaTracksCollection = std::vector<std::unique_ptr<MediaTrack>>;
25 25
26 MediaTracks(); 26 MediaTracks();
27 ~MediaTracks(); 27 ~MediaTracks();
28 28
29 // Adds a new audio track. The |bytestreamTrackId| must uniquely identify the 29 // Adds a new audio track. The |bytestreamTrackId| must uniquely identify the
30 // track within the bytestream. 30 // track within the bytestream.
31 void AddAudioTrack(const AudioDecoderConfig& config, 31 MediaTrack* AddAudioTrack(const AudioDecoderConfig& config,
32 StreamParser::TrackId bytestream_track_id, 32 StreamParser::TrackId bytestream_track_id,
33 const std::string& kind, 33 const std::string& kind,
34 const std::string& label, 34 const std::string& label,
35 const std::string& language); 35 const std::string& language);
36 // Adds a new video track. The |bytestreamTrackId| must uniquely identify the 36 // Adds a new video track. The |bytestreamTrackId| must uniquely identify the
37 // track within the bytestream. 37 // track within the bytestream.
38 void AddVideoTrack(const VideoDecoderConfig& config, 38 MediaTrack* AddVideoTrack(const VideoDecoderConfig& config,
39 StreamParser::TrackId bytestream_track_id, 39 StreamParser::TrackId bytestream_track_id,
40 const std::string& kind, 40 const std::string& kind,
41 const std::string& label, 41 const std::string& label,
42 const std::string& language); 42 const std::string& language);
43 43
44 const MediaTracksCollection& tracks() const { return tracks_; } 44 const MediaTracksCollection& tracks() const { return tracks_; }
45 45
46 const AudioDecoderConfig& getAudioConfig( 46 const AudioDecoderConfig& getAudioConfig(
47 StreamParser::TrackId bytestream_track_id) const; 47 StreamParser::TrackId bytestream_track_id) const;
48 const VideoDecoderConfig& getVideoConfig( 48 const VideoDecoderConfig& getVideoConfig(
49 StreamParser::TrackId bytestream_track_id) const; 49 StreamParser::TrackId bytestream_track_id) const;
50 50
51 // TODO(servolk): These are temporary helpers useful until all code paths are 51 // TODO(servolk): These are temporary helpers useful until all code paths are
52 // converted to properly handle multiple media tracks. 52 // converted to properly handle multiple media tracks.
53 const AudioDecoderConfig& getFirstAudioConfig() const; 53 const AudioDecoderConfig& getFirstAudioConfig() const;
54 const VideoDecoderConfig& getFirstVideoConfig() const; 54 const VideoDecoderConfig& getFirstVideoConfig() const;
55 55
56 private: 56 private:
57 MediaTracksCollection tracks_; 57 MediaTracksCollection tracks_;
58 std::map<StreamParser::TrackId, AudioDecoderConfig> audio_configs_; 58 std::map<StreamParser::TrackId, AudioDecoderConfig> audio_configs_;
59 std::map<StreamParser::TrackId, VideoDecoderConfig> video_configs_; 59 std::map<StreamParser::TrackId, VideoDecoderConfig> video_configs_;
60 60
61 DISALLOW_COPY_AND_ASSIGN(MediaTracks); 61 DISALLOW_COPY_AND_ASSIGN(MediaTracks);
62 }; 62 };
63 63
64 } // namespace media 64 } // namespace media
65 65
66 #endif // MEDIA_BASE_MEDIA_TRACKS_H_ 66 #endif // MEDIA_BASE_MEDIA_TRACKS_H_
OLDNEW
« no previous file with comments | « media/base/media_track.h ('k') | media/base/media_tracks.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698