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

Side by Side Diff: media/audio/audio_input_device.cc

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/audio/audio_input_device.h ('k') | media/audio/audio_input_unittest.cc » ('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 #include "media/audio/audio_input_device.h" 5 #include "media/audio/audio_input_device.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "base/threading/thread_restrictions.h" 10 #include "base/threading/thread_restrictions.h"
(...skipping 15 matching lines...) Expand all
26 class AudioInputDevice::AudioThreadCallback 26 class AudioInputDevice::AudioThreadCallback
27 : public AudioDeviceThread::Callback { 27 : public AudioDeviceThread::Callback {
28 public: 28 public:
29 AudioThreadCallback(const AudioParameters& audio_parameters, 29 AudioThreadCallback(const AudioParameters& audio_parameters,
30 base::SharedMemoryHandle memory, 30 base::SharedMemoryHandle memory,
31 int memory_length, 31 int memory_length,
32 int total_segments, 32 int total_segments,
33 CaptureCallback* capture_callback); 33 CaptureCallback* capture_callback);
34 virtual ~AudioThreadCallback(); 34 virtual ~AudioThreadCallback();
35 35
36 virtual void MapSharedMemory() OVERRIDE; 36 virtual void MapSharedMemory() override;
37 37
38 // Called whenever we receive notifications about pending data. 38 // Called whenever we receive notifications about pending data.
39 virtual void Process(int pending_data) OVERRIDE; 39 virtual void Process(int pending_data) override;
40 40
41 private: 41 private:
42 int current_segment_id_; 42 int current_segment_id_;
43 ScopedVector<media::AudioBus> audio_buses_; 43 ScopedVector<media::AudioBus> audio_buses_;
44 CaptureCallback* capture_callback_; 44 CaptureCallback* capture_callback_;
45 45
46 DISALLOW_COPY_AND_ASSIGN(AudioThreadCallback); 46 DISALLOW_COPY_AND_ASSIGN(AudioThreadCallback);
47 }; 47 };
48 48
49 AudioInputDevice::AudioInputDevice( 49 AudioInputDevice::AudioInputDevice(
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 // and update the audio-delay measurement. 316 // and update the audio-delay measurement.
317 int audio_delay_milliseconds = pending_data / bytes_per_ms_; 317 int audio_delay_milliseconds = pending_data / bytes_per_ms_;
318 capture_callback_->Capture( 318 capture_callback_->Capture(
319 audio_bus, audio_delay_milliseconds, volume, key_pressed); 319 audio_bus, audio_delay_milliseconds, volume, key_pressed);
320 320
321 if (++current_segment_id_ >= total_segments_) 321 if (++current_segment_id_ >= total_segments_)
322 current_segment_id_ = 0; 322 current_segment_id_ = 0;
323 } 323 }
324 324
325 } // namespace media 325 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/audio_input_device.h ('k') | media/audio/audio_input_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698