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

Side by Side Diff: media/base/audio_renderer_mixer.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/base/audio_converter_perftest.cc ('k') | media/base/audio_renderer_mixer_input.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_BASE_AUDIO_RENDERER_MIXER_H_ 5 #ifndef MEDIA_BASE_AUDIO_RENDERER_MIXER_H_
6 #define MEDIA_BASE_AUDIO_RENDERER_MIXER_H_ 6 #define MEDIA_BASE_AUDIO_RENDERER_MIXER_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/synchronization/lock.h" 10 #include "base/synchronization/lock.h"
(...skipping 24 matching lines...) Expand all
35 void AddErrorCallback(const base::Closure& error_cb); 35 void AddErrorCallback(const base::Closure& error_cb);
36 void RemoveErrorCallback(const base::Closure& error_cb); 36 void RemoveErrorCallback(const base::Closure& error_cb);
37 37
38 void set_pause_delay_for_testing(base::TimeDelta delay) { 38 void set_pause_delay_for_testing(base::TimeDelta delay) {
39 pause_delay_ = delay; 39 pause_delay_ = delay;
40 } 40 }
41 41
42 private: 42 private:
43 // AudioRendererSink::RenderCallback implementation. 43 // AudioRendererSink::RenderCallback implementation.
44 virtual int Render(AudioBus* audio_bus, 44 virtual int Render(AudioBus* audio_bus,
45 int audio_delay_milliseconds) OVERRIDE; 45 int audio_delay_milliseconds) override;
46 virtual void OnRenderError() OVERRIDE; 46 virtual void OnRenderError() override;
47 47
48 // Output sink for this mixer. 48 // Output sink for this mixer.
49 scoped_refptr<AudioRendererSink> audio_sink_; 49 scoped_refptr<AudioRendererSink> audio_sink_;
50 50
51 // ---------------[ All variables below protected by |lock_| ]--------------- 51 // ---------------[ All variables below protected by |lock_| ]---------------
52 base::Lock lock_; 52 base::Lock lock_;
53 53
54 // List of error callbacks used by this mixer. 54 // List of error callbacks used by this mixer.
55 typedef std::list<base::Closure> ErrorCallbackList; 55 typedef std::list<base::Closure> ErrorCallbackList;
56 ErrorCallbackList error_callbacks_; 56 ErrorCallbackList error_callbacks_;
57 57
58 // Handles mixing and resampling between input and output parameters. 58 // Handles mixing and resampling between input and output parameters.
59 AudioConverter audio_converter_; 59 AudioConverter audio_converter_;
60 60
61 // Handles physical stream pause when no inputs are playing. For latency 61 // Handles physical stream pause when no inputs are playing. For latency
62 // reasons we don't want to immediately pause the physical stream. 62 // reasons we don't want to immediately pause the physical stream.
63 base::TimeDelta pause_delay_; 63 base::TimeDelta pause_delay_;
64 base::TimeTicks last_play_time_; 64 base::TimeTicks last_play_time_;
65 bool playing_; 65 bool playing_;
66 66
67 DISALLOW_COPY_AND_ASSIGN(AudioRendererMixer); 67 DISALLOW_COPY_AND_ASSIGN(AudioRendererMixer);
68 }; 68 };
69 69
70 } // namespace media 70 } // namespace media
71 71
72 #endif // MEDIA_BASE_AUDIO_RENDERER_MIXER_H_ 72 #endif // MEDIA_BASE_AUDIO_RENDERER_MIXER_H_
OLDNEW
« no previous file with comments | « media/base/audio_converter_perftest.cc ('k') | media/base/audio_renderer_mixer_input.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698