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

Side by Side Diff: media/formats/mp4/mp4_stream_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/mp4/box_reader_unittest.cc ('k') | media/formats/mpeg/adts_stream_parser.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_MP4_MP4_STREAM_PARSER_H_ 5 #ifndef MEDIA_FORMATS_MP4_MP4_STREAM_PARSER_H_
6 #define MEDIA_FORMATS_MP4_MP4_STREAM_PARSER_H_ 6 #define MEDIA_FORMATS_MP4_MP4_STREAM_PARSER_H_
7 7
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 16 matching lines...) Expand all
27 public: 27 public:
28 MP4StreamParser(const std::set<int>& audio_object_types, bool has_sbr); 28 MP4StreamParser(const std::set<int>& audio_object_types, bool has_sbr);
29 virtual ~MP4StreamParser(); 29 virtual ~MP4StreamParser();
30 30
31 virtual void Init(const InitCB& init_cb, const NewConfigCB& config_cb, 31 virtual void Init(const InitCB& init_cb, const NewConfigCB& config_cb,
32 const NewBuffersCB& new_buffers_cb, 32 const NewBuffersCB& new_buffers_cb,
33 bool ignore_text_tracks, 33 bool ignore_text_tracks,
34 const NeedKeyCB& need_key_cb, 34 const NeedKeyCB& need_key_cb,
35 const NewMediaSegmentCB& new_segment_cb, 35 const NewMediaSegmentCB& new_segment_cb,
36 const base::Closure& end_of_segment_cb, 36 const base::Closure& end_of_segment_cb,
37 const LogCB& log_cb) OVERRIDE; 37 const LogCB& log_cb) override;
38 virtual void Flush() OVERRIDE; 38 virtual void Flush() override;
39 virtual bool Parse(const uint8* buf, int size) OVERRIDE; 39 virtual bool Parse(const uint8* buf, int size) override;
40 40
41 private: 41 private:
42 enum State { 42 enum State {
43 kWaitingForInit, 43 kWaitingForInit,
44 kParsingBoxes, 44 kParsingBoxes,
45 kWaitingForSampleData, 45 kWaitingForSampleData,
46 kEmittingSamples, 46 kEmittingSamples,
47 kError 47 kError
48 }; 48 };
49 49
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 bool is_audio_track_encrypted_; 129 bool is_audio_track_encrypted_;
130 bool is_video_track_encrypted_; 130 bool is_video_track_encrypted_;
131 131
132 DISALLOW_COPY_AND_ASSIGN(MP4StreamParser); 132 DISALLOW_COPY_AND_ASSIGN(MP4StreamParser);
133 }; 133 };
134 134
135 } // namespace mp4 135 } // namespace mp4
136 } // namespace media 136 } // namespace media
137 137
138 #endif // MEDIA_FORMATS_MP4_MP4_STREAM_PARSER_H_ 138 #endif // MEDIA_FORMATS_MP4_MP4_STREAM_PARSER_H_
OLDNEW
« no previous file with comments | « media/formats/mp4/box_reader_unittest.cc ('k') | media/formats/mpeg/adts_stream_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698