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

Side by Side Diff: media/formats/webm/webm_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/webm/webm_info_parser.h ('k') | media/formats/webm/webm_tracks_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_WEBM_WEBM_STREAM_PARSER_H_ 5 #ifndef MEDIA_FORMATS_WEBM_WEBM_STREAM_PARSER_H_
6 #define MEDIA_FORMATS_WEBM_WEBM_STREAM_PARSER_H_ 6 #define MEDIA_FORMATS_WEBM_WEBM_STREAM_PARSER_H_
7 7
8 #include "base/callback_forward.h" 8 #include "base/callback_forward.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "media/base/audio_decoder_config.h" 10 #include "media/base/audio_decoder_config.h"
(...skipping 11 matching lines...) Expand all
22 WebMStreamParser(); 22 WebMStreamParser();
23 virtual ~WebMStreamParser(); 23 virtual ~WebMStreamParser();
24 24
25 // StreamParser implementation. 25 // StreamParser implementation.
26 virtual void Init(const InitCB& init_cb, const NewConfigCB& config_cb, 26 virtual void Init(const InitCB& init_cb, const NewConfigCB& config_cb,
27 const NewBuffersCB& new_buffers_cb, 27 const NewBuffersCB& new_buffers_cb,
28 bool ignore_text_tracks, 28 bool ignore_text_tracks,
29 const NeedKeyCB& need_key_cb, 29 const NeedKeyCB& need_key_cb,
30 const NewMediaSegmentCB& new_segment_cb, 30 const NewMediaSegmentCB& new_segment_cb,
31 const base::Closure& end_of_segment_cb, 31 const base::Closure& end_of_segment_cb,
32 const LogCB& log_cb) OVERRIDE; 32 const LogCB& log_cb) override;
33 virtual void Flush() OVERRIDE; 33 virtual void Flush() override;
34 virtual bool Parse(const uint8* buf, int size) OVERRIDE; 34 virtual bool Parse(const uint8* buf, int size) override;
35 35
36 private: 36 private:
37 enum State { 37 enum State {
38 kWaitingForInit, 38 kWaitingForInit,
39 kParsingHeaders, 39 kParsingHeaders,
40 kParsingClusters, 40 kParsingClusters,
41 kError 41 kError
42 }; 42 };
43 43
44 void ChangeState(State new_state); 44 void ChangeState(State new_state);
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 80
81 scoped_ptr<WebMClusterParser> cluster_parser_; 81 scoped_ptr<WebMClusterParser> cluster_parser_;
82 ByteQueue byte_queue_; 82 ByteQueue byte_queue_;
83 83
84 DISALLOW_COPY_AND_ASSIGN(WebMStreamParser); 84 DISALLOW_COPY_AND_ASSIGN(WebMStreamParser);
85 }; 85 };
86 86
87 } // namespace media 87 } // namespace media
88 88
89 #endif // MEDIA_FORMATS_WEBM_WEBM_STREAM_PARSER_H_ 89 #endif // MEDIA_FORMATS_WEBM_WEBM_STREAM_PARSER_H_
OLDNEW
« no previous file with comments | « media/formats/webm/webm_info_parser.h ('k') | media/formats/webm/webm_tracks_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698