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

Side by Side Diff: media/formats/mp4/box_definitions.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/mp2t/ts_section_psi.h ('k') | media/formats/mp4/box_reader_unittest.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 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_MP4_BOX_DEFINITIONS_H_ 5 #ifndef MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
6 #define MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_ 6 #define MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 15 matching lines...) Expand all
26 kHint 26 kHint
27 }; 27 };
28 28
29 enum SampleFlags { 29 enum SampleFlags {
30 kSampleIsNonSyncSample = 0x10000 30 kSampleIsNonSyncSample = 0x10000
31 }; 31 };
32 32
33 #define DECLARE_BOX_METHODS(T) \ 33 #define DECLARE_BOX_METHODS(T) \
34 T(); \ 34 T(); \
35 virtual ~T(); \ 35 virtual ~T(); \
36 virtual bool Parse(BoxReader* reader) OVERRIDE; \ 36 virtual bool Parse(BoxReader* reader) override; \
37 virtual FourCC BoxType() const OVERRIDE; \ 37 virtual FourCC BoxType() const override; \
38 38
39 struct MEDIA_EXPORT FileType : Box { 39 struct MEDIA_EXPORT FileType : Box {
40 DECLARE_BOX_METHODS(FileType); 40 DECLARE_BOX_METHODS(FileType);
41 41
42 FourCC major_brand; 42 FourCC major_brand;
43 uint32 minor_version; 43 uint32 minor_version;
44 }; 44 };
45 45
46 struct MEDIA_EXPORT ProtectionSystemSpecificHeader : Box { 46 struct MEDIA_EXPORT ProtectionSystemSpecificHeader : Box {
47 DECLARE_BOX_METHODS(ProtectionSystemSpecificHeader); 47 DECLARE_BOX_METHODS(ProtectionSystemSpecificHeader);
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 std::vector<TrackFragment> tracks; 428 std::vector<TrackFragment> tracks;
429 std::vector<ProtectionSystemSpecificHeader> pssh; 429 std::vector<ProtectionSystemSpecificHeader> pssh;
430 }; 430 };
431 431
432 #undef DECLARE_BOX 432 #undef DECLARE_BOX
433 433
434 } // namespace mp4 434 } // namespace mp4
435 } // namespace media 435 } // namespace media
436 436
437 #endif // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_ 437 #endif // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
OLDNEW
« no previous file with comments | « media/formats/mp2t/ts_section_psi.h ('k') | media/formats/mp4/box_reader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698