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

Side by Side Diff: media/formats/webm/webm_cluster_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
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_CLUSTER_PARSER_H_ 5 #ifndef MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_
6 #define MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_ 6 #define MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 // If no Parse() or Reset() has occurred since the last call to 184 // If no Parse() or Reset() has occurred since the last call to
185 // GetTextBuffers(), then the previous TextBufferQueueMap& is returned again 185 // GetTextBuffers(), then the previous TextBufferQueueMap& is returned again
186 // without any recalculation. 186 // without any recalculation.
187 const TextBufferQueueMap& GetTextBuffers(); 187 const TextBufferQueueMap& GetTextBuffers();
188 188
189 // Returns true if the last Parse() call stopped at the end of a cluster. 189 // Returns true if the last Parse() call stopped at the end of a cluster.
190 bool cluster_ended() const { return cluster_ended_; } 190 bool cluster_ended() const { return cluster_ended_; }
191 191
192 private: 192 private:
193 // WebMParserClient methods. 193 // WebMParserClient methods.
194 virtual WebMParserClient* OnListStart(int id) OVERRIDE; 194 virtual WebMParserClient* OnListStart(int id) override;
195 virtual bool OnListEnd(int id) OVERRIDE; 195 virtual bool OnListEnd(int id) override;
196 virtual bool OnUInt(int id, int64 val) OVERRIDE; 196 virtual bool OnUInt(int id, int64 val) override;
197 virtual bool OnBinary(int id, const uint8* data, int size) OVERRIDE; 197 virtual bool OnBinary(int id, const uint8* data, int size) override;
198 198
199 bool ParseBlock(bool is_simple_block, const uint8* buf, int size, 199 bool ParseBlock(bool is_simple_block, const uint8* buf, int size,
200 const uint8* additional, int additional_size, int duration, 200 const uint8* additional, int additional_size, int duration,
201 int64 discard_padding); 201 int64 discard_padding);
202 bool OnBlock(bool is_simple_block, int track_num, int timecode, int duration, 202 bool OnBlock(bool is_simple_block, int track_num, int timecode, int duration,
203 int flags, const uint8* data, int size, 203 int flags, const uint8* data, int size,
204 const uint8* additional, int additional_size, 204 const uint8* additional, int additional_size,
205 int64 discard_padding); 205 int64 discard_padding);
206 206
207 // Resets the Track objects associated with each text track. 207 // Resets the Track objects associated with each text track.
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 DecodeTimestamp ready_buffer_upper_bound_; 267 DecodeTimestamp ready_buffer_upper_bound_;
268 268
269 LogCB log_cb_; 269 LogCB log_cb_;
270 270
271 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMClusterParser); 271 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMClusterParser);
272 }; 272 };
273 273
274 } // namespace media 274 } // namespace media
275 275
276 #endif // MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_ 276 #endif // MEDIA_FORMATS_WEBM_WEBM_CLUSTER_PARSER_H_
OLDNEW
« no previous file with comments | « media/formats/webm/webm_audio_client.h ('k') | media/formats/webm/webm_content_encodings_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698