| Index: content/renderer/media/webrtc_audio_device_impl.h
|
| diff --git a/content/renderer/media/webrtc_audio_device_impl.h b/content/renderer/media/webrtc_audio_device_impl.h
|
| index 77b837ccaf8fb5e3febbff683104de3063de718a..55b32581e72857e458c91d5d242df3d910517cfc 100644
|
| --- a/content/renderer/media/webrtc_audio_device_impl.h
|
| +++ b/content/renderer/media/webrtc_audio_device_impl.h
|
| @@ -283,47 +283,47 @@ class CONTENT_EXPORT WebRtcAudioDeviceImpl
|
| // The creator must call AddRef() after construction and use Release()
|
| // to release the reference and delete this object.
|
| // Called on the main render thread.
|
| - virtual int32_t AddRef() override;
|
| - virtual int32_t Release() override;
|
| + int32_t AddRef() override;
|
| + int32_t Release() override;
|
|
|
| // webrtc::AudioDeviceModule implementation.
|
| // All implemented methods are called on the main render thread unless
|
| // anything else is stated.
|
|
|
| - virtual int32_t RegisterAudioCallback(webrtc::AudioTransport* audio_callback)
|
| - override;
|
| + int32_t RegisterAudioCallback(
|
| + webrtc::AudioTransport* audio_callback) override;
|
|
|
| - virtual int32_t Init() override;
|
| - virtual int32_t Terminate() override;
|
| - virtual bool Initialized() const override;
|
| + int32_t Init() override;
|
| + int32_t Terminate() override;
|
| + bool Initialized() const override;
|
|
|
| - virtual int32_t PlayoutIsAvailable(bool* available) override;
|
| - virtual bool PlayoutIsInitialized() const override;
|
| - virtual int32_t RecordingIsAvailable(bool* available) override;
|
| - virtual bool RecordingIsInitialized() const override;
|
| + int32_t PlayoutIsAvailable(bool* available) override;
|
| + bool PlayoutIsInitialized() const override;
|
| + int32_t RecordingIsAvailable(bool* available) override;
|
| + bool RecordingIsInitialized() const override;
|
|
|
| // All Start/Stop methods are called on a libJingle worker thread.
|
| - virtual int32_t StartPlayout() override;
|
| - virtual int32_t StopPlayout() override;
|
| - virtual bool Playing() const override;
|
| - virtual int32_t StartRecording() override;
|
| - virtual int32_t StopRecording() override;
|
| - virtual bool Recording() const override;
|
| + int32_t StartPlayout() override;
|
| + int32_t StopPlayout() override;
|
| + bool Playing() const override;
|
| + int32_t StartRecording() override;
|
| + int32_t StopRecording() override;
|
| + bool Recording() const override;
|
|
|
| // Called on the AudioInputDevice worker thread.
|
| - virtual int32_t SetMicrophoneVolume(uint32_t volume) override;
|
| + int32_t SetMicrophoneVolume(uint32_t volume) override;
|
|
|
| // TODO(henrika): sort out calling thread once we start using this API.
|
| - virtual int32_t MicrophoneVolume(uint32_t* volume) const override;
|
| + int32_t MicrophoneVolume(uint32_t* volume) const override;
|
|
|
| - virtual int32_t MaxMicrophoneVolume(uint32_t* max_volume) const override;
|
| - virtual int32_t MinMicrophoneVolume(uint32_t* min_volume) const override;
|
| - virtual int32_t StereoPlayoutIsAvailable(bool* available) const override;
|
| - virtual int32_t StereoRecordingIsAvailable(bool* available) const override;
|
| - virtual int32_t PlayoutDelay(uint16_t* delay_ms) const override;
|
| - virtual int32_t RecordingDelay(uint16_t* delay_ms) const override;
|
| - virtual int32_t RecordingSampleRate(uint32_t* sample_rate) const override;
|
| - virtual int32_t PlayoutSampleRate(uint32_t* sample_rate) const override;
|
| + int32_t MaxMicrophoneVolume(uint32_t* max_volume) const override;
|
| + int32_t MinMicrophoneVolume(uint32_t* min_volume) const override;
|
| + int32_t StereoPlayoutIsAvailable(bool* available) const override;
|
| + int32_t StereoRecordingIsAvailable(bool* available) const override;
|
| + int32_t PlayoutDelay(uint16_t* delay_ms) const override;
|
| + int32_t RecordingDelay(uint16_t* delay_ms) const override;
|
| + int32_t RecordingSampleRate(uint32_t* sample_rate) const override;
|
| + int32_t PlayoutSampleRate(uint32_t* sample_rate) const override;
|
|
|
| // Sets the |renderer_|, returns false if |renderer_| already exists.
|
| // Called on the main renderer thread.
|
| @@ -359,38 +359,38 @@ class CONTENT_EXPORT WebRtcAudioDeviceImpl
|
| class RenderBuffer;
|
|
|
| // Make destructor private to ensure that we can only be deleted by Release().
|
| - virtual ~WebRtcAudioDeviceImpl();
|
| + ~WebRtcAudioDeviceImpl() override;
|
|
|
| // PeerConnectionAudioSink implementation.
|
|
|
| // Called on the AudioInputDevice worker thread.
|
| - virtual int OnData(const int16* audio_data,
|
| - int sample_rate,
|
| - int number_of_channels,
|
| - int number_of_frames,
|
| - const std::vector<int>& channels,
|
| - int audio_delay_milliseconds,
|
| - int current_volume,
|
| - bool need_audio_processing,
|
| - bool key_pressed) override;
|
| + int OnData(const int16* audio_data,
|
| + int sample_rate,
|
| + int number_of_channels,
|
| + int number_of_frames,
|
| + const std::vector<int>& channels,
|
| + int audio_delay_milliseconds,
|
| + int current_volume,
|
| + bool need_audio_processing,
|
| + bool key_pressed) override;
|
|
|
| // Called on the AudioInputDevice worker thread.
|
| - virtual void OnSetFormat(const media::AudioParameters& params) override;
|
| + void OnSetFormat(const media::AudioParameters& params) override;
|
|
|
| // WebRtcAudioRendererSource implementation.
|
|
|
| // Called on the AudioOutputDevice worker thread.
|
| - virtual void RenderData(media::AudioBus* audio_bus,
|
| - int sample_rate,
|
| - int audio_delay_milliseconds,
|
| - base::TimeDelta* current_time) override;
|
| + void RenderData(media::AudioBus* audio_bus,
|
| + int sample_rate,
|
| + int audio_delay_milliseconds,
|
| + base::TimeDelta* current_time) override;
|
|
|
| // Called on the main render thread.
|
| - virtual void RemoveAudioRenderer(WebRtcAudioRenderer* renderer) override;
|
| + void RemoveAudioRenderer(WebRtcAudioRenderer* renderer) override;
|
|
|
| // WebRtcPlayoutDataSource implementation.
|
| - virtual void AddPlayoutSink(WebRtcPlayoutDataSource::Sink* sink) override;
|
| - virtual void RemovePlayoutSink(WebRtcPlayoutDataSource::Sink* sink) override;
|
| + void AddPlayoutSink(WebRtcPlayoutDataSource::Sink* sink) override;
|
| + void RemovePlayoutSink(WebRtcPlayoutDataSource::Sink* sink) override;
|
|
|
| // Used to DCHECK that we are called on the correct thread.
|
| base::ThreadChecker thread_checker_;
|
|
|