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

Side by Side Diff: media/formats/webm/webm_audio_client.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_AUDIO_CLIENT_H_ 5 #ifndef MEDIA_FORMATS_WEBM_WEBM_AUDIO_CLIENT_H_
6 #define MEDIA_FORMATS_WEBM_WEBM_AUDIO_CLIENT_H_ 6 #define MEDIA_FORMATS_WEBM_WEBM_AUDIO_CLIENT_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 20 matching lines...) Expand all
31 // audio track element fields. 31 // audio track element fields.
32 bool InitializeConfig(const std::string& codec_id, 32 bool InitializeConfig(const std::string& codec_id,
33 const std::vector<uint8>& codec_private, 33 const std::vector<uint8>& codec_private,
34 const int64 seek_preroll, 34 const int64 seek_preroll,
35 const int64 codec_delay, 35 const int64 codec_delay,
36 bool is_encrypted, 36 bool is_encrypted,
37 AudioDecoderConfig* config); 37 AudioDecoderConfig* config);
38 38
39 private: 39 private:
40 // WebMParserClient implementation. 40 // WebMParserClient implementation.
41 virtual bool OnUInt(int id, int64 val) OVERRIDE; 41 virtual bool OnUInt(int id, int64 val) override;
42 virtual bool OnFloat(int id, double val) OVERRIDE; 42 virtual bool OnFloat(int id, double val) override;
43 43
44 LogCB log_cb_; 44 LogCB log_cb_;
45 int channels_; 45 int channels_;
46 double samples_per_second_; 46 double samples_per_second_;
47 double output_samples_per_second_; 47 double output_samples_per_second_;
48 48
49 DISALLOW_COPY_AND_ASSIGN(WebMAudioClient); 49 DISALLOW_COPY_AND_ASSIGN(WebMAudioClient);
50 }; 50 };
51 51
52 } // namespace media 52 } // namespace media
53 53
54 #endif // MEDIA_FORMATS_WEBM_WEBM_AUDIO_CLIENT_H_ 54 #endif // MEDIA_FORMATS_WEBM_WEBM_AUDIO_CLIENT_H_
OLDNEW
« no previous file with comments | « media/formats/mpeg/mpeg_audio_stream_parser_base.h ('k') | media/formats/webm/webm_cluster_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698