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

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

Issue 2226443002: Support multiple media tracks in MSE / ChunkDemuxer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed integer overflow 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/audio_codecs.cc ('k') | media/base/media_track.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_TRACK_H_ 5 #ifndef MEDIA_BASE_MEDIA_TRACK_H_
6 #define MEDIA_BASE_MEDIA_TRACK_H_ 6 #define MEDIA_BASE_MEDIA_TRACK_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "media/base/media_export.h" 10 #include "media/base/media_export.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 StreamParser::TrackId bytestream_track_id_; 53 StreamParser::TrackId bytestream_track_id_;
54 Id id_; 54 Id id_;
55 55
56 // These properties are read from input streams by stream parsers as specified 56 // These properties are read from input streams by stream parsers as specified
57 // in https://dev.w3.org/html5/html-sourcing-inband-tracks/. 57 // in https://dev.w3.org/html5/html-sourcing-inband-tracks/.
58 std::string kind_; 58 std::string kind_;
59 std::string label_; 59 std::string label_;
60 std::string language_; 60 std::string language_;
61 }; 61 };
62 62
63 // Helper for logging.
64 MEDIA_EXPORT const char* TrackTypeToStr(MediaTrack::Type type);
65
63 } // namespace media 66 } // namespace media
64 67
65 #endif // MEDIA_BASE_MEDIA_TRACK_H_ 68 #endif // MEDIA_BASE_MEDIA_TRACK_H_
OLDNEW
« no previous file with comments | « media/base/audio_codecs.cc ('k') | media/base/media_track.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698