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

Side by Side Diff: media/formats/mp2t/mp2t_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/mp2t/es_parser_mpeg1audio.h ('k') | media/formats/mp2t/ts_section_pat.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_MP2T_MP2T_STREAM_PARSER_H_ 5 #ifndef MEDIA_FORMATS_MP2T_MP2T_STREAM_PARSER_H_
6 #define MEDIA_FORMATS_MP2T_MP2T_STREAM_PARSER_H_ 6 #define MEDIA_FORMATS_MP2T_MP2T_STREAM_PARSER_H_
7 7
8 #include <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 10
(...skipping 20 matching lines...) Expand all
31 virtual ~Mp2tStreamParser(); 31 virtual ~Mp2tStreamParser();
32 32
33 // StreamParser implementation. 33 // StreamParser implementation.
34 virtual void Init(const InitCB& init_cb, 34 virtual void Init(const InitCB& init_cb,
35 const NewConfigCB& config_cb, 35 const NewConfigCB& config_cb,
36 const NewBuffersCB& new_buffers_cb, 36 const NewBuffersCB& new_buffers_cb,
37 bool ignore_text_tracks, 37 bool ignore_text_tracks,
38 const NeedKeyCB& need_key_cb, 38 const NeedKeyCB& need_key_cb,
39 const NewMediaSegmentCB& new_segment_cb, 39 const NewMediaSegmentCB& new_segment_cb,
40 const base::Closure& end_of_segment_cb, 40 const base::Closure& end_of_segment_cb,
41 const LogCB& log_cb) OVERRIDE; 41 const LogCB& log_cb) override;
42 virtual void Flush() OVERRIDE; 42 virtual void Flush() override;
43 virtual bool Parse(const uint8* buf, int size) OVERRIDE; 43 virtual bool Parse(const uint8* buf, int size) override;
44 44
45 private: 45 private:
46 typedef std::map<int, PidState*> PidMap; 46 typedef std::map<int, PidState*> PidMap;
47 47
48 struct BufferQueueWithConfig { 48 struct BufferQueueWithConfig {
49 BufferQueueWithConfig(bool is_cfg_sent, 49 BufferQueueWithConfig(bool is_cfg_sent,
50 const AudioDecoderConfig& audio_cfg, 50 const AudioDecoderConfig& audio_cfg,
51 const VideoDecoderConfig& video_cfg); 51 const VideoDecoderConfig& video_cfg);
52 ~BufferQueueWithConfig(); 52 ~BufferQueueWithConfig();
53 53
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 TimestampUnroller timestamp_unroller_; 131 TimestampUnroller timestamp_unroller_;
132 132
133 DISALLOW_COPY_AND_ASSIGN(Mp2tStreamParser); 133 DISALLOW_COPY_AND_ASSIGN(Mp2tStreamParser);
134 }; 134 };
135 135
136 } // namespace mp2t 136 } // namespace mp2t
137 } // namespace media 137 } // namespace media
138 138
139 #endif 139 #endif
140 140
OLDNEW
« no previous file with comments | « media/formats/mp2t/es_parser_mpeg1audio.h ('k') | media/formats/mp2t/ts_section_pat.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698