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

Side by Side Diff: media/formats/webm/webm_tracks_parser.h

Issue 623263003: replace OVERRIDE and FINAL with override and final in media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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/formats/webm/webm_stream_parser.h ('k') | media/formats/webm/webm_video_client.h » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_ 5 #ifndef MEDIA_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_
6 #define MEDIA_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_ 6 #define MEDIA_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 } 68 }
69 69
70 typedef std::map<int, TextTrackConfig> TextTracks; 70 typedef std::map<int, TextTrackConfig> TextTracks;
71 71
72 const TextTracks& text_tracks() const { 72 const TextTracks& text_tracks() const {
73 return text_tracks_; 73 return text_tracks_;
74 } 74 }
75 75
76 private: 76 private:
77 // WebMParserClient implementation. 77 // WebMParserClient implementation.
78 virtual WebMParserClient* OnListStart(int id) OVERRIDE; 78 virtual WebMParserClient* OnListStart(int id) override;
79 virtual bool OnListEnd(int id) OVERRIDE; 79 virtual bool OnListEnd(int id) override;
80 virtual bool OnUInt(int id, int64 val) OVERRIDE; 80 virtual bool OnUInt(int id, int64 val) override;
81 virtual bool OnFloat(int id, double val) OVERRIDE; 81 virtual bool OnFloat(int id, double val) override;
82 virtual bool OnBinary(int id, const uint8* data, int size) OVERRIDE; 82 virtual bool OnBinary(int id, const uint8* data, int size) override;
83 virtual bool OnString(int id, const std::string& str) OVERRIDE; 83 virtual bool OnString(int id, const std::string& str) override;
84 84
85 int64 track_type_; 85 int64 track_type_;
86 int64 track_num_; 86 int64 track_num_;
87 std::string track_name_; 87 std::string track_name_;
88 std::string track_language_; 88 std::string track_language_;
89 std::string codec_id_; 89 std::string codec_id_;
90 std::vector<uint8> codec_private_; 90 std::vector<uint8> codec_private_;
91 int64 seek_preroll_; 91 int64 seek_preroll_;
92 int64 codec_delay_; 92 int64 codec_delay_;
93 int64 default_duration_; 93 int64 default_duration_;
(...skipping 15 matching lines...) Expand all
109 109
110 WebMVideoClient video_client_; 110 WebMVideoClient video_client_;
111 VideoDecoderConfig video_decoder_config_; 111 VideoDecoderConfig video_decoder_config_;
112 112
113 DISALLOW_COPY_AND_ASSIGN(WebMTracksParser); 113 DISALLOW_COPY_AND_ASSIGN(WebMTracksParser);
114 }; 114 };
115 115
116 } // namespace media 116 } // namespace media
117 117
118 #endif // MEDIA_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_ 118 #endif // MEDIA_FORMATS_WEBM_WEBM_TRACKS_PARSER_H_
OLDNEW
« no previous file with comments | « media/formats/webm/webm_stream_parser.h ('k') | media/formats/webm/webm_video_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698