diff options
| author | mostynb <mostynb@opera.com> | 2014-10-06 18:04:44 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-07 01:05:52 +0000 |
| commit | 2da2112cb906481f3c280a2b4fac2927619d6df0 (patch) | |
| tree | 2da9215cd888cc4ca935d36376d59bc6f0bdab3d /media | |
| parent | 886aeccd3824618309ccce5eabb2a70241073bc9 (diff) | |
| download | chromium_src-2da2112cb906481f3c280a2b4fac2927619d6df0.zip chromium_src-2da2112cb906481f3c280a2b4fac2927619d6df0.tar.gz chromium_src-2da2112cb906481f3c280a2b4fac2927619d6df0.tar.bz2 | |
replace OVERRIDE and FINAL with override and final in media/
BUG=417463
Review URL: https://codereview.chromium.org/623263003
Cr-Commit-Position: refs/heads/master@{#298317}
Diffstat (limited to 'media')
243 files changed, 1193 insertions, 1193 deletions
diff --git a/media/audio/agc_audio_stream.h b/media/audio/agc_audio_stream.h index 940d964..f7b909f 100644 --- a/media/audio/agc_audio_stream.h +++ b/media/audio/agc_audio_stream.h @@ -138,14 +138,14 @@ class MEDIA_EXPORT AgcAudioStream : public AudioInterface { // be read in each AudioInputCallback::OnData() callback and fed to the // render-side AGC. User must call StartAgc() as well to start measuring // the microphone level. - virtual void SetAutomaticGainControl(bool enabled) OVERRIDE { + virtual void SetAutomaticGainControl(bool enabled) override { DVLOG(1) << "SetAutomaticGainControl(enabled=" << enabled << ")"; DCHECK(thread_checker_.CalledOnValidThread()); agc_is_enabled_ = enabled; } // Gets the current automatic gain control state. - virtual bool GetAutomaticGainControl() OVERRIDE { + virtual bool GetAutomaticGainControl() override { DCHECK(thread_checker_.CalledOnValidThread()); return agc_is_enabled_; } diff --git a/media/audio/alsa/alsa_input.h b/media/audio/alsa/alsa_input.h index c26f3e2..adc2619 100644 --- a/media/audio/alsa/alsa_input.h +++ b/media/audio/alsa/alsa_input.h @@ -42,13 +42,13 @@ class AlsaPcmInputStream : public AgcAudioStream<AudioInputStream> { virtual ~AlsaPcmInputStream(); // Implementation of AudioInputStream. - virtual bool Open() OVERRIDE; - virtual void Start(AudioInputCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Close() OVERRIDE; - virtual double GetMaxVolume() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual double GetVolume() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioInputCallback* callback) override; + virtual void Stop() override; + virtual void Close() override; + virtual double GetMaxVolume() override; + virtual void SetVolume(double volume) override; + virtual double GetVolume() override; private: // Logs the error and invokes any registered callbacks. diff --git a/media/audio/alsa/alsa_output.h b/media/audio/alsa/alsa_output.h index e6e22df..dfc044d 100644 --- a/media/audio/alsa/alsa_output.h +++ b/media/audio/alsa/alsa_output.h @@ -75,12 +75,12 @@ class MEDIA_EXPORT AlsaPcmOutputStream : public AudioOutputStream { virtual ~AlsaPcmOutputStream(); // Implementation of AudioOutputStream. - virtual bool Open() OVERRIDE; - virtual void Close() OVERRIDE; - virtual void Start(AudioSourceCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual void GetVolume(double* volume) OVERRIDE; + virtual bool Open() override; + virtual void Close() override; + virtual void Start(AudioSourceCallback* callback) override; + virtual void Stop() override; + virtual void SetVolume(double volume) override; + virtual void GetVolume(double* volume) override; private: friend class AlsaPcmOutputStreamTest; diff --git a/media/audio/alsa/alsa_output_unittest.cc b/media/audio/alsa/alsa_output_unittest.cc index 3b6592b..a68be4b 100644 --- a/media/audio/alsa/alsa_output_unittest.cc +++ b/media/audio/alsa/alsa_output_unittest.cc @@ -85,14 +85,14 @@ class MockAudioManagerAlsa : public AudioManagerAlsa { // of active output streams. It is because the number of active streams // is managed inside MakeAudioOutputStream, and we don't use // MakeAudioOutputStream to create the stream in the tests. - virtual void ReleaseOutputStream(AudioOutputStream* stream) OVERRIDE { + virtual void ReleaseOutputStream(AudioOutputStream* stream) override { DCHECK(stream); delete stream; } // We don't mock this method since all tests will do the same thing // and use the current task runner. - virtual scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() OVERRIDE { + virtual scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() override { return base::MessageLoop::current()->message_loop_proxy(); } diff --git a/media/audio/alsa/audio_manager_alsa.h b/media/audio/alsa/audio_manager_alsa.h index d08c3ba..40801fc 100644 --- a/media/audio/alsa/audio_manager_alsa.h +++ b/media/audio/alsa/audio_manager_alsa.h @@ -22,33 +22,33 @@ class MEDIA_EXPORT AudioManagerAlsa : public AudioManagerBase { static void ShowLinuxAudioInputSettings(); // Implementation of AudioManager. - virtual bool HasAudioOutputDevices() OVERRIDE; - virtual bool HasAudioInputDevices() OVERRIDE; - virtual void ShowAudioInputSettings() OVERRIDE; + virtual bool HasAudioOutputDevices() override; + virtual bool HasAudioInputDevices() override; + virtual void ShowAudioInputSettings() override; virtual void GetAudioInputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual void GetAudioOutputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual AudioParameters GetInputStreamParameters( - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; // Implementation of AudioManagerBase. virtual AudioOutputStream* MakeLinearOutputStream( - const AudioParameters& params) OVERRIDE; + const AudioParameters& params) override; virtual AudioOutputStream* MakeLowLatencyOutputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioInputStream* MakeLinearInputStream( - const AudioParameters& params, const std::string& device_id) OVERRIDE; + const AudioParameters& params, const std::string& device_id) override; virtual AudioInputStream* MakeLowLatencyInputStream( - const AudioParameters& params, const std::string& device_id) OVERRIDE; + const AudioParameters& params, const std::string& device_id) override; protected: virtual ~AudioManagerAlsa(); virtual AudioParameters GetPreferredOutputStreamParameters( const std::string& output_device_id, - const AudioParameters& input_params) OVERRIDE; + const AudioParameters& input_params) override; private: enum StreamType { diff --git a/media/audio/android/audio_android_unittest.cc b/media/audio/android/audio_android_unittest.cc index 6fa7987..3364c5f 100644 --- a/media/audio/android/audio_android_unittest.cc +++ b/media/audio/android/audio_android_unittest.cc @@ -178,7 +178,7 @@ class FileAudioSource : public AudioOutputStream::AudioSourceCallback { // Use samples read from a data file and fill up the audio buffer // provided to us in the callback. virtual int OnMoreData(AudioBus* audio_bus, - uint32 total_bytes_delay) OVERRIDE { + uint32 total_bytes_delay) override { bool stop_playing = false; int max_size = audio_bus->frames() * audio_bus->channels() * kBytesPerSample; @@ -206,7 +206,7 @@ class FileAudioSource : public AudioOutputStream::AudioSourceCallback { return frames; } - virtual void OnError(AudioOutputStream* stream) OVERRIDE {} + virtual void OnError(AudioOutputStream* stream) override {} int file_size() { return file_->data_size(); } @@ -265,7 +265,7 @@ class FileAudioSink : public AudioInputStream::AudioInputCallback { virtual void OnData(AudioInputStream* stream, const AudioBus* src, uint32 hardware_delay_bytes, - double volume) OVERRIDE { + double volume) override { const int num_samples = src->frames() * src->channels(); scoped_ptr<int16> interleaved(new int16[num_samples]); const int bytes_per_sample = sizeof(*interleaved); @@ -279,7 +279,7 @@ class FileAudioSink : public AudioInputStream::AudioInputCallback { event_->Signal(); } - virtual void OnError(AudioInputStream* stream) OVERRIDE {} + virtual void OnError(AudioInputStream* stream) override {} private: base::WaitableEvent* event_; @@ -313,7 +313,7 @@ class FullDuplexAudioSinkSource virtual void OnData(AudioInputStream* stream, const AudioBus* src, uint32 hardware_delay_bytes, - double volume) OVERRIDE { + double volume) override { const base::TimeTicks now_time = base::TimeTicks::Now(); const int diff = (now_time - previous_time_).InMilliseconds(); @@ -350,11 +350,11 @@ class FullDuplexAudioSinkSource } } - virtual void OnError(AudioInputStream* stream) OVERRIDE {} + virtual void OnError(AudioInputStream* stream) override {} // AudioOutputStream::AudioSourceCallback implementation virtual int OnMoreData(AudioBus* dest, - uint32 total_bytes_delay) OVERRIDE { + uint32 total_bytes_delay) override { const int size_in_bytes = (params_.bits_per_sample() / 8) * dest->frames() * dest->channels(); EXPECT_EQ(size_in_bytes, params_.GetBytesPerBuffer()); @@ -382,7 +382,7 @@ class FullDuplexAudioSinkSource return dest->frames(); } - virtual void OnError(AudioOutputStream* stream) OVERRIDE {} + virtual void OnError(AudioOutputStream* stream) override {} private: // Converts from bytes to milliseconds given number of bytes and existing diff --git a/media/audio/android/audio_manager_android.h b/media/audio/android/audio_manager_android.h index ee5ad28..d1a8c8b 100644 --- a/media/audio/android/audio_manager_android.h +++ b/media/audio/android/audio_manager_android.h @@ -23,36 +23,36 @@ class MEDIA_EXPORT AudioManagerAndroid : public AudioManagerBase { AudioManagerAndroid(AudioLogFactory* audio_log_factory); // Implementation of AudioManager. - virtual bool HasAudioOutputDevices() OVERRIDE; - virtual bool HasAudioInputDevices() OVERRIDE; + virtual bool HasAudioOutputDevices() override; + virtual bool HasAudioInputDevices() override; virtual void GetAudioInputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual void GetAudioOutputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual AudioParameters GetInputStreamParameters( - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioOutputStream* MakeAudioOutputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioInputStream* MakeAudioInputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; - virtual void ReleaseOutputStream(AudioOutputStream* stream) OVERRIDE; - virtual void ReleaseInputStream(AudioInputStream* stream) OVERRIDE; + const std::string& device_id) override; + virtual void ReleaseOutputStream(AudioOutputStream* stream) override; + virtual void ReleaseInputStream(AudioInputStream* stream) override; // Implementation of AudioManagerBase. virtual AudioOutputStream* MakeLinearOutputStream( - const AudioParameters& params) OVERRIDE; + const AudioParameters& params) override; virtual AudioOutputStream* MakeLowLatencyOutputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioInputStream* MakeLinearInputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioInputStream* MakeLowLatencyInputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; static bool RegisterAudioManager(JNIEnv* env); @@ -63,7 +63,7 @@ class MEDIA_EXPORT AudioManagerAndroid : public AudioManagerBase { virtual AudioParameters GetPreferredOutputStreamParameters( const std::string& output_device_id, - const AudioParameters& input_params) OVERRIDE; + const AudioParameters& input_params) override; private: void InitializeOnAudioThread(); diff --git a/media/audio/android/audio_record_input.h b/media/audio/android/audio_record_input.h index c240038..198fd59 100644 --- a/media/audio/android/audio_record_input.h +++ b/media/audio/android/audio_record_input.h @@ -31,15 +31,15 @@ class MEDIA_EXPORT AudioRecordInputStream : public AudioInputStream { virtual ~AudioRecordInputStream(); // Implementation of AudioInputStream. - virtual bool Open() OVERRIDE; - virtual void Start(AudioInputCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Close() OVERRIDE; - virtual double GetMaxVolume() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual double GetVolume() OVERRIDE; - virtual void SetAutomaticGainControl(bool enabled) OVERRIDE; - virtual bool GetAutomaticGainControl() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioInputCallback* callback) override; + virtual void Stop() override; + virtual void Close() override; + virtual double GetMaxVolume() override; + virtual void SetVolume(double volume) override; + virtual double GetVolume() override; + virtual void SetAutomaticGainControl(bool enabled) override; + virtual bool GetAutomaticGainControl() override; static bool RegisterAudioRecordInput(JNIEnv* env); diff --git a/media/audio/android/opensles_input.h b/media/audio/android/opensles_input.h index 288ab43..2998e53 100644 --- a/media/audio/android/opensles_input.h +++ b/media/audio/android/opensles_input.h @@ -34,15 +34,15 @@ class OpenSLESInputStream : public AudioInputStream { virtual ~OpenSLESInputStream(); // Implementation of AudioInputStream. - virtual bool Open() OVERRIDE; - virtual void Start(AudioInputCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Close() OVERRIDE; - virtual double GetMaxVolume() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual double GetVolume() OVERRIDE; - virtual void SetAutomaticGainControl(bool enabled) OVERRIDE; - virtual bool GetAutomaticGainControl() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioInputCallback* callback) override; + virtual void Stop() override; + virtual void Close() override; + virtual double GetMaxVolume() override; + virtual void SetVolume(double volume) override; + virtual double GetVolume() override; + virtual void SetAutomaticGainControl(bool enabled) override; + virtual bool GetAutomaticGainControl() override; private: bool CreateRecorder(); diff --git a/media/audio/android/opensles_output.h b/media/audio/android/opensles_output.h index b0b678c..914fa6e 100644 --- a/media/audio/android/opensles_output.h +++ b/media/audio/android/opensles_output.h @@ -34,12 +34,12 @@ class OpenSLESOutputStream : public AudioOutputStream { virtual ~OpenSLESOutputStream(); // Implementation of AudioOutputStream. - virtual bool Open() OVERRIDE; - virtual void Close() OVERRIDE; - virtual void Start(AudioSourceCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual void GetVolume(double* volume) OVERRIDE; + virtual bool Open() override; + virtual void Close() override; + virtual void Start(AudioSourceCallback* callback) override; + virtual void Stop() override; + virtual void SetVolume(double volume) override; + virtual void GetVolume(double* volume) override; // Set the value of |muted_|. It does not affect |volume_| which can be // got by calling GetVolume(). See comments for |muted_| below. diff --git a/media/audio/audio_device_thread.cc b/media/audio/audio_device_thread.cc index 0c0c86c..98d1018 100644 --- a/media/audio/audio_device_thread.cc +++ b/media/audio/audio_device_thread.cc @@ -45,7 +45,7 @@ class AudioDeviceThread::Thread virtual ~Thread(); // Overrides from PlatformThread::Delegate. - virtual void ThreadMain() OVERRIDE; + virtual void ThreadMain() override; // Runs the loop that reads from the socket. void Run(); diff --git a/media/audio/audio_input_controller.h b/media/audio/audio_input_controller.h index 150daa2..a14bf33 100644 --- a/media/audio/audio_input_controller.h +++ b/media/audio/audio_input_controller.h @@ -231,8 +231,8 @@ class MEDIA_EXPORT AudioInputController virtual void OnData(AudioInputStream* stream, const AudioBus* source, uint32 hardware_delay_bytes, - double volume) OVERRIDE; - virtual void OnError(AudioInputStream* stream) OVERRIDE; + double volume) override; + virtual void OnError(AudioInputStream* stream) override; bool SharedMemoryAndSyncSocketMode() const { return sync_writer_ != NULL; } diff --git a/media/audio/audio_input_device.cc b/media/audio/audio_input_device.cc index bf140cb..d54c72a 100644 --- a/media/audio/audio_input_device.cc +++ b/media/audio/audio_input_device.cc @@ -33,10 +33,10 @@ class AudioInputDevice::AudioThreadCallback CaptureCallback* capture_callback); virtual ~AudioThreadCallback(); - virtual void MapSharedMemory() OVERRIDE; + virtual void MapSharedMemory() override; // Called whenever we receive notifications about pending data. - virtual void Process(int pending_data) OVERRIDE; + virtual void Process(int pending_data) override; private: int current_segment_id_; diff --git a/media/audio/audio_input_device.h b/media/audio/audio_input_device.h index 0c39002..b971176 100644 --- a/media/audio/audio_input_device.h +++ b/media/audio/audio_input_device.h @@ -87,11 +87,11 @@ class MEDIA_EXPORT AudioInputDevice // AudioCapturerSource implementation. virtual void Initialize(const AudioParameters& params, CaptureCallback* callback, - int session_id) OVERRIDE; - virtual void Start() OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual void SetAutomaticGainControl(bool enabled) OVERRIDE; + int session_id) override; + virtual void Start() override; + virtual void Stop() override; + virtual void SetVolume(double volume) override; + virtual void SetAutomaticGainControl(bool enabled) override; protected: friend class base::RefCountedThreadSafe<AudioInputDevice>; @@ -102,11 +102,11 @@ class MEDIA_EXPORT AudioInputDevice virtual void OnStreamCreated(base::SharedMemoryHandle handle, base::SyncSocket::Handle socket_handle, int length, - int total_segments) OVERRIDE; - virtual void OnVolume(double volume) OVERRIDE; + int total_segments) override; + virtual void OnVolume(double volume) override; virtual void OnStateChanged( - AudioInputIPCDelegate::State state) OVERRIDE; - virtual void OnIPCClosed() OVERRIDE; + AudioInputIPCDelegate::State state) override; + virtual void OnIPCClosed() override; private: // Note: The ordering of members in this enum is critical to correct behavior! @@ -128,7 +128,7 @@ class MEDIA_EXPORT AudioInputDevice // base::MessageLoop::DestructionObserver implementation for the IO loop. // If the IO loop dies before we do, we shut down the audio thread from here. - virtual void WillDestroyCurrentMessageLoop() OVERRIDE; + virtual void WillDestroyCurrentMessageLoop() override; AudioParameters audio_parameters_; diff --git a/media/audio/audio_input_unittest.cc b/media/audio/audio_input_unittest.cc index 0bae9db..3c977b0 100644 --- a/media/audio/audio_input_unittest.cc +++ b/media/audio/audio_input_unittest.cc @@ -26,10 +26,10 @@ class TestInputCallback : public AudioInputStream::AudioInputCallback { virtual void OnData(AudioInputStream* stream, const AudioBus* source, uint32 hardware_delay_bytes, - double volume) OVERRIDE { + double volume) override { ++callback_count_; } - virtual void OnError(AudioInputStream* stream) OVERRIDE { + virtual void OnError(AudioInputStream* stream) override { ++had_error_; } // Returns how many times OnData() has been called. diff --git a/media/audio/audio_low_latency_input_output_unittest.cc b/media/audio/audio_low_latency_input_output_unittest.cc index 3d61ae6..49a0e1c 100644 --- a/media/audio/audio_low_latency_input_output_unittest.cc +++ b/media/audio/audio_low_latency_input_output_unittest.cc @@ -95,7 +95,7 @@ class MockAudioManager : public AudioManagerAnyPlatform { MockAudioManager() : AudioManagerAnyPlatform(&fake_audio_log_factory_) {} virtual ~MockAudioManager() {} - virtual scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() OVERRIDE { + virtual scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() override { return base::MessageLoop::current()->message_loop_proxy(); } @@ -194,7 +194,7 @@ class FullDuplexAudioSinkSource virtual void OnData(AudioInputStream* stream, const AudioBus* src, uint32 hardware_delay_bytes, - double volume) OVERRIDE { + double volume) override { base::AutoLock lock(lock_); // Update three components in the AudioDelayState for this recorded @@ -222,11 +222,11 @@ class FullDuplexAudioSinkSource // } } - virtual void OnError(AudioInputStream* stream) OVERRIDE {} + virtual void OnError(AudioInputStream* stream) override {} // AudioOutputStream::AudioSourceCallback. virtual int OnMoreData(AudioBus* audio_bus, - uint32 total_bytes_delay) OVERRIDE { + uint32 total_bytes_delay) override { base::AutoLock lock(lock_); // Update one component in the AudioDelayState for the packet @@ -254,7 +254,7 @@ class FullDuplexAudioSinkSource return 0; } - virtual void OnError(AudioOutputStream* stream) OVERRIDE {} + virtual void OnError(AudioOutputStream* stream) override {} protected: // Converts from bytes to milliseconds taking the sample rate and size diff --git a/media/audio/audio_manager_base.h b/media/audio/audio_manager_base.h index 40fb6c3..6ed8fd4 100644 --- a/media/audio/audio_manager_base.h +++ b/media/audio/audio_manager_base.h @@ -48,30 +48,30 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager { virtual ~AudioManagerBase(); - virtual scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() OVERRIDE; + virtual scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() override; virtual scoped_refptr<base::SingleThreadTaskRunner> GetWorkerTaskRunner() - OVERRIDE; + override; - virtual base::string16 GetAudioInputDeviceModel() OVERRIDE; + virtual base::string16 GetAudioInputDeviceModel() override; - virtual void ShowAudioInputSettings() OVERRIDE; + virtual void ShowAudioInputSettings() override; virtual void GetAudioInputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual void GetAudioOutputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual AudioOutputStream* MakeAudioOutputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioInputStream* MakeAudioInputStream( - const AudioParameters& params, const std::string& device_id) OVERRIDE; + const AudioParameters& params, const std::string& device_id) override; virtual AudioOutputStream* MakeAudioOutputStreamProxy( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; // Called internally by the audio stream when it has been closed. virtual void ReleaseOutputStream(AudioOutputStream* stream); @@ -98,24 +98,24 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager { // Listeners will be notified on the GetTaskRunner() task runner. virtual void AddOutputDeviceChangeListener( - AudioDeviceListener* listener) OVERRIDE; + AudioDeviceListener* listener) override; virtual void RemoveOutputDeviceChangeListener( - AudioDeviceListener* listener) OVERRIDE; + AudioDeviceListener* listener) override; - virtual AudioParameters GetDefaultOutputStreamParameters() OVERRIDE; + virtual AudioParameters GetDefaultOutputStreamParameters() override; virtual AudioParameters GetOutputStreamParameters( - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioParameters GetInputStreamParameters( - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual std::string GetAssociatedOutputDeviceID( - const std::string& input_device_id) OVERRIDE; + const std::string& input_device_id) override; virtual scoped_ptr<AudioLog> CreateAudioLog( - AudioLogFactory::AudioComponent component) OVERRIDE; + AudioLogFactory::AudioComponent component) override; - virtual void SetHasKeyboardMic() OVERRIDE; + virtual void SetHasKeyboardMic() override; // Get number of input or output streams. int input_stream_count() const { return num_input_streams_; } diff --git a/media/audio/audio_output_controller.h b/media/audio/audio_output_controller.h index 029c58a..3058f58 100644 --- a/media/audio/audio_output_controller.h +++ b/media/audio/audio_output_controller.h @@ -155,19 +155,19 @@ class MEDIA_EXPORT AudioOutputController // AudioSourceCallback implementation. virtual int OnMoreData(AudioBus* dest, - uint32 total_bytes_delay) OVERRIDE; - virtual void OnError(AudioOutputStream* stream) OVERRIDE; + uint32 total_bytes_delay) override; + virtual void OnError(AudioOutputStream* stream) override; // AudioDeviceListener implementation. When called AudioOutputController will // shutdown the existing |stream_|, transition to the kRecreating state, // create a new stream, and then transition back to an equivalent state prior // to being called. - virtual void OnDeviceChange() OVERRIDE; + virtual void OnDeviceChange() override; // AudioSourceDiverter implementation. - virtual const AudioParameters& GetAudioParameters() OVERRIDE; - virtual void StartDiverting(AudioOutputStream* to_stream) OVERRIDE; - virtual void StopDiverting() OVERRIDE; + virtual const AudioParameters& GetAudioParameters() override; + virtual void StartDiverting(AudioOutputStream* to_stream) override; + virtual void StopDiverting() override; // Accessor for AudioPowerMonitor::ReadCurrentPowerAndClip(). See comments in // audio_power_monitor.h for usage. This may be called on any thread. diff --git a/media/audio/audio_output_device.cc b/media/audio/audio_output_device.cc index 5cc6021..d18a764 100644 --- a/media/audio/audio_output_device.cc +++ b/media/audio/audio_output_device.cc @@ -25,10 +25,10 @@ class AudioOutputDevice::AudioThreadCallback AudioRendererSink::RenderCallback* render_callback); virtual ~AudioThreadCallback(); - virtual void MapSharedMemory() OVERRIDE; + virtual void MapSharedMemory() override; // Called whenever we receive notifications about pending data. - virtual void Process(int pending_data) OVERRIDE; + virtual void Process(int pending_data) override; private: AudioRendererSink::RenderCallback* render_callback_; diff --git a/media/audio/audio_output_device.h b/media/audio/audio_output_device.h index 0d53d8b..b2e0b14 100644 --- a/media/audio/audio_output_device.h +++ b/media/audio/audio_output_device.h @@ -89,20 +89,20 @@ class MEDIA_EXPORT AudioOutputDevice // AudioRendererSink implementation. virtual void Initialize(const AudioParameters& params, - RenderCallback* callback) OVERRIDE; - virtual void Start() OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Play() OVERRIDE; - virtual void Pause() OVERRIDE; - virtual bool SetVolume(double volume) OVERRIDE; + RenderCallback* callback) override; + virtual void Start() override; + virtual void Stop() override; + virtual void Play() override; + virtual void Pause() override; + virtual bool SetVolume(double volume) override; // Methods called on IO thread ---------------------------------------------- // AudioOutputIPCDelegate methods. - virtual void OnStateChanged(AudioOutputIPCDelegate::State state) OVERRIDE; + virtual void OnStateChanged(AudioOutputIPCDelegate::State state) override; virtual void OnStreamCreated(base::SharedMemoryHandle handle, base::SyncSocket::Handle socket_handle, - int length) OVERRIDE; - virtual void OnIPCClosed() OVERRIDE; + int length) override; + virtual void OnIPCClosed() override; protected: // Magic required by ref_counted.h to avoid any code deleting the object @@ -132,7 +132,7 @@ class MEDIA_EXPORT AudioOutputDevice // base::MessageLoop::DestructionObserver implementation for the IO loop. // If the IO loop dies before we do, we shut down the audio thread from here. - virtual void WillDestroyCurrentMessageLoop() OVERRIDE; + virtual void WillDestroyCurrentMessageLoop() override; AudioParameters audio_parameters_; diff --git a/media/audio/audio_output_dispatcher_impl.h b/media/audio/audio_output_dispatcher_impl.h index 52d647a..031896f 100644 --- a/media/audio/audio_output_dispatcher_impl.h +++ b/media/audio/audio_output_dispatcher_impl.h @@ -40,26 +40,26 @@ class MEDIA_EXPORT AudioOutputDispatcherImpl : public AudioOutputDispatcher { // Opens a new physical stream if there are no pending streams in // |idle_streams_|. Do not call Close() or Stop() if this method fails. - virtual bool OpenStream() OVERRIDE; + virtual bool OpenStream() override; // If there are pending streams in |idle_streams_| then it reuses one of // them, otherwise creates a new one. virtual bool StartStream(AudioOutputStream::AudioSourceCallback* callback, - AudioOutputProxy* stream_proxy) OVERRIDE; + AudioOutputProxy* stream_proxy) override; // Stops the stream assigned to the specified proxy and moves it into // |idle_streams_| for reuse by other proxies. - virtual void StopStream(AudioOutputProxy* stream_proxy) OVERRIDE; + virtual void StopStream(AudioOutputProxy* stream_proxy) override; virtual void StreamVolumeSet(AudioOutputProxy* stream_proxy, - double volume) OVERRIDE; + double volume) override; // Closes |idle_streams_| until the number of |idle_streams_| is equal to the // |idle_proxies_| count. If there are no |idle_proxies_| a single stream is // kept alive until |close_timer_| fires. - virtual void CloseStream(AudioOutputProxy* stream_proxy) OVERRIDE; + virtual void CloseStream(AudioOutputProxy* stream_proxy) override; - virtual void Shutdown() OVERRIDE; + virtual void Shutdown() override; private: friend class base::RefCountedThreadSafe<AudioOutputDispatcherImpl>; diff --git a/media/audio/audio_output_proxy.h b/media/audio/audio_output_proxy.h index 86dab51..a1e79dc 100644 --- a/media/audio/audio_output_proxy.h +++ b/media/audio/audio_output_proxy.h @@ -32,12 +32,12 @@ class MEDIA_EXPORT AudioOutputProxy explicit AudioOutputProxy(AudioOutputDispatcher* dispatcher); // AudioOutputStream interface. - virtual bool Open() OVERRIDE; - virtual void Start(AudioSourceCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual void GetVolume(double* volume) OVERRIDE; - virtual void Close() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioSourceCallback* callback) override; + virtual void Stop() override; + virtual void SetVolume(double volume) override; + virtual void GetVolume(double* volume) override; + virtual void Close() override; private: enum State { diff --git a/media/audio/audio_output_proxy_unittest.cc b/media/audio/audio_output_proxy_unittest.cc index fd72a23..a1c5768 100644 --- a/media/audio/audio_output_proxy_unittest.cc +++ b/media/audio/audio_output_proxy_unittest.cc @@ -417,7 +417,7 @@ class AudioOutputResamplerTest : public AudioOutputProxyTest { AudioOutputProxyTest::TearDown(); } - virtual void InitDispatcher(base::TimeDelta close_delay) OVERRIDE { + virtual void InitDispatcher(base::TimeDelta close_delay) override { // Use a low sample rate and large buffer size when testing otherwise the // FakeAudioOutputStream will keep the message loop busy indefinitely; i.e., // RunUntilIdle() will never terminate. @@ -428,7 +428,7 @@ class AudioOutputResamplerTest : public AudioOutputProxyTest { &manager(), params_, resampler_params_, std::string(), close_delay); } - virtual void OnStart() OVERRIDE { + virtual void OnStart() override { // Let Start() run for a bit. base::RunLoop run_loop; message_loop_.PostDelayedTask( diff --git a/media/audio/audio_output_resampler.cc b/media/audio/audio_output_resampler.cc index 42c2ea89..4c4b601 100644 --- a/media/audio/audio_output_resampler.cc +++ b/media/audio/audio_output_resampler.cc @@ -31,8 +31,8 @@ class OnMoreDataConverter // AudioSourceCallback interface. virtual int OnMoreData(AudioBus* dest, - uint32 total_bytes_delay) OVERRIDE; - virtual void OnError(AudioOutputStream* stream) OVERRIDE; + uint32 total_bytes_delay) override; + virtual void OnError(AudioOutputStream* stream) override; // Sets |source_callback_|. If this is not a new object, then Stop() must be // called before Start(). @@ -46,7 +46,7 @@ class OnMoreDataConverter private: // AudioConverter::InputCallback implementation. virtual double ProvideInput(AudioBus* audio_bus, - base::TimeDelta buffer_delay) OVERRIDE; + base::TimeDelta buffer_delay) override; // Ratio of input bytes to output bytes used to correct playback delay with // regard to buffering and resampling. diff --git a/media/audio/audio_output_resampler.h b/media/audio/audio_output_resampler.h index af7ebf2..085330b 100644 --- a/media/audio/audio_output_resampler.h +++ b/media/audio/audio_output_resampler.h @@ -44,14 +44,14 @@ class MEDIA_EXPORT AudioOutputResampler : public AudioOutputDispatcher { const base::TimeDelta& close_delay); // AudioOutputDispatcher interface. - virtual bool OpenStream() OVERRIDE; + virtual bool OpenStream() override; virtual bool StartStream(AudioOutputStream::AudioSourceCallback* callback, - AudioOutputProxy* stream_proxy) OVERRIDE; - virtual void StopStream(AudioOutputProxy* stream_proxy) OVERRIDE; + AudioOutputProxy* stream_proxy) override; + virtual void StopStream(AudioOutputProxy* stream_proxy) override; virtual void StreamVolumeSet(AudioOutputProxy* stream_proxy, - double volume) OVERRIDE; - virtual void CloseStream(AudioOutputProxy* stream_proxy) OVERRIDE; - virtual void Shutdown() OVERRIDE; + double volume) override; + virtual void CloseStream(AudioOutputProxy* stream_proxy) override; + virtual void Shutdown() override; private: friend class base::RefCountedThreadSafe<AudioOutputResampler>; diff --git a/media/audio/clockless_audio_sink.cc b/media/audio/clockless_audio_sink.cc index 1c98574..1bb22e2 100644 --- a/media/audio/clockless_audio_sink.cc +++ b/media/audio/clockless_audio_sink.cc @@ -35,7 +35,7 @@ class ClocklessAudioSinkThread : public base::DelegateSimpleThread::Delegate { private: // Call Render() repeatedly, keeping track of the rendering time. - virtual void Run() OVERRIDE { + virtual void Run() override { base::TimeTicks start; while (!stop_event_->IsSignaled()) { int frames_received = callback_->Render(audio_bus_.get(), 0); diff --git a/media/audio/clockless_audio_sink.h b/media/audio/clockless_audio_sink.h index bf68896..1c2bf69 100644 --- a/media/audio/clockless_audio_sink.h +++ b/media/audio/clockless_audio_sink.h @@ -26,12 +26,12 @@ class MEDIA_EXPORT ClocklessAudioSink // AudioRendererSink implementation. virtual void Initialize(const AudioParameters& params, - RenderCallback* callback) OVERRIDE; - virtual void Start() OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Pause() OVERRIDE; - virtual void Play() OVERRIDE; - virtual bool SetVolume(double volume) OVERRIDE; + RenderCallback* callback) override; + virtual void Start() override; + virtual void Stop() override; + virtual void Pause() override; + virtual void Play() override; + virtual bool SetVolume(double volume) override; // Returns the time taken to consume all the audio. base::TimeDelta render_time() { return playback_time_; } diff --git a/media/audio/cras/audio_manager_cras.h b/media/audio/cras/audio_manager_cras.h index 2bf1c0d..0bceb45 100644 --- a/media/audio/cras/audio_manager_cras.h +++ b/media/audio/cras/audio_manager_cras.h @@ -20,27 +20,27 @@ class MEDIA_EXPORT AudioManagerCras : public AudioManagerBase { AudioManagerCras(AudioLogFactory* audio_log_factory); // AudioManager implementation. - virtual bool HasAudioOutputDevices() OVERRIDE; - virtual bool HasAudioInputDevices() OVERRIDE; - virtual void ShowAudioInputSettings() OVERRIDE; + virtual bool HasAudioOutputDevices() override; + virtual bool HasAudioInputDevices() override; + virtual void ShowAudioInputSettings() override; virtual void GetAudioInputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual void GetAudioOutputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual AudioParameters GetInputStreamParameters( - const std::string& device_id) OVERRIDE; - virtual void SetHasKeyboardMic() OVERRIDE; + const std::string& device_id) override; + virtual void SetHasKeyboardMic() override; // AudioManagerBase implementation. virtual AudioOutputStream* MakeLinearOutputStream( - const AudioParameters& params) OVERRIDE; + const AudioParameters& params) override; virtual AudioOutputStream* MakeLowLatencyOutputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioInputStream* MakeLinearInputStream( - const AudioParameters& params, const std::string& device_id) OVERRIDE; + const AudioParameters& params, const std::string& device_id) override; virtual AudioInputStream* MakeLowLatencyInputStream( - const AudioParameters& params, const std::string& device_id) OVERRIDE; + const AudioParameters& params, const std::string& device_id) override; static snd_pcm_format_t BitsToFormat(int bits_per_sample); @@ -49,7 +49,7 @@ class MEDIA_EXPORT AudioManagerCras : public AudioManagerBase { virtual AudioParameters GetPreferredOutputStreamParameters( const std::string& output_device_id, - const AudioParameters& input_params) OVERRIDE; + const AudioParameters& input_params) override; private: // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream. diff --git a/media/audio/cras/cras_input.h b/media/audio/cras/cras_input.h index 1919224..4f5614d 100644 --- a/media/audio/cras/cras_input.h +++ b/media/audio/cras/cras_input.h @@ -33,13 +33,13 @@ class CrasInputStream : public AgcAudioStream<AudioInputStream> { virtual ~CrasInputStream(); // Implementation of AudioInputStream. - virtual bool Open() OVERRIDE; - virtual void Start(AudioInputCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Close() OVERRIDE; - virtual double GetMaxVolume() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual double GetVolume() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioInputCallback* callback) override; + virtual void Stop() override; + virtual void Close() override; + virtual double GetMaxVolume() override; + virtual void SetVolume(double volume) override; + virtual double GetVolume() override; private: // Handles requests to get samples from the provided buffer. This will be diff --git a/media/audio/cras/cras_input_unittest.cc b/media/audio/cras/cras_input_unittest.cc index 7081a98..4113f58 100644 --- a/media/audio/cras/cras_input_unittest.cc +++ b/media/audio/cras/cras_input_unittest.cc @@ -41,7 +41,7 @@ class MockAudioManagerCrasInput : public AudioManagerCras { // of active output streams. It is because the number of active streams // is managed inside MakeAudioInputStream, and we don't use // MakeAudioInputStream to create the stream in the tests. - virtual void ReleaseInputStream(AudioInputStream* stream) OVERRIDE { + virtual void ReleaseInputStream(AudioInputStream* stream) override { DCHECK(stream); delete stream; } diff --git a/media/audio/cras/cras_unified.h b/media/audio/cras/cras_unified.h index 7e946e0..464fee6 100644 --- a/media/audio/cras/cras_unified.h +++ b/media/audio/cras/cras_unified.h @@ -36,12 +36,12 @@ class MEDIA_EXPORT CrasUnifiedStream : public AudioOutputStream { virtual ~CrasUnifiedStream(); // Implementation of AudioOutputStream. - virtual bool Open() OVERRIDE; - virtual void Close() OVERRIDE; - virtual void Start(AudioSourceCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual void GetVolume(double* volume) OVERRIDE; + virtual bool Open() override; + virtual void Close() override; + virtual void Start(AudioSourceCallback* callback) override; + virtual void Stop() override; + virtual void SetVolume(double volume) override; + virtual void GetVolume(double* volume) override; private: // Convert Latency in time to bytes. diff --git a/media/audio/cras/cras_unified_unittest.cc b/media/audio/cras/cras_unified_unittest.cc index 9d282bb..932ccb4 100644 --- a/media/audio/cras/cras_unified_unittest.cc +++ b/media/audio/cras/cras_unified_unittest.cc @@ -49,7 +49,7 @@ class MockAudioManagerCras : public AudioManagerCras { // of active output streams. It is because the number of active streams // is managed inside MakeAudioOutputStream, and we don't use // MakeAudioOutputStream to create the stream in the tests. - virtual void ReleaseOutputStream(AudioOutputStream* stream) OVERRIDE { + virtual void ReleaseOutputStream(AudioOutputStream* stream) override { DCHECK(stream); delete stream; } diff --git a/media/audio/fake_audio_input_stream.h b/media/audio/fake_audio_input_stream.h index 4c3c24c..db00c2e 100644 --- a/media/audio/fake_audio_input_stream.h +++ b/media/audio/fake_audio_input_stream.h @@ -27,15 +27,15 @@ class MEDIA_EXPORT FakeAudioInputStream static AudioInputStream* MakeFakeStream(AudioManagerBase* manager, const AudioParameters& params); - virtual bool Open() OVERRIDE; - virtual void Start(AudioInputCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Close() OVERRIDE; - virtual double GetMaxVolume() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual double GetVolume() OVERRIDE; - virtual void SetAutomaticGainControl(bool enabled) OVERRIDE; - virtual bool GetAutomaticGainControl() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioInputCallback* callback) override; + virtual void Stop() override; + virtual void Close() override; + virtual double GetMaxVolume() override; + virtual void SetVolume(double volume) override; + virtual double GetVolume() override; + virtual void SetAutomaticGainControl(bool enabled) override; + virtual bool GetAutomaticGainControl() override; // Generate one beep sound. This method is called by // FakeVideoCaptureDevice to test audio/video synchronization. diff --git a/media/audio/fake_audio_log_factory.cc b/media/audio/fake_audio_log_factory.cc index 5e2d134..af5dc8e 100644 --- a/media/audio/fake_audio_log_factory.cc +++ b/media/audio/fake_audio_log_factory.cc @@ -12,12 +12,12 @@ class FakeAudioLogImpl : public AudioLog { virtual ~FakeAudioLogImpl() {} virtual void OnCreated(int component_id, const media::AudioParameters& params, - const std::string& device_id) OVERRIDE {} - virtual void OnStarted(int component_id) OVERRIDE {} - virtual void OnStopped(int component_id) OVERRIDE {} - virtual void OnClosed(int component_id) OVERRIDE {} - virtual void OnError(int component_id) OVERRIDE {} - virtual void OnSetVolume(int component_id, double volume) OVERRIDE {} + const std::string& device_id) override {} + virtual void OnStarted(int component_id) override {} + virtual void OnStopped(int component_id) override {} + virtual void OnClosed(int component_id) override {} + virtual void OnError(int component_id) override {} + virtual void OnSetVolume(int component_id, double volume) override {} }; FakeAudioLogFactory::FakeAudioLogFactory() {} diff --git a/media/audio/fake_audio_log_factory.h b/media/audio/fake_audio_log_factory.h index 30e39e6..c5fae46 100644 --- a/media/audio/fake_audio_log_factory.h +++ b/media/audio/fake_audio_log_factory.h @@ -18,7 +18,7 @@ class MEDIA_EXPORT FakeAudioLogFactory FakeAudioLogFactory(); virtual ~FakeAudioLogFactory(); virtual scoped_ptr<AudioLog> CreateAudioLog( - AudioComponent component) OVERRIDE; + AudioComponent component) override; private: DISALLOW_COPY_AND_ASSIGN(FakeAudioLogFactory); diff --git a/media/audio/fake_audio_manager.h b/media/audio/fake_audio_manager.h index 9fbf140..8fc57bd 100644 --- a/media/audio/fake_audio_manager.h +++ b/media/audio/fake_audio_manager.h @@ -18,30 +18,30 @@ class MEDIA_EXPORT FakeAudioManager : public AudioManagerBase { FakeAudioManager(AudioLogFactory* audio_log_factory); // Implementation of AudioManager. - virtual bool HasAudioOutputDevices() OVERRIDE; - virtual bool HasAudioInputDevices() OVERRIDE; + virtual bool HasAudioOutputDevices() override; + virtual bool HasAudioInputDevices() override; // Implementation of AudioManagerBase. virtual AudioOutputStream* MakeLinearOutputStream( - const AudioParameters& params) OVERRIDE; + const AudioParameters& params) override; virtual AudioOutputStream* MakeLowLatencyOutputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioInputStream* MakeLinearInputStream(const AudioParameters& params, const std::string& device_id) - OVERRIDE; + override; virtual AudioInputStream* MakeLowLatencyInputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioParameters GetInputStreamParameters( - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; protected: virtual ~FakeAudioManager(); virtual AudioParameters GetPreferredOutputStreamParameters( const std::string& output_device_id, - const AudioParameters& input_params) OVERRIDE; + const AudioParameters& input_params) override; private: DISALLOW_COPY_AND_ASSIGN(FakeAudioManager); diff --git a/media/audio/fake_audio_output_stream.h b/media/audio/fake_audio_output_stream.h index f7971bf..c0fd386 100644 --- a/media/audio/fake_audio_output_stream.h +++ b/media/audio/fake_audio_output_stream.h @@ -23,12 +23,12 @@ class MEDIA_EXPORT FakeAudioOutputStream : public AudioOutputStream { const AudioParameters& params); // AudioOutputStream implementation. - virtual bool Open() OVERRIDE; - virtual void Start(AudioSourceCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual void GetVolume(double* volume) OVERRIDE; - virtual void Close() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioSourceCallback* callback) override; + virtual void Stop() override; + virtual void SetVolume(double volume) override; + virtual void GetVolume(double* volume) override; + virtual void Close() override; private: FakeAudioOutputStream(AudioManagerBase* manager, diff --git a/media/audio/mac/audio_auhal_mac.h b/media/audio/mac/audio_auhal_mac.h index 8903ea3..62d0439 100644 --- a/media/audio/mac/audio_auhal_mac.h +++ b/media/audio/mac/audio_auhal_mac.h @@ -62,12 +62,12 @@ class AUHALStream : public AudioOutputStream { virtual ~AUHALStream(); // Implementation of AudioOutputStream. - virtual bool Open() OVERRIDE; - virtual void Close() OVERRIDE; - virtual void Start(AudioSourceCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual void GetVolume(double* volume) OVERRIDE; + virtual bool Open() override; + virtual void Close() override; + virtual void Start(AudioSourceCallback* callback) override; + virtual void Stop() override; + virtual void SetVolume(double volume) override; + virtual void GetVolume(double* volume) override; private: // AUHAL callback. diff --git a/media/audio/mac/audio_input_mac.h b/media/audio/mac/audio_input_mac.h index a6e897e..37afcee 100644 --- a/media/audio/mac/audio_input_mac.h +++ b/media/audio/mac/audio_input_mac.h @@ -29,15 +29,15 @@ class PCMQueueInAudioInputStream : public AudioInputStream { virtual ~PCMQueueInAudioInputStream(); // Implementation of AudioInputStream. - virtual bool Open() OVERRIDE; - virtual void Start(AudioInputCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Close() OVERRIDE; - virtual double GetMaxVolume() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual double GetVolume() OVERRIDE; - virtual void SetAutomaticGainControl(bool enabled) OVERRIDE; - virtual bool GetAutomaticGainControl() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioInputCallback* callback) override; + virtual void Stop() override; + virtual void Close() override; + virtual double GetMaxVolume() override; + virtual void SetVolume(double volume) override; + virtual double GetVolume() override; + virtual void SetAutomaticGainControl(bool enabled) override; + virtual bool GetAutomaticGainControl() override; private: // Issue the OnError to |callback_|; diff --git a/media/audio/mac/audio_low_latency_input_mac.h b/media/audio/mac/audio_low_latency_input_mac.h index c8e43fa..623cf1d 100644 --- a/media/audio/mac/audio_low_latency_input_mac.h +++ b/media/audio/mac/audio_low_latency_input_mac.h @@ -65,13 +65,13 @@ class AUAudioInputStream : public AgcAudioStream<AudioInputStream> { virtual ~AUAudioInputStream(); // Implementation of AudioInputStream. - virtual bool Open() OVERRIDE; - virtual void Start(AudioInputCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Close() OVERRIDE; - virtual double GetMaxVolume() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual double GetVolume() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioInputCallback* callback) override; + virtual void Stop() override; + virtual void Close() override; + virtual double GetMaxVolume() override; + virtual void SetVolume(double volume) override; + virtual double GetVolume() override; // Returns the current hardware sample rate for the default input device. MEDIA_EXPORT static int HardwareSampleRate(); diff --git a/media/audio/mac/audio_low_latency_input_mac_unittest.cc b/media/audio/mac/audio_low_latency_input_mac_unittest.cc index 79721d4..add37fa 100644 --- a/media/audio/mac/audio_low_latency_input_mac_unittest.cc +++ b/media/audio/mac/audio_low_latency_input_mac_unittest.cc @@ -78,7 +78,7 @@ class WriteToFileAudioSink : public AudioInputStream::AudioInputCallback { virtual void OnData(AudioInputStream* stream, const AudioBus* src, uint32 hardware_delay_bytes, - double volume) OVERRIDE { + double volume) override { const int num_samples = src->frames() * src->channels(); scoped_ptr<int16> interleaved(new int16[num_samples]); const int bytes_per_sample = sizeof(*interleaved); @@ -93,7 +93,7 @@ class WriteToFileAudioSink : public AudioInputStream::AudioInputCallback { } } - virtual void OnError(AudioInputStream* stream) OVERRIDE {} + virtual void OnError(AudioInputStream* stream) override {} private: media::SeekableBuffer buffer_; diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc index 336a8c4..809c923 100644 --- a/media/audio/mac/audio_manager_mac.cc +++ b/media/audio/mac/audio_manager_mac.cc @@ -251,12 +251,12 @@ class AudioManagerMac::AudioPowerObserver : public base::PowerObserver { } private: - virtual void OnSuspend() OVERRIDE { + virtual void OnSuspend() override { DCHECK(thread_checker_.CalledOnValidThread()); is_suspending_ = true; } - virtual void OnResume() OVERRIDE { + virtual void OnResume() override { DCHECK(thread_checker_.CalledOnValidThread()); is_suspending_ = false; earliest_start_time_ = base::TimeTicks::Now() + diff --git a/media/audio/mac/audio_manager_mac.h b/media/audio/mac/audio_manager_mac.h index 490b0b6..5dd6d6e1 100644 --- a/media/audio/mac/audio_manager_mac.h +++ b/media/audio/mac/audio_manager_mac.h @@ -24,32 +24,32 @@ class MEDIA_EXPORT AudioManagerMac : public AudioManagerBase { AudioManagerMac(AudioLogFactory* audio_log_factory); // Implementation of AudioManager. - virtual bool HasAudioOutputDevices() OVERRIDE; - virtual bool HasAudioInputDevices() OVERRIDE; + virtual bool HasAudioOutputDevices() override; + virtual bool HasAudioInputDevices() override; virtual void GetAudioInputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual void GetAudioOutputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual AudioParameters GetInputStreamParameters( - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual std::string GetAssociatedOutputDeviceID( - const std::string& input_device_id) OVERRIDE; + const std::string& input_device_id) override; // Implementation of AudioManagerBase. virtual AudioOutputStream* MakeLinearOutputStream( - const AudioParameters& params) OVERRIDE; + const AudioParameters& params) override; virtual AudioOutputStream* MakeLowLatencyOutputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioInputStream* MakeLinearInputStream( - const AudioParameters& params, const std::string& device_id) OVERRIDE; + const AudioParameters& params, const std::string& device_id) override; virtual AudioInputStream* MakeLowLatencyInputStream( - const AudioParameters& params, const std::string& device_id) OVERRIDE; - virtual std::string GetDefaultOutputDeviceID() OVERRIDE; + const AudioParameters& params, const std::string& device_id) override; + virtual std::string GetDefaultOutputDeviceID() override; // Used to track destruction of input and output streams. - virtual void ReleaseOutputStream(AudioOutputStream* stream) OVERRIDE; - virtual void ReleaseInputStream(AudioInputStream* stream) OVERRIDE; + virtual void ReleaseOutputStream(AudioOutputStream* stream) override; + virtual void ReleaseInputStream(AudioInputStream* stream) override; static bool GetDefaultInputDevice(AudioDeviceID* device); static bool GetDefaultOutputDevice(AudioDeviceID* device); @@ -80,7 +80,7 @@ class MEDIA_EXPORT AudioManagerMac : public AudioManagerBase { virtual AudioParameters GetPreferredOutputStreamParameters( const std::string& output_device_id, - const AudioParameters& input_params) OVERRIDE; + const AudioParameters& input_params) override; private: void InitializeOnAudioThread(); diff --git a/media/audio/mock_audio_manager.h b/media/audio/mock_audio_manager.h index 0933b508..b78b2ef 100644 --- a/media/audio/mock_audio_manager.h +++ b/media/audio/mock_audio_manager.h @@ -24,53 +24,53 @@ class MockAudioManager : public media::AudioManager { explicit MockAudioManager( const scoped_refptr<base::SingleThreadTaskRunner>& task_runner); - virtual bool HasAudioOutputDevices() OVERRIDE; + virtual bool HasAudioOutputDevices() override; - virtual bool HasAudioInputDevices() OVERRIDE; + virtual bool HasAudioInputDevices() override; - virtual base::string16 GetAudioInputDeviceModel() OVERRIDE; + virtual base::string16 GetAudioInputDeviceModel() override; - virtual void ShowAudioInputSettings() OVERRIDE; + virtual void ShowAudioInputSettings() override; virtual void GetAudioInputDeviceNames( - media::AudioDeviceNames* device_names) OVERRIDE; + media::AudioDeviceNames* device_names) override; virtual void GetAudioOutputDeviceNames( - media::AudioDeviceNames* device_names) OVERRIDE; + media::AudioDeviceNames* device_names) override; virtual media::AudioOutputStream* MakeAudioOutputStream( const media::AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual media::AudioOutputStream* MakeAudioOutputStreamProxy( const media::AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual media::AudioInputStream* MakeAudioInputStream( const media::AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; - virtual scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() OVERRIDE; + virtual scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() override; virtual scoped_refptr<base::SingleThreadTaskRunner> GetWorkerTaskRunner() - OVERRIDE; + override; virtual void AddOutputDeviceChangeListener( - AudioDeviceListener* listener) OVERRIDE; + AudioDeviceListener* listener) override; virtual void RemoveOutputDeviceChangeListener( - AudioDeviceListener* listener) OVERRIDE; + AudioDeviceListener* listener) override; - virtual AudioParameters GetDefaultOutputStreamParameters() OVERRIDE; + virtual AudioParameters GetDefaultOutputStreamParameters() override; virtual AudioParameters GetOutputStreamParameters( - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioParameters GetInputStreamParameters( - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual std::string GetAssociatedOutputDeviceID( - const std::string& input_device_id) OVERRIDE; + const std::string& input_device_id) override; virtual scoped_ptr<AudioLog> CreateAudioLog( - AudioLogFactory::AudioComponent component) OVERRIDE; + AudioLogFactory::AudioComponent component) override; - virtual void SetHasKeyboardMic() OVERRIDE; + virtual void SetHasKeyboardMic() override; protected: virtual ~MockAudioManager(); diff --git a/media/audio/null_audio_sink.h b/media/audio/null_audio_sink.h index c28a2cf..6054a95 100644 --- a/media/audio/null_audio_sink.h +++ b/media/audio/null_audio_sink.h @@ -26,12 +26,12 @@ class MEDIA_EXPORT NullAudioSink // AudioRendererSink implementation. virtual void Initialize(const AudioParameters& params, - RenderCallback* callback) OVERRIDE; - virtual void Start() OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Pause() OVERRIDE; - virtual void Play() OVERRIDE; - virtual bool SetVolume(double volume) OVERRIDE; + RenderCallback* callback) override; + virtual void Start() override; + virtual void Stop() override; + virtual void Pause() override; + virtual void Play() override; + virtual bool SetVolume(double volume) override; // Enables audio frame hashing. Must be called prior to Initialize(). void StartAudioHashForTesting(); diff --git a/media/audio/openbsd/audio_manager_openbsd.h b/media/audio/openbsd/audio_manager_openbsd.h index 53b7dfb..5bd7518 100644 --- a/media/audio/openbsd/audio_manager_openbsd.h +++ b/media/audio/openbsd/audio_manager_openbsd.h @@ -17,28 +17,28 @@ class MEDIA_EXPORT AudioManagerOpenBSD : public AudioManagerBase { AudioManagerOpenBSD(AudioLogFactory* audio_log_factory); // Implementation of AudioManager. - virtual bool HasAudioOutputDevices() OVERRIDE; - virtual bool HasAudioInputDevices() OVERRIDE; + virtual bool HasAudioOutputDevices() override; + virtual bool HasAudioInputDevices() override; virtual AudioParameters GetInputStreamParameters( - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; // Implementation of AudioManagerBase. virtual AudioOutputStream* MakeLinearOutputStream( - const AudioParameters& params) OVERRIDE; + const AudioParameters& params) override; virtual AudioOutputStream* MakeLowLatencyOutputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioInputStream* MakeLinearInputStream( - const AudioParameters& params, const std::string& device_id) OVERRIDE; + const AudioParameters& params, const std::string& device_id) override; virtual AudioInputStream* MakeLowLatencyInputStream( - const AudioParameters& params, const std::string& device_id) OVERRIDE; + const AudioParameters& params, const std::string& device_id) override; protected: virtual ~AudioManagerOpenBSD(); virtual AudioParameters GetPreferredOutputStreamParameters( const std::string& output_device_id, - const AudioParameters& input_params) OVERRIDE; + const AudioParameters& input_params) override; private: // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream. diff --git a/media/audio/pulse/audio_manager_pulse.h b/media/audio/pulse/audio_manager_pulse.h index 150ea51..65462c4 100644 --- a/media/audio/pulse/audio_manager_pulse.h +++ b/media/audio/pulse/audio_manager_pulse.h @@ -22,31 +22,31 @@ class MEDIA_EXPORT AudioManagerPulse : public AudioManagerBase { static AudioManager* Create(AudioLogFactory* audio_log_factory); // Implementation of AudioManager. - virtual bool HasAudioOutputDevices() OVERRIDE; - virtual bool HasAudioInputDevices() OVERRIDE; - virtual void ShowAudioInputSettings() OVERRIDE; + virtual bool HasAudioOutputDevices() override; + virtual bool HasAudioInputDevices() override; + virtual void ShowAudioInputSettings() override; virtual void GetAudioInputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual void GetAudioOutputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual AudioParameters GetInputStreamParameters( - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; // Implementation of AudioManagerBase. virtual AudioOutputStream* MakeLinearOutputStream( - const AudioParameters& params) OVERRIDE; + const AudioParameters& params) override; virtual AudioOutputStream* MakeLowLatencyOutputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioInputStream* MakeLinearInputStream( - const AudioParameters& params, const std::string& device_id) OVERRIDE; + const AudioParameters& params, const std::string& device_id) override; virtual AudioInputStream* MakeLowLatencyInputStream( - const AudioParameters& params, const std::string& device_id) OVERRIDE; + const AudioParameters& params, const std::string& device_id) override; protected: virtual AudioParameters GetPreferredOutputStreamParameters( const std::string& output_device_id, - const AudioParameters& input_params) OVERRIDE; + const AudioParameters& input_params) override; private: bool Init(); diff --git a/media/audio/pulse/pulse_input.h b/media/audio/pulse/pulse_input.h index 9f08379..60acf2f 100644 --- a/media/audio/pulse/pulse_input.h +++ b/media/audio/pulse/pulse_input.h @@ -34,13 +34,13 @@ class PulseAudioInputStream : public AgcAudioStream<AudioInputStream> { virtual ~PulseAudioInputStream(); // Implementation of AudioInputStream. - virtual bool Open() OVERRIDE; - virtual void Start(AudioInputCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Close() OVERRIDE; - virtual double GetMaxVolume() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual double GetVolume() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioInputCallback* callback) override; + virtual void Stop() override; + virtual void Close() override; + virtual double GetMaxVolume() override; + virtual void SetVolume(double volume) override; + virtual double GetVolume() override; private: // PulseAudio Callbacks. diff --git a/media/audio/pulse/pulse_output.h b/media/audio/pulse/pulse_output.h index e1c0045..b2be95f 100644 --- a/media/audio/pulse/pulse_output.h +++ b/media/audio/pulse/pulse_output.h @@ -44,12 +44,12 @@ class PulseAudioOutputStream : public AudioOutputStream { virtual ~PulseAudioOutputStream(); // Implementation of AudioOutputStream. - virtual bool Open() OVERRIDE; - virtual void Close() OVERRIDE; - virtual void Start(AudioSourceCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual void GetVolume(double* volume) OVERRIDE; + virtual bool Open() override; + virtual void Close() override; + virtual void Start(AudioSourceCallback* callback) override; + virtual void Stop() override; + virtual void SetVolume(double volume) override; + virtual void GetVolume(double* volume) override; private: // Called by PulseAudio when |pa_stream_| change state. If an unexpected diff --git a/media/audio/simple_sources.h b/media/audio/simple_sources.h index 6c8904c..98caf28 100644 --- a/media/audio/simple_sources.h +++ b/media/audio/simple_sources.h @@ -28,8 +28,8 @@ class MEDIA_EXPORT SineWaveAudioSource // Implementation of AudioSourceCallback. virtual int OnMoreData(AudioBus* audio_bus, - uint32 total_bytes_delay) OVERRIDE; - virtual void OnError(AudioOutputStream* stream) OVERRIDE; + uint32 total_bytes_delay) override; + virtual void OnError(AudioOutputStream* stream) override; // The number of OnMoreData() and OnError() calls respectively. int callbacks() { return callbacks_; } diff --git a/media/audio/sounds/audio_stream_handler.cc b/media/audio/sounds/audio_stream_handler.cc index 6a3c16c..e57612e 100644 --- a/media/audio/sounds/audio_stream_handler.cc +++ b/media/audio/sounds/audio_stream_handler.cc @@ -105,7 +105,7 @@ class AudioStreamHandler::AudioStreamContainer // AudioOutputStream::AudioSourceCallback overrides: // Following methods could be called from *ANY* thread. virtual int OnMoreData(AudioBus* dest, - uint32 /* total_bytes_delay */) OVERRIDE { + uint32 /* total_bytes_delay */) override { base::AutoLock al(state_lock_); size_t bytes_written = 0; @@ -124,7 +124,7 @@ class AudioStreamHandler::AudioStreamContainer return dest->frames(); } - virtual void OnError(AudioOutputStream* /* stream */) OVERRIDE { + virtual void OnError(AudioOutputStream* /* stream */) override { LOG(ERROR) << "Error during system sound reproduction."; } diff --git a/media/audio/sounds/audio_stream_handler_unittest.cc b/media/audio/sounds/audio_stream_handler_unittest.cc index acf472a..db4961a 100644 --- a/media/audio/sounds/audio_stream_handler_unittest.cc +++ b/media/audio/sounds/audio_stream_handler_unittest.cc @@ -24,14 +24,14 @@ class AudioStreamHandlerTest : public testing::Test { AudioStreamHandlerTest() {} virtual ~AudioStreamHandlerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { audio_manager_.reset(AudioManager::CreateForTesting()); base::StringPiece data(kTestAudioData, arraysize(kTestAudioData)); audio_stream_handler_.reset(new AudioStreamHandler(data)); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { audio_stream_handler_.reset(); audio_manager_.reset(); } diff --git a/media/audio/sounds/sounds_manager.cc b/media/audio/sounds/sounds_manager.cc index e808436..e75f3f2 100644 --- a/media/audio/sounds/sounds_manager.cc +++ b/media/audio/sounds/sounds_manager.cc @@ -28,9 +28,9 @@ class SoundsManagerImpl : public SoundsManager { // SoundsManager implementation: virtual bool Initialize(SoundKey key, - const base::StringPiece& data) OVERRIDE; - virtual bool Play(SoundKey key) OVERRIDE; - virtual base::TimeDelta GetDuration(SoundKey key) OVERRIDE; + const base::StringPiece& data) override; + virtual bool Play(SoundKey key) override; + virtual base::TimeDelta GetDuration(SoundKey key) override; private: base::hash_map<SoundKey, linked_ptr<AudioStreamHandler> > handlers_; diff --git a/media/audio/sounds/sounds_manager_unittest.cc b/media/audio/sounds/sounds_manager_unittest.cc index 78f564e..101f6a3 100644 --- a/media/audio/sounds/sounds_manager_unittest.cc +++ b/media/audio/sounds/sounds_manager_unittest.cc @@ -23,12 +23,12 @@ class SoundsManagerTest : public testing::Test { SoundsManagerTest() {} virtual ~SoundsManagerTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { audio_manager_.reset(AudioManager::CreateForTesting()); SoundsManager::Create(); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { SoundsManager::Shutdown(); audio_manager_.reset(); } diff --git a/media/audio/sounds/test_data.h b/media/audio/sounds/test_data.h index d7fb11d..6caf119 100644 --- a/media/audio/sounds/test_data.h +++ b/media/audio/sounds/test_data.h @@ -28,8 +28,8 @@ class TestObserver : public AudioStreamHandler::TestObserver { virtual ~TestObserver(); // AudioStreamHandler::TestObserver implementation: - virtual void OnPlay() OVERRIDE; - virtual void OnStop(size_t cursor) OVERRIDE; + virtual void OnPlay() override; + virtual void OnStop(size_t cursor) override; int num_play_requests() const { return num_play_requests_; } int num_stop_requests() const { return num_stop_requests_; } diff --git a/media/audio/test_audio_input_controller_factory.h b/media/audio/test_audio_input_controller_factory.h index d493022..c72a25f 100644 --- a/media/audio/test_audio_input_controller_factory.h +++ b/media/audio/test_audio_input_controller_factory.h @@ -64,10 +64,10 @@ class TestAudioInputController : public AudioInputController { EventHandler* event_handler() const { return event_handler_; } // Notifies the TestAudioControllerOpened() event to the delegate (if any). - virtual void Record() OVERRIDE; + virtual void Record() override; // Ensure that the closure is run on the audio-manager thread. - virtual void Close(const base::Closure& closed_task) OVERRIDE; + virtual void Close(const base::Closure& closed_task) override; const AudioParameters& audio_parameters() const { return audio_parameters_; @@ -101,7 +101,7 @@ class TestAudioInputControllerFactory : public AudioInputController::Factory { AudioManager* audio_manager, AudioInputController::EventHandler* event_handler, AudioParameters params, - UserInputMonitor* user_input_monitor) OVERRIDE; + UserInputMonitor* user_input_monitor) override; void set_delegate(TestAudioInputControllerDelegate* delegate) { delegate_ = delegate; diff --git a/media/audio/virtual_audio_input_stream.cc b/media/audio/virtual_audio_input_stream.cc index f660b9c..c832a82 100644 --- a/media/audio/virtual_audio_input_stream.cc +++ b/media/audio/virtual_audio_input_stream.cc @@ -37,7 +37,7 @@ class LoopbackAudioConverter : public AudioConverter::InputCallback { private: virtual double ProvideInput(AudioBus* audio_bus, - base::TimeDelta buffer_delay) OVERRIDE { + base::TimeDelta buffer_delay) override { audio_converter_.Convert(audio_bus); return 1.0; } diff --git a/media/audio/virtual_audio_input_stream.h b/media/audio/virtual_audio_input_stream.h index 17e2730..88c92ea 100644 --- a/media/audio/virtual_audio_input_stream.h +++ b/media/audio/virtual_audio_input_stream.h @@ -47,15 +47,15 @@ class MEDIA_EXPORT VirtualAudioInputStream : public AudioInputStream { virtual ~VirtualAudioInputStream(); // AudioInputStream: - virtual bool Open() OVERRIDE; - virtual void Start(AudioInputCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Close() OVERRIDE; - virtual double GetMaxVolume() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual double GetVolume() OVERRIDE; - virtual void SetAutomaticGainControl(bool enabled) OVERRIDE; - virtual bool GetAutomaticGainControl() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioInputCallback* callback) override; + virtual void Stop() override; + virtual void Close() override; + virtual double GetMaxVolume() override; + virtual void SetVolume(double volume) override; + virtual double GetVolume() override; + virtual void SetAutomaticGainControl(bool enabled) override; + virtual bool GetAutomaticGainControl() override; // Attaches a VirtualAudioOutputStream to be used as input. This // VirtualAudioInputStream must outlive all attached streams, so any attached diff --git a/media/audio/virtual_audio_input_stream_unittest.cc b/media/audio/virtual_audio_input_stream_unittest.cc index deac2ae..9256f41 100644 --- a/media/audio/virtual_audio_input_stream_unittest.cc +++ b/media/audio/virtual_audio_input_stream_unittest.cc @@ -67,7 +67,7 @@ class TestAudioSource : public SineWaveAudioSource { virtual ~TestAudioSource() {} virtual int OnMoreData(AudioBus* audio_bus, - uint32 total_bytes_delay) OVERRIDE { + uint32 total_bytes_delay) override { const int ret = SineWaveAudioSource::OnMoreData(audio_bus, total_bytes_delay); data_pulled_.Signal(); diff --git a/media/audio/virtual_audio_output_stream.h b/media/audio/virtual_audio_output_stream.h index 0df6d5b..c753975 100644 --- a/media/audio/virtual_audio_output_stream.h +++ b/media/audio/virtual_audio_output_stream.h @@ -37,17 +37,17 @@ class MEDIA_EXPORT VirtualAudioOutputStream virtual ~VirtualAudioOutputStream(); // AudioOutputStream: - virtual bool Open() OVERRIDE; - virtual void Start(AudioSourceCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual void GetVolume(double* volume) OVERRIDE; - virtual void Close() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioSourceCallback* callback) override; + virtual void Stop() override; + virtual void SetVolume(double volume) override; + virtual void GetVolume(double* volume) override; + virtual void Close() override; private: // AudioConverter::InputCallback: virtual double ProvideInput(AudioBus* audio_bus, - base::TimeDelta buffer_delay) OVERRIDE; + base::TimeDelta buffer_delay) override; const AudioParameters params_; // Pointer to the VirtualAudioInputStream to attach to when Start() is called. diff --git a/media/audio/win/audio_low_latency_input_win.h b/media/audio/win/audio_low_latency_input_win.h index 91fdde1..51feac7 100644 --- a/media/audio/win/audio_low_latency_input_win.h +++ b/media/audio/win/audio_low_latency_input_win.h @@ -95,13 +95,13 @@ class MEDIA_EXPORT WASAPIAudioInputStream virtual ~WASAPIAudioInputStream(); // Implementation of AudioInputStream. - virtual bool Open() OVERRIDE; - virtual void Start(AudioInputCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Close() OVERRIDE; - virtual double GetMaxVolume() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual double GetVolume() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioInputCallback* callback) override; + virtual void Stop() override; + virtual void Close() override; + virtual double GetMaxVolume() override; + virtual void SetVolume(double volume) override; + virtual double GetVolume() override; bool started() const { return started_; } @@ -110,7 +110,7 @@ class MEDIA_EXPORT WASAPIAudioInputStream private: // DelegateSimpleThread::Delegate implementation. - virtual void Run() OVERRIDE; + virtual void Run() override; // Issues the OnError() callback to the |sink_|. void HandleError(HRESULT err); diff --git a/media/audio/win/audio_low_latency_input_win_unittest.cc b/media/audio/win/audio_low_latency_input_win_unittest.cc index 51d4b55..4a4939e 100644 --- a/media/audio/win/audio_low_latency_input_win_unittest.cc +++ b/media/audio/win/audio_low_latency_input_win_unittest.cc @@ -64,13 +64,13 @@ class FakeAudioInputCallback : public AudioInputStream::AudioInputCallback { virtual void OnData(AudioInputStream* stream, const AudioBus* src, uint32 hardware_delay_bytes, - double volume) OVERRIDE { + double volume) override { EXPECT_NE(hardware_delay_bytes, 0u); num_received_audio_frames_ += src->frames(); data_event_.Signal(); } - virtual void OnError(AudioInputStream* stream) OVERRIDE { + virtual void OnError(AudioInputStream* stream) override { error_ = true; } diff --git a/media/audio/win/audio_low_latency_output_win.h b/media/audio/win/audio_low_latency_output_win.h index c118947..1584a46 100644 --- a/media/audio/win/audio_low_latency_output_win.h +++ b/media/audio/win/audio_low_latency_output_win.h @@ -131,12 +131,12 @@ class MEDIA_EXPORT WASAPIAudioOutputStream : virtual ~WASAPIAudioOutputStream(); // Implementation of AudioOutputStream. - virtual bool Open() OVERRIDE; - virtual void Start(AudioSourceCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Close() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual void GetVolume(double* volume) OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioSourceCallback* callback) override; + virtual void Stop() override; + virtual void Close() override; + virtual void SetVolume(double volume) override; + virtual void GetVolume(double* volume) override; // Retrieves the sample rate the audio engine uses for its internal // processing/mixing of shared-mode streams. To fetch the settings for the @@ -151,7 +151,7 @@ class MEDIA_EXPORT WASAPIAudioOutputStream : private: // DelegateSimpleThread::Delegate implementation. - virtual void Run() OVERRIDE; + virtual void Run() override; // Core part of the thread loop which controls the actual rendering. // Checks available amount of space in the endpoint buffer and reads diff --git a/media/audio/win/audio_manager_win.h b/media/audio/win/audio_manager_win.h index d8d5184..ce61eb6 100644 --- a/media/audio/win/audio_manager_win.h +++ b/media/audio/win/audio_manager_win.h @@ -21,37 +21,37 @@ class MEDIA_EXPORT AudioManagerWin : public AudioManagerBase { AudioManagerWin(AudioLogFactory* audio_log_factory); // Implementation of AudioManager. - virtual bool HasAudioOutputDevices() OVERRIDE; - virtual bool HasAudioInputDevices() OVERRIDE; - virtual base::string16 GetAudioInputDeviceModel() OVERRIDE; - virtual void ShowAudioInputSettings() OVERRIDE; + virtual bool HasAudioOutputDevices() override; + virtual bool HasAudioInputDevices() override; + virtual base::string16 GetAudioInputDeviceModel() override; + virtual void ShowAudioInputSettings() override; virtual void GetAudioInputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual void GetAudioOutputDeviceNames( - AudioDeviceNames* device_names) OVERRIDE; + AudioDeviceNames* device_names) override; virtual AudioParameters GetInputStreamParameters( - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual std::string GetAssociatedOutputDeviceID( - const std::string& input_device_id) OVERRIDE; + const std::string& input_device_id) override; // Implementation of AudioManagerBase. virtual AudioOutputStream* MakeLinearOutputStream( - const AudioParameters& params) OVERRIDE; + const AudioParameters& params) override; virtual AudioOutputStream* MakeLowLatencyOutputStream( const AudioParameters& params, - const std::string& device_id) OVERRIDE; + const std::string& device_id) override; virtual AudioInputStream* MakeLinearInputStream( - const AudioParameters& params, const std::string& device_id) OVERRIDE; + const AudioParameters& params, const std::string& device_id) override; virtual AudioInputStream* MakeLowLatencyInputStream( - const AudioParameters& params, const std::string& device_id) OVERRIDE; - virtual std::string GetDefaultOutputDeviceID() OVERRIDE; + const AudioParameters& params, const std::string& device_id) override; + virtual std::string GetDefaultOutputDeviceID() override; protected: virtual ~AudioManagerWin(); virtual AudioParameters GetPreferredOutputStreamParameters( const std::string& output_device_id, - const AudioParameters& input_params) OVERRIDE; + const AudioParameters& input_params) override; private: enum EnumerationType { diff --git a/media/audio/win/wavein_input_win.h b/media/audio/win/wavein_input_win.h index 5b1edd5..c587ed6 100644 --- a/media/audio/win/wavein_input_win.h +++ b/media/audio/win/wavein_input_win.h @@ -35,16 +35,16 @@ class PCMWaveInAudioInputStream : public AudioInputStream { virtual ~PCMWaveInAudioInputStream(); // Implementation of AudioInputStream. - virtual bool Open() OVERRIDE; - virtual void Start(AudioInputCallback* callback) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Close() OVERRIDE; + virtual bool Open() override; + virtual void Start(AudioInputCallback* callback) override; + virtual void Stop() override; + virtual void Close() override; // TODO(henrika): Add volume support using the Audio Mixer API. - virtual double GetMaxVolume() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual double GetVolume() OVERRIDE; - virtual void SetAutomaticGainControl(bool enabled) OVERRIDE; - virtual bool GetAutomaticGainControl() OVERRIDE; + virtual double GetMaxVolume() override; + virtual void SetVolume(double volume) override; + virtual double GetVolume() override; + virtual void SetAutomaticGainControl(bool enabled) override; + virtual bool GetAutomaticGainControl() override; private: enum State { diff --git a/media/base/android/audio_decoder_job.h b/media/base/android/audio_decoder_job.h index f3bb091..2fab5ff 100644 --- a/media/base/android/audio_decoder_job.h +++ b/media/base/android/audio_decoder_job.h @@ -28,7 +28,7 @@ class AudioDecoderJob : public MediaDecoderJob { virtual ~AudioDecoderJob(); // MediaDecoderJob implementation. - virtual bool HasStream() const OVERRIDE; + virtual bool HasStream() const override; // Sets the volume of the audio output. void SetVolume(double volume); @@ -43,12 +43,12 @@ class AudioDecoderJob : public MediaDecoderJob { size_t size, bool render_output, base::TimeDelta current_presentation_timestamp, - const ReleaseOutputCompletionCallback& callback) OVERRIDE; - virtual bool ComputeTimeToRender() const OVERRIDE; + const ReleaseOutputCompletionCallback& callback) override; + virtual bool ComputeTimeToRender() const override; virtual bool AreDemuxerConfigsChanged( - const DemuxerConfigs& configs) const OVERRIDE; - virtual void UpdateDemuxerConfigs(const DemuxerConfigs& configs) OVERRIDE; - virtual bool CreateMediaCodecBridgeInternal() OVERRIDE; + const DemuxerConfigs& configs) const override; + virtual void UpdateDemuxerConfigs(const DemuxerConfigs& configs) override; + virtual bool CreateMediaCodecBridgeInternal() override; // Helper method to set the audio output volume. void SetVolumeInternal(); diff --git a/media/base/android/media_drm_bridge.h b/media/base/android/media_drm_bridge.h index 3c0bfb3..20da617 100644 --- a/media/base/android/media_drm_bridge.h +++ b/media/base/android/media_drm_bridge.h @@ -91,16 +91,16 @@ class MEDIA_EXPORT MediaDrmBridge : public BrowserCdm { virtual bool CreateSession(uint32 session_id, const std::string& content_type, const uint8* init_data, - int init_data_length) OVERRIDE; + int init_data_length) override; virtual void LoadSession(uint32 session_id, - const std::string& web_session_id) OVERRIDE; + const std::string& web_session_id) override; virtual void UpdateSession(uint32 session_id, const uint8* response, - int response_length) OVERRIDE; - virtual void ReleaseSession(uint32 session_id) OVERRIDE; + int response_length) override; + virtual void ReleaseSession(uint32 session_id) override; virtual int RegisterPlayer(const base::Closure& new_key_cb, - const base::Closure& cdm_unset_cb) OVERRIDE; - virtual void UnregisterPlayer(int registration_id) OVERRIDE; + const base::Closure& cdm_unset_cb) override; + virtual void UnregisterPlayer(int registration_id) override; // Returns a MediaCrypto object if it's already created. Returns a null object // otherwise. diff --git a/media/base/android/media_player_bridge.h b/media/base/android/media_player_bridge.h index 8ee6bd5..ce0dfb2 100644 --- a/media/base/android/media_player_bridge.h +++ b/media/base/android/media_player_bridge.h @@ -57,24 +57,24 @@ class MEDIA_EXPORT MediaPlayerBridge : public MediaPlayerAndroid { virtual void Initialize(); // MediaPlayerAndroid implementation. - virtual void SetVideoSurface(gfx::ScopedJavaSurface surface) OVERRIDE; - virtual void Start() OVERRIDE; - virtual void Pause(bool is_media_related_action ALLOW_UNUSED) OVERRIDE; - virtual void SeekTo(base::TimeDelta timestamp) OVERRIDE; - virtual void Release() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual int GetVideoWidth() OVERRIDE; - virtual int GetVideoHeight() OVERRIDE; - virtual base::TimeDelta GetCurrentTime() OVERRIDE; - virtual base::TimeDelta GetDuration() OVERRIDE; - virtual bool IsPlaying() OVERRIDE; - virtual bool CanPause() OVERRIDE; - virtual bool CanSeekForward() OVERRIDE; - virtual bool CanSeekBackward() OVERRIDE; - virtual bool IsPlayerReady() OVERRIDE; - virtual GURL GetUrl() OVERRIDE; - virtual GURL GetFirstPartyForCookies() OVERRIDE; - virtual bool IsSurfaceInUse() const OVERRIDE; + virtual void SetVideoSurface(gfx::ScopedJavaSurface surface) override; + virtual void Start() override; + virtual void Pause(bool is_media_related_action ALLOW_UNUSED) override; + virtual void SeekTo(base::TimeDelta timestamp) override; + virtual void Release() override; + virtual void SetVolume(double volume) override; + virtual int GetVideoWidth() override; + virtual int GetVideoHeight() override; + virtual base::TimeDelta GetCurrentTime() override; + virtual base::TimeDelta GetDuration() override; + virtual bool IsPlaying() override; + virtual bool CanPause() override; + virtual bool CanSeekForward() override; + virtual bool CanSeekBackward() override; + virtual bool IsPlayerReady() override; + virtual GURL GetUrl() override; + virtual GURL GetFirstPartyForCookies() override; + virtual bool IsSurfaceInUse() const override; // MediaPlayerListener callbacks. void OnVideoSizeChanged(int width, int height); diff --git a/media/base/android/media_source_player.h b/media/base/android/media_source_player.h index a587386..f455a8c 100644 --- a/media/base/android/media_source_player.h +++ b/media/base/android/media_source_player.h @@ -46,30 +46,30 @@ class MEDIA_EXPORT MediaSourcePlayer : public MediaPlayerAndroid, virtual ~MediaSourcePlayer(); // MediaPlayerAndroid implementation. - virtual void SetVideoSurface(gfx::ScopedJavaSurface surface) OVERRIDE; - virtual void Start() OVERRIDE; - virtual void Pause(bool is_media_related_action ALLOW_UNUSED) OVERRIDE; - virtual void SeekTo(base::TimeDelta timestamp) OVERRIDE; - virtual void Release() OVERRIDE; - virtual void SetVolume(double volume) OVERRIDE; - virtual int GetVideoWidth() OVERRIDE; - virtual int GetVideoHeight() OVERRIDE; - virtual base::TimeDelta GetCurrentTime() OVERRIDE; - virtual base::TimeDelta GetDuration() OVERRIDE; - virtual bool IsPlaying() OVERRIDE; - virtual bool CanPause() OVERRIDE; - virtual bool CanSeekForward() OVERRIDE; - virtual bool CanSeekBackward() OVERRIDE; - virtual bool IsPlayerReady() OVERRIDE; - virtual void SetCdm(BrowserCdm* cdm) OVERRIDE; - virtual bool IsSurfaceInUse() const OVERRIDE; + virtual void SetVideoSurface(gfx::ScopedJavaSurface surface) override; + virtual void Start() override; + virtual void Pause(bool is_media_related_action ALLOW_UNUSED) override; + virtual void SeekTo(base::TimeDelta timestamp) override; + virtual void Release() override; + virtual void SetVolume(double volume) override; + virtual int GetVideoWidth() override; + virtual int GetVideoHeight() override; + virtual base::TimeDelta GetCurrentTime() override; + virtual base::TimeDelta GetDuration() override; + virtual bool IsPlaying() override; + virtual bool CanPause() override; + virtual bool CanSeekForward() override; + virtual bool CanSeekBackward() override; + virtual bool IsPlayerReady() override; + virtual void SetCdm(BrowserCdm* cdm) override; + virtual bool IsSurfaceInUse() const override; // DemuxerAndroidClient implementation. - virtual void OnDemuxerConfigsAvailable(const DemuxerConfigs& params) OVERRIDE; - virtual void OnDemuxerDataAvailable(const DemuxerData& params) OVERRIDE; + virtual void OnDemuxerConfigsAvailable(const DemuxerConfigs& params) override; + virtual void OnDemuxerDataAvailable(const DemuxerData& params) override; virtual void OnDemuxerSeekDone( - base::TimeDelta actual_browser_seek_time) OVERRIDE; - virtual void OnDemuxerDurationChanged(base::TimeDelta duration) OVERRIDE; + base::TimeDelta actual_browser_seek_time) override; + virtual void OnDemuxerDurationChanged(base::TimeDelta duration) override; private: friend class MediaSourcePlayerTest; diff --git a/media/base/android/media_source_player_unittest.cc b/media/base/android/media_source_player_unittest.cc index 9cb2b41..3ae5704 100644 --- a/media/base/android/media_source_player_unittest.cc +++ b/media/base/android/media_source_player_unittest.cc @@ -49,37 +49,37 @@ class MockMediaPlayerManager : public MediaPlayerManager { virtual ~MockMediaPlayerManager() {} // MediaPlayerManager implementation. - virtual MediaResourceGetter* GetMediaResourceGetter() OVERRIDE { + virtual MediaResourceGetter* GetMediaResourceGetter() override { return NULL; } - virtual MediaUrlInterceptor* GetMediaUrlInterceptor() OVERRIDE { + virtual MediaUrlInterceptor* GetMediaUrlInterceptor() override { return NULL; } virtual void OnTimeUpdate(int player_id, base::TimeDelta current_time, - base::TimeTicks current_time_ticks) OVERRIDE { + base::TimeTicks current_time_ticks) override { timestamp_updated_ = true; } virtual void OnMediaMetadataChanged( int player_id, base::TimeDelta duration, int width, int height, - bool success) OVERRIDE {} - virtual void OnPlaybackComplete(int player_id) OVERRIDE { + bool success) override {} + virtual void OnPlaybackComplete(int player_id) override { playback_completed_ = true; if (message_loop_->is_running()) message_loop_->Quit(); } - virtual void OnMediaInterrupted(int player_id) OVERRIDE {} - virtual void OnBufferingUpdate(int player_id, int percentage) OVERRIDE {} + virtual void OnMediaInterrupted(int player_id) override {} + virtual void OnBufferingUpdate(int player_id, int percentage) override {} virtual void OnSeekComplete(int player_id, - const base::TimeDelta& current_time) OVERRIDE {} - virtual void OnError(int player_id, int error) OVERRIDE {} + const base::TimeDelta& current_time) override {} + virtual void OnError(int player_id, int error) override {} virtual void OnVideoSizeChanged(int player_id, int width, - int height) OVERRIDE {} - virtual MediaPlayerAndroid* GetFullscreenPlayer() OVERRIDE { return NULL; } - virtual MediaPlayerAndroid* GetPlayer(int player_id) OVERRIDE { return NULL; } - virtual void RequestFullScreen(int player_id) OVERRIDE {} + int height) override {} + virtual MediaPlayerAndroid* GetFullscreenPlayer() override { return NULL; } + virtual MediaPlayerAndroid* GetPlayer(int player_id) override { return NULL; } + virtual void RequestFullScreen(int player_id) override {} #if defined(VIDEO_HOLE) - virtual bool ShouldUseVideoOverlayForEmbeddedEncryptedVideo() OVERRIDE { + virtual bool ShouldUseVideoOverlayForEmbeddedEncryptedVideo() override { return false; } #endif // defined(VIDEO_HOLE) @@ -124,14 +124,14 @@ class MockDemuxerAndroid : public DemuxerAndroid { num_browser_seek_requests_(0) {} virtual ~MockDemuxerAndroid() {} - virtual void Initialize(DemuxerAndroidClient* client) OVERRIDE {} - virtual void RequestDemuxerData(DemuxerStream::Type type) OVERRIDE { + virtual void Initialize(DemuxerAndroidClient* client) override {} + virtual void RequestDemuxerData(DemuxerStream::Type type) override { num_data_requests_++; if (message_loop_->is_running()) message_loop_->Quit(); } virtual void RequestDemuxerSeek(const base::TimeDelta& time_to_seek, - bool is_browser_seek) OVERRIDE { + bool is_browser_seek) override { num_seek_requests_++; if (is_browser_seek) num_browser_seek_requests_++; diff --git a/media/base/android/video_decoder_job.h b/media/base/android/video_decoder_job.h index ac3dc27..ffe0e14 100644 --- a/media/base/android/video_decoder_job.h +++ b/media/base/android/video_decoder_job.h @@ -32,9 +32,9 @@ class VideoDecoderJob : public MediaDecoderJob { bool SetVideoSurface(gfx::ScopedJavaSurface surface); // MediaDecoderJob implementation. - virtual bool HasStream() const OVERRIDE; - virtual void Flush() OVERRIDE; - virtual void ReleaseDecoderResources() OVERRIDE; + virtual bool HasStream() const override; + virtual void Flush() override; + virtual void ReleaseDecoderResources() override; bool next_video_data_is_iframe() { return next_video_data_is_iframe_; @@ -50,15 +50,15 @@ class VideoDecoderJob : public MediaDecoderJob { size_t size, bool render_output, base::TimeDelta current_presentation_timestamp, - const ReleaseOutputCompletionCallback& callback) OVERRIDE; - virtual bool ComputeTimeToRender() const OVERRIDE; - virtual void UpdateDemuxerConfigs(const DemuxerConfigs& configs) OVERRIDE; + const ReleaseOutputCompletionCallback& callback) override; + virtual bool ComputeTimeToRender() const override; + virtual void UpdateDemuxerConfigs(const DemuxerConfigs& configs) override; virtual bool IsCodecReconfigureNeeded( - const DemuxerConfigs& configs) const OVERRIDE; + const DemuxerConfigs& configs) const override; virtual bool AreDemuxerConfigsChanged( - const DemuxerConfigs& configs) const OVERRIDE; - virtual bool CreateMediaCodecBridgeInternal() OVERRIDE; - virtual void CurrentDataConsumed(bool is_config_change) OVERRIDE; + const DemuxerConfigs& configs) const override; + virtual bool CreateMediaCodecBridgeInternal() override; + virtual void CurrentDataConsumed(bool is_config_change) override; // Returns true if a protected surface is required for video playback. bool IsProtectedSurfaceRequired(); diff --git a/media/base/audio_buffer_converter.h b/media/base/audio_buffer_converter.h index 9efbd16..23db743 100644 --- a/media/base/audio_buffer_converter.h +++ b/media/base/audio_buffer_converter.h @@ -52,7 +52,7 @@ class MEDIA_EXPORT AudioBufferConverter : public AudioConverter::InputCallback { private: // Callback to provide data to the AudioConverter virtual double ProvideInput(AudioBus* audio_bus, - base::TimeDelta buffer_delay) OVERRIDE; + base::TimeDelta buffer_delay) override; // Reset the converter in response to a configuration change. void ResetConverter(const scoped_refptr<AudioBuffer>& input_buffer); diff --git a/media/base/audio_converter_perftest.cc b/media/base/audio_converter_perftest.cc index 83f715e..f5137e6 100644 --- a/media/base/audio_converter_perftest.cc +++ b/media/base/audio_converter_perftest.cc @@ -19,7 +19,7 @@ class NullInputProvider : public AudioConverter::InputCallback { virtual ~NullInputProvider() {} virtual double ProvideInput(AudioBus* audio_bus, - base::TimeDelta buffer_delay) OVERRIDE { + base::TimeDelta buffer_delay) override { audio_bus->Zero(); return 1; } diff --git a/media/base/audio_renderer_mixer.h b/media/base/audio_renderer_mixer.h index 4b0af9b..00197c2 100644 --- a/media/base/audio_renderer_mixer.h +++ b/media/base/audio_renderer_mixer.h @@ -42,8 +42,8 @@ class MEDIA_EXPORT AudioRendererMixer private: // AudioRendererSink::RenderCallback implementation. virtual int Render(AudioBus* audio_bus, - int audio_delay_milliseconds) OVERRIDE; - virtual void OnRenderError() OVERRIDE; + int audio_delay_milliseconds) override; + virtual void OnRenderError() override; // Output sink for this mixer. scoped_refptr<AudioRendererSink> audio_sink_; diff --git a/media/base/audio_renderer_mixer_input.h b/media/base/audio_renderer_mixer_input.h index c7e24c6..6ae0290 100644 --- a/media/base/audio_renderer_mixer_input.h +++ b/media/base/audio_renderer_mixer_input.h @@ -27,13 +27,13 @@ class MEDIA_EXPORT AudioRendererMixerInput const GetMixerCB& get_mixer_cb, const RemoveMixerCB& remove_mixer_cb); // AudioRendererSink implementation. - virtual void Start() OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Play() OVERRIDE; - virtual void Pause() OVERRIDE; - virtual bool SetVolume(double volume) OVERRIDE; + virtual void Start() override; + virtual void Stop() override; + virtual void Play() override; + virtual void Pause() override; + virtual bool SetVolume(double volume) override; virtual void Initialize(const AudioParameters& params, - AudioRendererSink::RenderCallback* renderer) OVERRIDE; + AudioRendererSink::RenderCallback* renderer) override; // Called by AudioRendererMixer when an error occurs. void OnRenderError(); @@ -50,7 +50,7 @@ class MEDIA_EXPORT AudioRendererMixerInput // AudioConverter::InputCallback implementation. virtual double ProvideInput(AudioBus* audio_bus, - base::TimeDelta buffer_delay) OVERRIDE; + base::TimeDelta buffer_delay) override; // Callbacks provided during construction which allow AudioRendererMixerInput // to retrieve a mixer during Initialize() and notify when it's done with it. diff --git a/media/base/bit_reader.h b/media/base/bit_reader.h index b70e97c..25eea84 100644 --- a/media/base/bit_reader.h +++ b/media/base/bit_reader.h @@ -43,7 +43,7 @@ class MEDIA_EXPORT BitReader private: // BitReaderCore::ByteStreamProvider implementation. - virtual int GetBytes(int max_n, const uint8** out) OVERRIDE; + virtual int GetBytes(int max_n, const uint8** out) override; // Total number of bytes that was initially passed to BitReader. const int initial_size_; diff --git a/media/base/demuxer_perftest.cc b/media/base/demuxer_perftest.cc index e1cdbe3..2504c8e 100644 --- a/media/base/demuxer_perftest.cc +++ b/media/base/demuxer_perftest.cc @@ -26,12 +26,12 @@ class DemuxerHostImpl : public media::DemuxerHost { // DemuxerHost implementation. virtual void AddBufferedTimeRange(base::TimeDelta start, - base::TimeDelta end) OVERRIDE {} - virtual void SetDuration(base::TimeDelta duration) OVERRIDE {} - virtual void OnDemuxerError(media::PipelineStatus error) OVERRIDE {} + base::TimeDelta end) override {} + virtual void SetDuration(base::TimeDelta duration) override {} + virtual void OnDemuxerError(media::PipelineStatus error) override {} virtual void AddTextStream(media::DemuxerStream* text_stream, - const media::TextTrackConfig& config) OVERRIDE {} - virtual void RemoveTextStream(media::DemuxerStream* text_stream) OVERRIDE {} + const media::TextTrackConfig& config) override {} + virtual void RemoveTextStream(media::DemuxerStream* text_stream) override {} private: DISALLOW_COPY_AND_ASSIGN(DemuxerHostImpl); diff --git a/media/base/fake_audio_render_callback.h b/media/base/fake_audio_render_callback.h index 5318c99..695365f 100644 --- a/media/base/fake_audio_render_callback.h +++ b/media/base/fake_audio_render_callback.h @@ -27,12 +27,12 @@ class FakeAudioRenderCallback // Renders a sine wave into the provided audio data buffer. If |half_fill_| // is set, will only fill half the buffer. virtual int Render(AudioBus* audio_bus, - int audio_delay_milliseconds) OVERRIDE; + int audio_delay_milliseconds) override; MOCK_METHOD0(OnRenderError, void()); // AudioTransform::ProvideAudioTransformInput implementation. virtual double ProvideInput(AudioBus* audio_bus, - base::TimeDelta buffer_delay) OVERRIDE; + base::TimeDelta buffer_delay) override; // Toggles only filling half the requested amount during Render(). void set_half_fill(bool half_fill) { half_fill_ = half_fill; } diff --git a/media/base/fake_audio_renderer_sink.h b/media/base/fake_audio_renderer_sink.h index b548224..92a370e 100644 --- a/media/base/fake_audio_renderer_sink.h +++ b/media/base/fake_audio_renderer_sink.h @@ -24,12 +24,12 @@ class FakeAudioRendererSink : public AudioRendererSink { FakeAudioRendererSink(); virtual void Initialize(const AudioParameters& params, - RenderCallback* callback) OVERRIDE; - virtual void Start() OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Pause() OVERRIDE; - virtual void Play() OVERRIDE; - virtual bool SetVolume(double volume) OVERRIDE; + RenderCallback* callback) override; + virtual void Start() override; + virtual void Stop() override; + virtual void Pause() override; + virtual void Play() override; + virtual bool SetVolume(double volume) override; // Attempts to call Render() on the callback provided to // Initialize() with |dest| and |audio_delay_milliseconds|. diff --git a/media/base/fake_text_track_stream.h b/media/base/fake_text_track_stream.h index 27baeec..2db9934 100644 --- a/media/base/fake_text_track_stream.h +++ b/media/base/fake_text_track_stream.h @@ -18,13 +18,13 @@ class FakeTextTrackStream : public DemuxerStream { virtual ~FakeTextTrackStream(); // DemuxerStream implementation. - virtual void Read(const ReadCB&) OVERRIDE; + virtual void Read(const ReadCB&) override; MOCK_METHOD0(audio_decoder_config, AudioDecoderConfig()); MOCK_METHOD0(video_decoder_config, VideoDecoderConfig()); - virtual Type type() OVERRIDE; + virtual Type type() override; MOCK_METHOD0(EnableBitstreamConverter, void()); virtual bool SupportsConfigChanges(); - virtual VideoRotation video_rotation() OVERRIDE; + virtual VideoRotation video_rotation() override; void SatisfyPendingRead(const base::TimeDelta& start, const base::TimeDelta& duration, diff --git a/media/base/mock_audio_renderer_sink.h b/media/base/mock_audio_renderer_sink.h index 00a4092..5f1c245 100644 --- a/media/base/mock_audio_renderer_sink.h +++ b/media/base/mock_audio_renderer_sink.h @@ -22,7 +22,7 @@ class MockAudioRendererSink : public AudioRendererSink { MOCK_METHOD1(SetVolume, bool(double volume)); virtual void Initialize(const AudioParameters& params, - RenderCallback* renderer) OVERRIDE; + RenderCallback* renderer) override; AudioRendererSink::RenderCallback* callback() { return callback_; } protected: diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h index 8caf9f8..d2b9bd6 100644 --- a/media/base/mock_filters.h +++ b/media/base/mock_filters.h @@ -53,17 +53,17 @@ class MockDemuxerStream : public DemuxerStream { virtual ~MockDemuxerStream(); // DemuxerStream implementation. - virtual Type type() OVERRIDE; + virtual Type type() override; MOCK_METHOD1(Read, void(const ReadCB& read_cb)); - virtual AudioDecoderConfig audio_decoder_config() OVERRIDE; - virtual VideoDecoderConfig video_decoder_config() OVERRIDE; + virtual AudioDecoderConfig audio_decoder_config() override; + virtual VideoDecoderConfig video_decoder_config() override; MOCK_METHOD0(EnableBitstreamConverter, void()); MOCK_METHOD0(SupportsConfigChanges, bool()); void set_audio_decoder_config(const AudioDecoderConfig& config); void set_video_decoder_config(const VideoDecoderConfig& config); - virtual VideoRotation video_rotation() OVERRIDE; + virtual VideoRotation video_rotation() override; private: DemuxerStream::Type type_; diff --git a/media/base/pipeline.h b/media/base/pipeline.h index a5b9e39..1ce4a4c 100644 --- a/media/base/pipeline.h +++ b/media/base/pipeline.h @@ -204,12 +204,12 @@ class MEDIA_EXPORT Pipeline : public DemuxerHost { // DemuxerHost implementaion. virtual void AddBufferedTimeRange(base::TimeDelta start, - base::TimeDelta end) OVERRIDE; - virtual void SetDuration(base::TimeDelta duration) OVERRIDE; - virtual void OnDemuxerError(PipelineStatus error) OVERRIDE; + base::TimeDelta end) override; + virtual void SetDuration(base::TimeDelta duration) override; + virtual void OnDemuxerError(PipelineStatus error) override; virtual void AddTextStream(DemuxerStream* text_stream, - const TextTrackConfig& config) OVERRIDE; - virtual void RemoveTextStream(DemuxerStream* text_stream) OVERRIDE; + const TextTrackConfig& config) override; + virtual void RemoveTextStream(DemuxerStream* text_stream) override; // Callback executed when a rendering error happened, initiating the teardown // sequence. diff --git a/media/base/run_all_perftests.cc b/media/base/run_all_perftests.cc index 811bb9b..a008d62 100644 --- a/media/base/run_all_perftests.cc +++ b/media/base/run_all_perftests.cc @@ -19,7 +19,7 @@ class TestSuiteNoAtExit : public base::TestSuite { TestSuiteNoAtExit(int argc, char** argv) : TestSuite(argc, argv) {} virtual ~TestSuiteNoAtExit() {} protected: - virtual void Initialize() OVERRIDE; + virtual void Initialize() override; }; void TestSuiteNoAtExit::Initialize() { diff --git a/media/base/run_all_unittests.cc b/media/base/run_all_unittests.cc index 450da76..927e92b 100644 --- a/media/base/run_all_unittests.cc +++ b/media/base/run_all_unittests.cc @@ -21,7 +21,7 @@ class TestSuiteNoAtExit : public base::TestSuite { TestSuiteNoAtExit(int argc, char** argv) : TestSuite(argc, argv) {} virtual ~TestSuiteNoAtExit() {} protected: - virtual void Initialize() OVERRIDE; + virtual void Initialize() override; }; void TestSuiteNoAtExit::Initialize() { diff --git a/media/base/stream_parser_buffer.h b/media/base/stream_parser_buffer.h index 7ce9e8c..6897de5 100644 --- a/media/base/stream_parser_buffer.h +++ b/media/base/stream_parser_buffer.h @@ -169,7 +169,7 @@ class MEDIA_EXPORT StreamParserBuffer : public DecoderBuffer { return preroll_buffer_; } - virtual void set_timestamp(base::TimeDelta timestamp) OVERRIDE; + virtual void set_timestamp(base::TimeDelta timestamp) override; private: StreamParserBuffer(const uint8* data, int data_size, diff --git a/media/base/user_input_monitor_linux.cc b/media/base/user_input_monitor_linux.cc index b92cdda..e7ac0c8 100644 --- a/media/base/user_input_monitor_linux.cc +++ b/media/base/user_input_monitor_linux.cc @@ -52,7 +52,7 @@ class UserInputMonitorLinuxCore virtual ~UserInputMonitorLinuxCore(); // DestructionObserver overrides. - virtual void WillDestroyCurrentMessageLoop() OVERRIDE; + virtual void WillDestroyCurrentMessageLoop() override; size_t GetKeyPressCount() const; void StartMonitor(EventType type); @@ -60,8 +60,8 @@ class UserInputMonitorLinuxCore private: // base::MessagePumpLibevent::Watcher interface. - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE; - virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE; + virtual void OnFileCanReadWithoutBlocking(int fd) override; + virtual void OnFileCanWriteWithoutBlocking(int fd) override; // Processes key and mouse events. void ProcessXEvent(xEvent* event); @@ -91,14 +91,14 @@ class UserInputMonitorLinux : public UserInputMonitor { virtual ~UserInputMonitorLinux(); // Public UserInputMonitor overrides. - virtual size_t GetKeyPressCount() const OVERRIDE; + virtual size_t GetKeyPressCount() const override; private: // Private UserInputMonitor overrides. - virtual void StartKeyboardMonitoring() OVERRIDE; - virtual void StopKeyboardMonitoring() OVERRIDE; - virtual void StartMouseMonitoring() OVERRIDE; - virtual void StopMouseMonitoring() OVERRIDE; + virtual void StartKeyboardMonitoring() override; + virtual void StopKeyboardMonitoring() override; + virtual void StartMouseMonitoring() override; + virtual void StopMouseMonitoring() override; scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_; UserInputMonitorLinuxCore* core_; diff --git a/media/base/user_input_monitor_mac.cc b/media/base/user_input_monitor_mac.cc index f70ee4d..c157ed4 100644 --- a/media/base/user_input_monitor_mac.cc +++ b/media/base/user_input_monitor_mac.cc @@ -14,13 +14,13 @@ class UserInputMonitorMac : public UserInputMonitor { UserInputMonitorMac(); virtual ~UserInputMonitorMac(); - virtual size_t GetKeyPressCount() const OVERRIDE; + virtual size_t GetKeyPressCount() const override; private: - virtual void StartKeyboardMonitoring() OVERRIDE; - virtual void StopKeyboardMonitoring() OVERRIDE; - virtual void StartMouseMonitoring() OVERRIDE; - virtual void StopMouseMonitoring() OVERRIDE; + virtual void StartKeyboardMonitoring() override; + virtual void StopKeyboardMonitoring() override; + virtual void StartMouseMonitoring() override; + virtual void StopMouseMonitoring() override; DISALLOW_COPY_AND_ASSIGN(UserInputMonitorMac); }; diff --git a/media/base/user_input_monitor_win.cc b/media/base/user_input_monitor_win.cc index 6efdc52..6ac3ad8 100644 --- a/media/base/user_input_monitor_win.cc +++ b/media/base/user_input_monitor_win.cc @@ -42,7 +42,7 @@ class UserInputMonitorWinCore ~UserInputMonitorWinCore(); // DestructionObserver overrides. - virtual void WillDestroyCurrentMessageLoop() OVERRIDE; + virtual void WillDestroyCurrentMessageLoop() override; size_t GetKeyPressCount() const; void StartMonitor(EventBitMask type); @@ -78,14 +78,14 @@ class UserInputMonitorWin : public UserInputMonitor { virtual ~UserInputMonitorWin(); // Public UserInputMonitor overrides. - virtual size_t GetKeyPressCount() const OVERRIDE; + virtual size_t GetKeyPressCount() const override; private: // Private UserInputMonitor overrides. - virtual void StartKeyboardMonitoring() OVERRIDE; - virtual void StopKeyboardMonitoring() OVERRIDE; - virtual void StartMouseMonitoring() OVERRIDE; - virtual void StopMouseMonitoring() OVERRIDE; + virtual void StartKeyboardMonitoring() override; + virtual void StopKeyboardMonitoring() override; + virtual void StartMouseMonitoring() override; + virtual void StopMouseMonitoring() override; scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_; UserInputMonitorWinCore* core_; diff --git a/media/base/video_frame_unittest.cc b/media/base/video_frame_unittest.cc index 89a6d88..08d02bf 100644 --- a/media/base/video_frame_unittest.cc +++ b/media/base/video_frame_unittest.cc @@ -272,8 +272,8 @@ class SyncPointClientImpl : public VideoFrame::SyncPointClient { public: explicit SyncPointClientImpl(uint32 sync_point) : sync_point_(sync_point) {} virtual ~SyncPointClientImpl() {} - virtual uint32 InsertSyncPoint() OVERRIDE { return sync_point_; } - virtual void WaitSyncPoint(uint32 sync_point) OVERRIDE {} + virtual uint32 InsertSyncPoint() override { return sync_point_; } + virtual void WaitSyncPoint(uint32 sync_point) override {} private: uint32 sync_point_; diff --git a/media/base/wall_clock_time_source.h b/media/base/wall_clock_time_source.h index 8057746..5215907 100644 --- a/media/base/wall_clock_time_source.h +++ b/media/base/wall_clock_time_source.h @@ -23,12 +23,12 @@ class MEDIA_EXPORT WallClockTimeSource : public TimeSource { virtual ~WallClockTimeSource(); // TimeSource implementation. - virtual void StartTicking() OVERRIDE; - virtual void StopTicking() OVERRIDE; - virtual void SetPlaybackRate(float playback_rate) OVERRIDE; - virtual void SetMediaTime(base::TimeDelta time) OVERRIDE; - virtual base::TimeDelta CurrentMediaTime() OVERRIDE; - virtual base::TimeDelta CurrentMediaTimeForSyncingVideo() OVERRIDE; + virtual void StartTicking() override; + virtual void StopTicking() override; + virtual void SetPlaybackRate(float playback_rate) override; + virtual void SetMediaTime(base::TimeDelta time) override; + virtual base::TimeDelta CurrentMediaTime() override; + virtual base::TimeDelta CurrentMediaTimeForSyncingVideo() override; void SetTickClockForTesting(scoped_ptr<base::TickClock> tick_clock); diff --git a/media/blink/buffered_data_source.h b/media/blink/buffered_data_source.h index e49494b..5d2cd66 100644 --- a/media/blink/buffered_data_source.h +++ b/media/blink/buffered_data_source.h @@ -108,13 +108,13 @@ class MEDIA_EXPORT BufferedDataSource : public DataSource { // DataSource implementation. // Called from demuxer thread. - virtual void Stop() OVERRIDE; + virtual void Stop() override; virtual void Read(int64 position, int size, uint8* data, - const DataSource::ReadCB& read_cb) OVERRIDE; - virtual bool GetSize(int64* size_out) OVERRIDE; - virtual bool IsStreaming() OVERRIDE; - virtual void SetBitrate(int bitrate) OVERRIDE; + const DataSource::ReadCB& read_cb) override; + virtual bool GetSize(int64* size_out) override; + virtual bool IsStreaming() override; + virtual void SetBitrate(int bitrate) override; protected: // A factory method to create a BufferedResourceLoader based on the read diff --git a/media/blink/buffered_data_source_host_impl.h b/media/blink/buffered_data_source_host_impl.h index fde5bb2..0af4943 100644 --- a/media/blink/buffered_data_source_host_impl.h +++ b/media/blink/buffered_data_source_host_impl.h @@ -21,8 +21,8 @@ class MEDIA_EXPORT BufferedDataSourceHostImpl virtual ~BufferedDataSourceHostImpl(); // BufferedDataSourceHost implementation. - virtual void SetTotalBytes(int64 total_bytes) OVERRIDE; - virtual void AddBufferedByteRange(int64 start, int64 end) OVERRIDE; + virtual void SetTotalBytes(int64 total_bytes) override; + virtual void AddBufferedByteRange(int64 start, int64 end) override; // Translate the byte ranges to time ranges and append them to the list. // TODO(sandersd): This is a confusing name, find something better. diff --git a/media/blink/null_encrypted_media_player_support.h b/media/blink/null_encrypted_media_player_support.h index 615b893..2fe5387 100644 --- a/media/blink/null_encrypted_media_player_support.h +++ b/media/blink/null_encrypted_media_player_support.h @@ -26,7 +26,7 @@ class MEDIA_EXPORT NullEncryptedMediaPlayerSupport blink::WebLocalFrame* frame, const blink::WebString& key_system, const unsigned char* init_data, - unsigned init_data_length) OVERRIDE; + unsigned init_data_length) override; virtual blink::WebMediaPlayer::MediaKeyException AddKey( const blink::WebString& key_system, @@ -34,21 +34,21 @@ class MEDIA_EXPORT NullEncryptedMediaPlayerSupport unsigned key_length, const unsigned char* init_data, unsigned init_data_length, - const blink::WebString& session_id) OVERRIDE; + const blink::WebString& session_id) override; virtual blink::WebMediaPlayer::MediaKeyException CancelKeyRequest( const blink::WebString& key_system, - const blink::WebString& session_id) OVERRIDE; + const blink::WebString& session_id) override; // Unprefixed API methods. virtual void SetInitialContentDecryptionModule( - blink::WebContentDecryptionModule* initial_cdm) OVERRIDE; + blink::WebContentDecryptionModule* initial_cdm) override; virtual void SetContentDecryptionModule( - blink::WebContentDecryptionModule* cdm) OVERRIDE; + blink::WebContentDecryptionModule* cdm) override; virtual void SetContentDecryptionModule( blink::WebContentDecryptionModule* cdm, - blink::WebContentDecryptionModuleResult result) OVERRIDE; + blink::WebContentDecryptionModuleResult result) override; // Callback factory and notification methods used by WebMediaPlayerImpl. @@ -56,16 +56,16 @@ class MEDIA_EXPORT NullEncryptedMediaPlayerSupport // Creates a callback that Demuxers can use to signal that the content // requires a key. This method makes sure the callback returned can be safely // invoked from any thread. - virtual Demuxer::NeedKeyCB CreateNeedKeyCB() OVERRIDE; + virtual Demuxer::NeedKeyCB CreateNeedKeyCB() override; // Creates a callback that renderers can use to set decryptor // ready callback. This method makes sure the callback returned can be safely // invoked from any thread. - virtual SetDecryptorReadyCB CreateSetDecryptorReadyCB() OVERRIDE; + virtual SetDecryptorReadyCB CreateSetDecryptorReadyCB() override; // Called to inform this object that the media pipeline encountered // and handled a decryption error. - virtual void OnPipelineDecryptError() OVERRIDE; + virtual void OnPipelineDecryptError() override; private: NullEncryptedMediaPlayerSupport(); diff --git a/media/blink/run_all_unittests.cc b/media/blink/run_all_unittests.cc index 081a121..83c75d6 100644 --- a/media/blink/run_all_unittests.cc +++ b/media/blink/run_all_unittests.cc @@ -20,9 +20,9 @@ class TestBlinkPlatformSupport : NON_EXPORTED_BASE(public blink::Platform) { virtual ~TestBlinkPlatformSupport(); virtual void cryptographicallyRandomValues(unsigned char* buffer, - size_t length) OVERRIDE; + size_t length) override; virtual const unsigned char* getTraceCategoryEnabledFlag( - const char* categoryName) OVERRIDE; + const char* categoryName) override; }; TestBlinkPlatformSupport::~TestBlinkPlatformSupport() {} @@ -44,7 +44,7 @@ class BlinkMediaTestSuite : public base::TestSuite { virtual ~BlinkMediaTestSuite(); protected: - virtual void Initialize() OVERRIDE; + virtual void Initialize() override; private: scoped_ptr<TestBlinkPlatformSupport> blink_platform_support_; diff --git a/media/blink/texttrack_impl.h b/media/blink/texttrack_impl.h index 1d85bde..104b9c9 100644 --- a/media/blink/texttrack_impl.h +++ b/media/blink/texttrack_impl.h @@ -37,7 +37,7 @@ class TextTrackImpl : public TextTrack { const base::TimeDelta& end, const std::string& id, const std::string& content, - const std::string& settings) OVERRIDE; + const std::string& settings) override; private: static void OnAddCue(WebInbandTextTrackImpl* text_track, diff --git a/media/blink/video_frame_compositor.h b/media/blink/video_frame_compositor.h index 9fc8b6a..a76c122 100644 --- a/media/blink/video_frame_compositor.h +++ b/media/blink/video_frame_compositor.h @@ -44,10 +44,10 @@ class MEDIA_EXPORT VideoFrameCompositor // cc::VideoFrameProvider implementation. virtual void SetVideoFrameProviderClient( - cc::VideoFrameProvider::Client* client) OVERRIDE; - virtual scoped_refptr<VideoFrame> GetCurrentFrame() OVERRIDE; + cc::VideoFrameProvider::Client* client) override; + virtual scoped_refptr<VideoFrame> GetCurrentFrame() override; virtual void PutCurrentFrame( - const scoped_refptr<VideoFrame>& frame) OVERRIDE; + const scoped_refptr<VideoFrame>& frame) override; // Updates the current frame and notifies the compositor. void UpdateCurrentFrame(const scoped_refptr<VideoFrame>& frame); diff --git a/media/blink/video_frame_compositor_unittest.cc b/media/blink/video_frame_compositor_unittest.cc index a7c46ca..4bceb24 100644 --- a/media/blink/video_frame_compositor_unittest.cc +++ b/media/blink/video_frame_compositor_unittest.cc @@ -40,11 +40,11 @@ class VideoFrameCompositorTest : public testing::Test, private: // cc::VideoFrameProvider::Client implementation. - virtual void StopUsingProvider() OVERRIDE {} - virtual void DidReceiveFrame() OVERRIDE { + virtual void StopUsingProvider() override {} + virtual void DidReceiveFrame() override { ++did_receive_frame_count_; } - virtual void DidUpdateMatrix(const float* matrix) OVERRIDE {} + virtual void DidUpdateMatrix(const float* matrix) override {} void NaturalSizeChanged(gfx::Size natural_size) { ++natural_size_changed_count_; diff --git a/media/blink/webaudiosourceprovider_impl.h b/media/blink/webaudiosourceprovider_impl.h index e686e9d..943a500 100644 --- a/media/blink/webaudiosourceprovider_impl.h +++ b/media/blink/webaudiosourceprovider_impl.h @@ -41,13 +41,13 @@ class MEDIA_EXPORT WebAudioSourceProviderImpl size_t number_of_frames); // AudioRendererSink implementation. - virtual void Start() OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Play() OVERRIDE; - virtual void Pause() OVERRIDE; - virtual bool SetVolume(double volume) OVERRIDE; + virtual void Start() override; + virtual void Stop() override; + virtual void Play() override; + virtual void Pause() override; + virtual bool SetVolume(double volume) override; virtual void Initialize(const AudioParameters& params, - RenderCallback* renderer) OVERRIDE; + RenderCallback* renderer) override; protected: virtual ~WebAudioSourceProviderImpl(); diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc index 6b5cadb..10defae 100644 --- a/media/blink/webmediaplayer_impl.cc +++ b/media/blink/webmediaplayer_impl.cc @@ -93,10 +93,10 @@ class SyncPointClientImpl : public media::VideoFrame::SyncPointClient { blink::WebGraphicsContext3D* web_graphics_context) : web_graphics_context_(web_graphics_context) {} virtual ~SyncPointClientImpl() {} - virtual uint32 InsertSyncPoint() OVERRIDE { + virtual uint32 InsertSyncPoint() override { return web_graphics_context_->insertSyncPoint(); } - virtual void WaitSyncPoint(uint32 sync_point) OVERRIDE { + virtual void WaitSyncPoint(uint32 sync_point) override { web_graphics_context_->waitSyncPoint(sync_point); } diff --git a/media/cast/cast_sender_impl.cc b/media/cast/cast_sender_impl.cc index 7b77517..5c70dbd 100644 --- a/media/cast/cast_sender_impl.cc +++ b/media/cast/cast_sender_impl.cc @@ -23,7 +23,7 @@ class LocalVideoFrameInput : public VideoFrameInput { virtual void InsertRawVideoFrame( const scoped_refptr<media::VideoFrame>& video_frame, - const base::TimeTicks& capture_time) OVERRIDE { + const base::TimeTicks& capture_time) override { cast_environment_->PostTask(CastEnvironment::MAIN, FROM_HERE, base::Bind(&VideoSender::InsertRawVideoFrame, @@ -53,7 +53,7 @@ class LocalAudioFrameInput : public AudioFrameInput { : cast_environment_(cast_environment), audio_sender_(audio_sender) {} virtual void InsertAudio(scoped_ptr<AudioBus> audio_bus, - const base::TimeTicks& recorded_time) OVERRIDE { + const base::TimeTicks& recorded_time) override { cast_environment_->PostTask(CastEnvironment::MAIN, FROM_HERE, base::Bind(&AudioSender::InsertAudio, diff --git a/media/cast/cast_sender_impl.h b/media/cast/cast_sender_impl.h index e3f16fe..4abbf8e 100644 --- a/media/cast/cast_sender_impl.h +++ b/media/cast/cast_sender_impl.h @@ -29,21 +29,21 @@ class CastSenderImpl : public CastSender { virtual void InitializeAudio( const AudioSenderConfig& audio_config, - const CastInitializationCallback& cast_initialization_cb) OVERRIDE; + const CastInitializationCallback& cast_initialization_cb) override; virtual void InitializeVideo( const VideoSenderConfig& video_config, const CastInitializationCallback& cast_initialization_cb, const CreateVideoEncodeAcceleratorCallback& create_vea_cb, const CreateVideoEncodeMemoryCallback& create_video_encode_mem_cb) - OVERRIDE; + override; virtual void SetTargetPlayoutDelay( - base::TimeDelta new_target_playout_delay) OVERRIDE; + base::TimeDelta new_target_playout_delay) override; virtual ~CastSenderImpl(); - virtual scoped_refptr<AudioFrameInput> audio_frame_input() OVERRIDE; - virtual scoped_refptr<VideoFrameInput> video_frame_input() OVERRIDE; + virtual scoped_refptr<AudioFrameInput> audio_frame_input() override; + virtual scoped_refptr<VideoFrameInput> video_frame_input() override; private: void ReceivedPacket(scoped_ptr<Packet> packet); diff --git a/media/cast/logging/encoding_event_subscriber.h b/media/cast/logging/encoding_event_subscriber.h index ca2cccb..58dccbb 100644 --- a/media/cast/logging/encoding_event_subscriber.h +++ b/media/cast/logging/encoding_event_subscriber.h @@ -52,8 +52,8 @@ class EncodingEventSubscriber : public RawEventSubscriber { virtual ~EncodingEventSubscriber(); // RawReventSubscriber implementations. - virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) OVERRIDE; - virtual void OnReceivePacketEvent(const PacketEvent& packet_event) OVERRIDE; + virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) override; + virtual void OnReceivePacketEvent(const PacketEvent& packet_event) override; // Assigns frame events and packet events received so far to |frame_events| // and |packet_events| and resets the internal state. diff --git a/media/cast/logging/receiver_time_offset_estimator_impl.h b/media/cast/logging/receiver_time_offset_estimator_impl.h index 768ccbd..f39cfa2 100644 --- a/media/cast/logging/receiver_time_offset_estimator_impl.h +++ b/media/cast/logging/receiver_time_offset_estimator_impl.h @@ -39,12 +39,12 @@ class ReceiverTimeOffsetEstimatorImpl : public ReceiverTimeOffsetEstimator { virtual ~ReceiverTimeOffsetEstimatorImpl(); // RawEventSubscriber implementations. - virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) OVERRIDE; - virtual void OnReceivePacketEvent(const PacketEvent& packet_event) OVERRIDE; + virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) override; + virtual void OnReceivePacketEvent(const PacketEvent& packet_event) override; // ReceiverTimeOffsetEstimator implementation. virtual bool GetReceiverOffsetBounds(base::TimeDelta* lower_bound, - base::TimeDelta* upper_bound) OVERRIDE; + base::TimeDelta* upper_bound) override; private: // This helper uses the difference between sent and recived event diff --git a/media/cast/logging/simple_event_subscriber.h b/media/cast/logging/simple_event_subscriber.h index adc4763..3f816e0 100644 --- a/media/cast/logging/simple_event_subscriber.h +++ b/media/cast/logging/simple_event_subscriber.h @@ -25,8 +25,8 @@ class SimpleEventSubscriber : public RawEventSubscriber { virtual ~SimpleEventSubscriber(); // RawEventSubscriber implementations. - virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) OVERRIDE; - virtual void OnReceivePacketEvent(const PacketEvent& packet_event) OVERRIDE; + virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) override; + virtual void OnReceivePacketEvent(const PacketEvent& packet_event) override; // Assigns frame events received so far to |frame_events| and clears them // from this object. diff --git a/media/cast/logging/stats_event_subscriber.h b/media/cast/logging/stats_event_subscriber.h index 7662e60..d376313 100644 --- a/media/cast/logging/stats_event_subscriber.h +++ b/media/cast/logging/stats_event_subscriber.h @@ -35,8 +35,8 @@ class StatsEventSubscriber : public RawEventSubscriber { virtual ~StatsEventSubscriber(); // RawReventSubscriber implementations. - virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) OVERRIDE; - virtual void OnReceivePacketEvent(const PacketEvent& packet_event) OVERRIDE; + virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) override; + virtual void OnReceivePacketEvent(const PacketEvent& packet_event) override; // Returns stats as a DictionaryValue. The dictionary contains one entry - // "audio" or "video" pointing to an inner dictionary. diff --git a/media/cast/net/cast_transport_sender_impl.h b/media/cast/net/cast_transport_sender_impl.h index cff5561..da44e8f 100644 --- a/media/cast/net/cast_transport_sender_impl.h +++ b/media/cast/net/cast_transport_sender_impl.h @@ -79,24 +79,24 @@ class CastTransportSenderImpl : public CastTransportSender { virtual void InitializeAudio(const CastTransportRtpConfig& config, const RtcpCastMessageCallback& cast_message_cb, - const RtcpRttCallback& rtt_cb) OVERRIDE; + const RtcpRttCallback& rtt_cb) override; virtual void InitializeVideo(const CastTransportRtpConfig& config, const RtcpCastMessageCallback& cast_message_cb, - const RtcpRttCallback& rtt_cb) OVERRIDE; - virtual void InsertFrame(uint32 ssrc, const EncodedFrame& frame) OVERRIDE; + const RtcpRttCallback& rtt_cb) override; + virtual void InsertFrame(uint32 ssrc, const EncodedFrame& frame) override; virtual void SendSenderReport( uint32 ssrc, base::TimeTicks current_time, - uint32 current_time_as_rtp_timestamp) OVERRIDE; + uint32 current_time_as_rtp_timestamp) override; virtual void CancelSendingFrames( uint32 ssrc, - const std::vector<uint32>& frame_ids) OVERRIDE; + const std::vector<uint32>& frame_ids) override; - virtual void ResendFrameForKickstart(uint32 ssrc, uint32 frame_id) OVERRIDE; + virtual void ResendFrameForKickstart(uint32 ssrc, uint32 frame_id) override; - virtual PacketReceiverCallback PacketReceiverForTesting() OVERRIDE; + virtual PacketReceiverCallback PacketReceiverForTesting() override; private: FRIEND_TEST_ALL_PREFIXES(CastTransportSenderImplTest, NacksCancelRetransmits); diff --git a/media/cast/net/cast_transport_sender_impl_unittest.cc b/media/cast/net/cast_transport_sender_impl_unittest.cc index fa9ec47..3df4b60 100644 --- a/media/cast/net/cast_transport_sender_impl_unittest.cc +++ b/media/cast/net/cast_transport_sender_impl_unittest.cc @@ -31,7 +31,7 @@ class FakePacketSender : public PacketSender { FakePacketSender() : paused_(false), packets_sent_(0), bytes_sent_(0) {} - virtual bool SendPacket(PacketRef packet, const base::Closure& cb) OVERRIDE { + virtual bool SendPacket(PacketRef packet, const base::Closure& cb) override { if (paused_) { stored_packet_ = packet; callback_ = cb; @@ -42,7 +42,7 @@ class FakePacketSender : public PacketSender { return true; } - virtual int64 GetBytesSent() OVERRIDE { + virtual int64 GetBytesSent() override { return bytes_sent_; } diff --git a/media/cast/net/pacing/paced_sender.h b/media/cast/net/pacing/paced_sender.h index 66cc6ec..ca38517 100644 --- a/media/cast/net/pacing/paced_sender.h +++ b/media/cast/net/pacing/paced_sender.h @@ -111,11 +111,11 @@ class PacedSender : public PacedPacketSender, int64 GetLastByteSentForSsrc(uint32 ssrc); // PacedPacketSender implementation. - virtual bool SendPackets(const SendPacketVector& packets) OVERRIDE; + virtual bool SendPackets(const SendPacketVector& packets) override; virtual bool ResendPackets(const SendPacketVector& packets, - const DedupInfo& dedup_info) OVERRIDE; - virtual bool SendRtcpPacket(uint32 ssrc, PacketRef packet) OVERRIDE; - virtual void CancelSendingPacket(const PacketKey& packet_key) OVERRIDE; + const DedupInfo& dedup_info) override; + virtual bool SendRtcpPacket(uint32 ssrc, PacketRef packet) override; + virtual void CancelSendingPacket(const PacketKey& packet_key) override; private: // Actually sends the packets to the transport. diff --git a/media/cast/net/pacing/paced_sender_unittest.cc b/media/cast/net/pacing/paced_sender_unittest.cc index e1fa558..8e3fa16 100644 --- a/media/cast/net/pacing/paced_sender_unittest.cc +++ b/media/cast/net/pacing/paced_sender_unittest.cc @@ -32,7 +32,7 @@ class TestPacketSender : public PacketSender { public: TestPacketSender() : bytes_sent_(0) {} - virtual bool SendPacket(PacketRef packet, const base::Closure& cb) OVERRIDE { + virtual bool SendPacket(PacketRef packet, const base::Closure& cb) override { EXPECT_FALSE(expected_packet_size_.empty()); size_t expected_packet_size = expected_packet_size_.front(); expected_packet_size_.pop_front(); @@ -41,7 +41,7 @@ class TestPacketSender : public PacketSender { return true; } - virtual int64 GetBytesSent() OVERRIDE { + virtual int64 GetBytesSent() override { return bytes_sent_; } diff --git a/media/cast/net/rtcp/receiver_rtcp_event_subscriber.h b/media/cast/net/rtcp/receiver_rtcp_event_subscriber.h index 7e80ffe..5a9acb79 100644 --- a/media/cast/net/rtcp/receiver_rtcp_event_subscriber.h +++ b/media/cast/net/rtcp/receiver_rtcp_event_subscriber.h @@ -40,8 +40,8 @@ class ReceiverRtcpEventSubscriber : public RawEventSubscriber { virtual ~ReceiverRtcpEventSubscriber(); // RawEventSubscriber implementation. - virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) OVERRIDE; - virtual void OnReceivePacketEvent(const PacketEvent& packet_event) OVERRIDE; + virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) override; + virtual void OnReceivePacketEvent(const PacketEvent& packet_event) override; // Assigns events collected to |rtcp_events| and clears them from this // object. diff --git a/media/cast/net/rtcp/receiver_rtcp_event_subscriber_unittest.cc b/media/cast/net/rtcp/receiver_rtcp_event_subscriber_unittest.cc index 8d97559..422340c 100644 --- a/media/cast/net/rtcp/receiver_rtcp_event_subscriber_unittest.cc +++ b/media/cast/net/rtcp/receiver_rtcp_event_subscriber_unittest.cc @@ -35,7 +35,7 @@ class ReceiverRtcpEventSubscriberTest : public ::testing::Test { virtual ~ReceiverRtcpEventSubscriberTest() {} - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { if (event_subscriber_) { cast_environment_->Logging()->RemoveRawEventSubscriber( event_subscriber_.get()); diff --git a/media/cast/net/rtcp/rtcp_unittest.cc b/media/cast/net/rtcp/rtcp_unittest.cc index 0b0d327..f0e5602 100644 --- a/media/cast/net/rtcp/rtcp_unittest.cc +++ b/media/cast/net/rtcp/rtcp_unittest.cc @@ -32,22 +32,22 @@ class FakeRtcpTransport : public PacedPacketSender { base::TimeDelta packet_delay() const { return packet_delay_; } void set_packet_delay(base::TimeDelta delay) { packet_delay_ = delay; } - virtual bool SendRtcpPacket(uint32 ssrc, PacketRef packet) OVERRIDE { + virtual bool SendRtcpPacket(uint32 ssrc, PacketRef packet) override { clock_->Advance(packet_delay_); rtcp_->IncomingRtcpPacket(&packet->data[0], packet->data.size()); return true; } - virtual bool SendPackets(const SendPacketVector& packets) OVERRIDE { + virtual bool SendPackets(const SendPacketVector& packets) override { return false; } virtual bool ResendPackets( - const SendPacketVector& packets, const DedupInfo& dedup_info) OVERRIDE { + const SendPacketVector& packets, const DedupInfo& dedup_info) override { return false; } - virtual void CancelSendingPacket(const PacketKey& packet_key) OVERRIDE { + virtual void CancelSendingPacket(const PacketKey& packet_key) override { } private: @@ -66,7 +66,7 @@ class FakeReceiverStats : public RtpReceiverStatistics { virtual void GetStatistics(uint8* fraction_lost, uint32* cumulative_lost, uint32* extended_high_sequence_number, - uint32* jitter) OVERRIDE { + uint32* jitter) override { *fraction_lost = 0; *cumulative_lost = 0; *extended_high_sequence_number = 0; diff --git a/media/cast/net/rtp/cast_message_builder_unittest.cc b/media/cast/net/rtp/cast_message_builder_unittest.cc index 02cfe10..f28cc0a 100644 --- a/media/cast/net/rtp/cast_message_builder_unittest.cc +++ b/media/cast/net/rtp/cast_message_builder_unittest.cc @@ -28,7 +28,7 @@ class NackFeedbackVerification : public RtpPayloadFeedback { NackFeedbackVerification() : triggered_(false), missing_packets_(), last_frame_acked_(0) {} - virtual void CastFeedback(const RtcpCastMessage& cast_feedback) OVERRIDE { + virtual void CastFeedback(const RtcpCastMessage& cast_feedback) override { EXPECT_EQ(kSsrc, cast_feedback.media_ssrc); last_frame_acked_ = cast_feedback.ack_frame_id; diff --git a/media/cast/net/rtp/receiver_stats.h b/media/cast/net/rtp/receiver_stats.h index 9de6b22..806d351 100644 --- a/media/cast/net/rtp/receiver_stats.h +++ b/media/cast/net/rtp/receiver_stats.h @@ -16,12 +16,12 @@ namespace cast { class ReceiverStats : public RtpReceiverStatistics { public: explicit ReceiverStats(base::TickClock* clock); - virtual ~ReceiverStats() OVERRIDE; + virtual ~ReceiverStats() override; virtual void GetStatistics(uint8* fraction_lost, uint32* cumulative_lost, // 24 bits valid. uint32* extended_high_sequence_number, - uint32* jitter) OVERRIDE; + uint32* jitter) override; void UpdateStatistics(const RtpCastHeader& header); private: diff --git a/media/cast/net/rtp/rtp_packetizer_unittest.cc b/media/cast/net/rtp/rtp_packetizer_unittest.cc index 6ac8ea1..a3aa2ae 100644 --- a/media/cast/net/rtp/rtp_packetizer_unittest.cc +++ b/media/cast/net/rtp/rtp_packetizer_unittest.cc @@ -61,7 +61,7 @@ class TestRtpPacketTransport : public PacketSender { EXPECT_EQ(expected_frame_id_ - 1u, rtp_header.reference_frame_id); } - virtual bool SendPacket(PacketRef packet, const base::Closure& cb) OVERRIDE { + virtual bool SendPacket(PacketRef packet, const base::Closure& cb) override { ++packets_sent_; RtpHeaderParser parser(&packet->data[0], packet->data.size()); RtpCastTestHeader rtp_header; @@ -72,7 +72,7 @@ class TestRtpPacketTransport : public PacketSender { return true; } - virtual int64 GetBytesSent() OVERRIDE { + virtual int64 GetBytesSent() override { return 0; } diff --git a/media/cast/net/udp_transport.h b/media/cast/net/udp_transport.h index d88f2f3..de4e33d 100644 --- a/media/cast/net/udp_transport.h +++ b/media/cast/net/udp_transport.h @@ -52,8 +52,8 @@ class UdpTransport : public PacketSender { // PacketSender implementations. virtual bool SendPacket(PacketRef packet, - const base::Closure& cb) OVERRIDE; - virtual int64 GetBytesSent() OVERRIDE; + const base::Closure& cb) override; + virtual int64 GetBytesSent() override; private: // Requests and processes packets from |udp_socket_|. This method is called diff --git a/media/cast/receiver/audio_decoder.cc b/media/cast/receiver/audio_decoder.cc index aeed137..402ff3b 100644 --- a/media/cast/receiver/audio_decoder.cc +++ b/media/cast/receiver/audio_decoder.cc @@ -118,7 +118,7 @@ class AudioDecoder::OpusImpl : public AudioDecoder::ImplBase { private: virtual ~OpusImpl() {} - virtual void RecoverBecauseFramesWereDropped() OVERRIDE { + virtual void RecoverBecauseFramesWereDropped() override { // Passing NULL for the input data notifies the decoder of frame loss. const opus_int32 result = opus_decode_float( @@ -126,7 +126,7 @@ class AudioDecoder::OpusImpl : public AudioDecoder::ImplBase { DCHECK_GE(result, 0); } - virtual scoped_ptr<AudioBus> Decode(uint8* data, int len) OVERRIDE { + virtual scoped_ptr<AudioBus> Decode(uint8* data, int len) override { scoped_ptr<AudioBus> audio_bus; const opus_int32 num_samples_decoded = opus_decode_float( opus_decoder_, data, len, buffer_.get(), max_samples_per_frame_, 0); @@ -177,7 +177,7 @@ class AudioDecoder::Pcm16Impl : public AudioDecoder::ImplBase { private: virtual ~Pcm16Impl() {} - virtual scoped_ptr<AudioBus> Decode(uint8* data, int len) OVERRIDE { + virtual scoped_ptr<AudioBus> Decode(uint8* data, int len) override { scoped_ptr<AudioBus> audio_bus; const int num_samples = len / sizeof(int16) / num_channels_; if (num_samples <= 0) diff --git a/media/cast/receiver/audio_decoder_unittest.cc b/media/cast/receiver/audio_decoder_unittest.cc index 62e4fbb..7f46715 100644 --- a/media/cast/receiver/audio_decoder_unittest.cc +++ b/media/cast/receiver/audio_decoder_unittest.cc @@ -41,7 +41,7 @@ class AudioDecoderTest : public ::testing::TestWithParam<TestScenario> { } protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { audio_decoder_.reset(new AudioDecoder(cast_environment_, GetParam().num_channels, GetParam().sampling_rate, diff --git a/media/cast/receiver/cast_receiver_impl.h b/media/cast/receiver/cast_receiver_impl.h index 3443561..23e6a9c 100644 --- a/media/cast/receiver/cast_receiver_impl.h +++ b/media/cast/receiver/cast_receiver_impl.h @@ -32,15 +32,15 @@ class CastReceiverImpl : public CastReceiver { virtual ~CastReceiverImpl(); // CastReceiver implementation. - virtual PacketReceiverCallback packet_receiver() OVERRIDE; + virtual PacketReceiverCallback packet_receiver() override; virtual void RequestDecodedAudioFrame( - const AudioFrameDecodedCallback& callback) OVERRIDE; + const AudioFrameDecodedCallback& callback) override; virtual void RequestEncodedAudioFrame( - const ReceiveEncodedFrameCallback& callback) OVERRIDE; + const ReceiveEncodedFrameCallback& callback) override; virtual void RequestDecodedVideoFrame( - const VideoFrameDecodedCallback& callback) OVERRIDE; + const VideoFrameDecodedCallback& callback) override; virtual void RequestEncodedVideoFrame( - const ReceiveEncodedFrameCallback& callback) OVERRIDE; + const ReceiveEncodedFrameCallback& callback) override; private: // Forwards |packet| to a specific RTP frame receiver, or drops it if SSRC diff --git a/media/cast/receiver/frame_receiver.h b/media/cast/receiver/frame_receiver.h index 67f5417..396aada 100644 --- a/media/cast/receiver/frame_receiver.h +++ b/media/cast/receiver/frame_receiver.h @@ -76,7 +76,7 @@ class FrameReceiver : public RtpPayloadFeedback, size_t payload_size); // RtpPayloadFeedback implementation. - virtual void CastFeedback(const RtcpCastMessage& cast_message) OVERRIDE; + virtual void CastFeedback(const RtcpCastMessage& cast_message) override; private: // Processes ready-to-consume packets from |framer_|, decrypting each packet's diff --git a/media/cast/receiver/video_decoder.cc b/media/cast/receiver/video_decoder.cc index 2c7a9fd..1eaa6f3 100644 --- a/media/cast/receiver/video_decoder.cc +++ b/media/cast/receiver/video_decoder.cc @@ -119,7 +119,7 @@ class VideoDecoder::Vp8Impl : public VideoDecoder::ImplBase { CHECK_EQ(VPX_CODEC_OK, vpx_codec_destroy(&context_)); } - virtual scoped_refptr<VideoFrame> Decode(uint8* data, int len) OVERRIDE { + virtual scoped_refptr<VideoFrame> Decode(uint8* data, int len) override { if (len <= 0 || vpx_codec_decode(&context_, data, static_cast<unsigned int>(len), @@ -183,7 +183,7 @@ class VideoDecoder::FakeImpl : public VideoDecoder::ImplBase { private: virtual ~FakeImpl() {} - virtual scoped_refptr<VideoFrame> Decode(uint8* data, int len) OVERRIDE { + virtual scoped_refptr<VideoFrame> Decode(uint8* data, int len) override { // Make sure this is a JSON string. if (!len || data[0] != '{') return NULL; diff --git a/media/cast/receiver/video_decoder_unittest.cc b/media/cast/receiver/video_decoder_unittest.cc index 95d92b8..b1313c6 100644 --- a/media/cast/receiver/video_decoder_unittest.cc +++ b/media/cast/receiver/video_decoder_unittest.cc @@ -51,7 +51,7 @@ class VideoDecoderTest : public ::testing::TestWithParam<Codec> { } protected: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { video_decoder_.reset(new VideoDecoder(cast_environment_, GetParam())); CHECK_EQ(STATUS_VIDEO_INITIALIZED, video_decoder_->InitializationResult()); diff --git a/media/cast/sender/audio_encoder.cc b/media/cast/sender/audio_encoder.cc index f0c5f85..28238a7 100644 --- a/media/cast/sender/audio_encoder.cc +++ b/media/cast/sender/audio_encoder.cc @@ -242,7 +242,7 @@ class AudioEncoder::OpusImpl : public AudioEncoder::ImplBase { virtual void TransferSamplesIntoBuffer(const AudioBus* audio_bus, int source_offset, int buffer_fill_offset, - int num_samples) OVERRIDE { + int num_samples) override { // Opus requires channel-interleaved samples in a single array. for (int ch = 0; ch < audio_bus->channels(); ++ch) { const float* src = audio_bus->channel(ch) + source_offset; @@ -253,7 +253,7 @@ class AudioEncoder::OpusImpl : public AudioEncoder::ImplBase { } } - virtual bool EncodeFromFilledBuffer(std::string* out) OVERRIDE { + virtual bool EncodeFromFilledBuffer(std::string* out) override { out->resize(kOpusMaxPayloadSize); const opus_int32 result = opus_encode_float(opus_encoder_, @@ -312,7 +312,7 @@ class AudioEncoder::Pcm16Impl : public AudioEncoder::ImplBase { virtual void TransferSamplesIntoBuffer(const AudioBus* audio_bus, int source_offset, int buffer_fill_offset, - int num_samples) OVERRIDE { + int num_samples) override { audio_bus->ToInterleavedPartial( source_offset, num_samples, @@ -320,7 +320,7 @@ class AudioEncoder::Pcm16Impl : public AudioEncoder::ImplBase { buffer_.get() + buffer_fill_offset * num_channels_); } - virtual bool EncodeFromFilledBuffer(std::string* out) OVERRIDE { + virtual bool EncodeFromFilledBuffer(std::string* out) override { // Output 16-bit PCM integers in big-endian byte order. out->resize(num_channels_ * samples_per_frame_ * sizeof(int16)); const int16* src = buffer_.get(); diff --git a/media/cast/sender/audio_sender.h b/media/cast/sender/audio_sender.h index 791cc8e..07646ab 100644 --- a/media/cast/sender/audio_sender.h +++ b/media/cast/sender/audio_sender.h @@ -51,9 +51,9 @@ class AudioSender : public FrameSender, const base::TimeTicks& recorded_time); protected: - virtual int GetNumberOfFramesInEncoder() const OVERRIDE; - virtual base::TimeDelta GetInFlightMediaDuration() const OVERRIDE; - virtual void OnAck(uint32 frame_id) OVERRIDE; + virtual int GetNumberOfFramesInEncoder() const override; + virtual base::TimeDelta GetInFlightMediaDuration() const override; + virtual void OnAck(uint32 frame_id) override; private: // Called by the |audio_encoder_| with the next EncodedFrame to send. diff --git a/media/cast/sender/audio_sender_unittest.cc b/media/cast/sender/audio_sender_unittest.cc index b651c83..b401bae 100644 --- a/media/cast/sender/audio_sender_unittest.cc +++ b/media/cast/sender/audio_sender_unittest.cc @@ -26,7 +26,7 @@ class TestPacketSender : public PacketSender { TestPacketSender() : number_of_rtp_packets_(0), number_of_rtcp_packets_(0) {} virtual bool SendPacket(PacketRef packet, - const base::Closure& cb) OVERRIDE { + const base::Closure& cb) override { if (Rtcp::IsRtcpPacket(&packet->data[0], packet->data.size())) { ++number_of_rtcp_packets_; } else { @@ -41,7 +41,7 @@ class TestPacketSender : public PacketSender { return true; } - virtual int64 GetBytesSent() OVERRIDE { + virtual int64 GetBytesSent() override { return 0; } diff --git a/media/cast/sender/congestion_control.cc b/media/cast/sender/congestion_control.cc index 30e3be7..ec134a7 100644 --- a/media/cast/sender/congestion_control.cc +++ b/media/cast/sender/congestion_control.cc @@ -29,21 +29,21 @@ class AdaptiveCongestionControl : public CongestionControl { uint32 min_bitrate_configured, size_t max_unacked_frames); - virtual ~AdaptiveCongestionControl() OVERRIDE; + virtual ~AdaptiveCongestionControl() override; - virtual void UpdateRtt(base::TimeDelta rtt) OVERRIDE; + virtual void UpdateRtt(base::TimeDelta rtt) override; // Called when an encoded frame is sent to the transport. virtual void SendFrameToTransport(uint32 frame_id, size_t frame_size, - base::TimeTicks when) OVERRIDE; + base::TimeTicks when) override; // Called when we receive an ACK for a frame. - virtual void AckFrame(uint32 frame_id, base::TimeTicks when) OVERRIDE; + virtual void AckFrame(uint32 frame_id, base::TimeTicks when) override; // Returns the bitrate we should use for the next frame. virtual uint32 GetBitrate(base::TimeTicks playout_time, - base::TimeDelta playout_delay) OVERRIDE; + base::TimeDelta playout_delay) override; private: struct FrameStats { @@ -91,24 +91,24 @@ class AdaptiveCongestionControl : public CongestionControl { class FixedCongestionControl : public CongestionControl { public: FixedCongestionControl(uint32 bitrate) : bitrate_(bitrate) {} - virtual ~FixedCongestionControl() OVERRIDE {} + virtual ~FixedCongestionControl() override {} - virtual void UpdateRtt(base::TimeDelta rtt) OVERRIDE { + virtual void UpdateRtt(base::TimeDelta rtt) override { } // Called when an encoded frame is sent to the transport. virtual void SendFrameToTransport(uint32 frame_id, size_t frame_size, - base::TimeTicks when) OVERRIDE { + base::TimeTicks when) override { } // Called when we receive an ACK for a frame. - virtual void AckFrame(uint32 frame_id, base::TimeTicks when) OVERRIDE { + virtual void AckFrame(uint32 frame_id, base::TimeTicks when) override { } // Returns the bitrate we should use for the next frame. virtual uint32 GetBitrate(base::TimeTicks playout_time, - base::TimeDelta playout_delay) OVERRIDE { + base::TimeDelta playout_delay) override { return bitrate_; } diff --git a/media/cast/sender/external_video_encoder.cc b/media/cast/sender/external_video_encoder.cc index 5aca424..bbda6de 100644 --- a/media/cast/sender/external_video_encoder.cc +++ b/media/cast/sender/external_video_encoder.cc @@ -168,7 +168,7 @@ class LocalVideoEncodeAcceleratorClient } protected: - virtual void NotifyError(VideoEncodeAccelerator::Error error) OVERRIDE { + virtual void NotifyError(VideoEncodeAccelerator::Error error) override { DCHECK(encoder_task_runner_.get()); DCHECK(encoder_task_runner_->RunsTasksOnCurrentThread()); VLOG(1) << "ExternalVideoEncoder NotifyError: " << error; @@ -182,7 +182,7 @@ class LocalVideoEncodeAcceleratorClient // Called to allocate the input and output buffers. virtual void RequireBitstreamBuffers(unsigned int input_count, const gfx::Size& input_coded_size, - size_t output_buffer_size) OVERRIDE { + size_t output_buffer_size) override { DCHECK(encoder_task_runner_.get()); DCHECK(encoder_task_runner_->RunsTasksOnCurrentThread()); DCHECK(video_encode_accelerator_); @@ -199,7 +199,7 @@ class LocalVideoEncodeAcceleratorClient // buffers. virtual void BitstreamBufferReady(int32 bitstream_buffer_id, size_t payload_size, - bool key_frame) OVERRIDE { + bool key_frame) override { DCHECK(encoder_task_runner_.get()); DCHECK(encoder_task_runner_->RunsTasksOnCurrentThread()); if (bitstream_buffer_id < 0 || diff --git a/media/cast/sender/external_video_encoder.h b/media/cast/sender/external_video_encoder.h index 3a5f73b..4ae21e1 100644 --- a/media/cast/sender/external_video_encoder.h +++ b/media/cast/sender/external_video_encoder.h @@ -44,12 +44,12 @@ class ExternalVideoEncoder : public VideoEncoder { virtual bool EncodeVideoFrame( const scoped_refptr<media::VideoFrame>& video_frame, const base::TimeTicks& capture_time, - const FrameEncodedCallback& frame_encoded_callback) OVERRIDE; + const FrameEncodedCallback& frame_encoded_callback) override; // The following functions are called from the main cast thread. - virtual void SetBitRate(int new_bit_rate) OVERRIDE; - virtual void GenerateKeyFrame() OVERRIDE; - virtual void LatestFrameIdToReference(uint32 frame_id) OVERRIDE; + virtual void SetBitRate(int new_bit_rate) override; + virtual void GenerateKeyFrame() override; + virtual void LatestFrameIdToReference(uint32 frame_id) override; // Called when video_accelerator_client_ has finished creating the VEA and // is ready for use. diff --git a/media/cast/sender/fake_software_video_encoder.h b/media/cast/sender/fake_software_video_encoder.h index 5491ae0..26d34aa 100644 --- a/media/cast/sender/fake_software_video_encoder.h +++ b/media/cast/sender/fake_software_video_encoder.h @@ -17,12 +17,12 @@ class FakeSoftwareVideoEncoder : public SoftwareVideoEncoder { virtual ~FakeSoftwareVideoEncoder(); // SoftwareVideoEncoder implementations. - virtual void Initialize() OVERRIDE; + virtual void Initialize() override; virtual bool Encode(const scoped_refptr<media::VideoFrame>& video_frame, - EncodedFrame* encoded_image) OVERRIDE; - virtual void UpdateRates(uint32 new_bitrate) OVERRIDE; - virtual void GenerateKeyFrame() OVERRIDE; - virtual void LatestFrameIdToReference(uint32 frame_id) OVERRIDE; + EncodedFrame* encoded_image) override; + virtual void UpdateRates(uint32 new_bitrate) override; + virtual void GenerateKeyFrame() override; + virtual void LatestFrameIdToReference(uint32 frame_id) override; private: VideoSenderConfig video_config_; diff --git a/media/cast/sender/video_encoder_impl.h b/media/cast/sender/video_encoder_impl.h index 54a3802..7261a2d 100644 --- a/media/cast/sender/video_encoder_impl.h +++ b/media/cast/sender/video_encoder_impl.h @@ -45,12 +45,12 @@ class VideoEncoderImpl : public VideoEncoder { virtual bool EncodeVideoFrame( const scoped_refptr<media::VideoFrame>& video_frame, const base::TimeTicks& capture_time, - const FrameEncodedCallback& frame_encoded_callback) OVERRIDE; + const FrameEncodedCallback& frame_encoded_callback) override; // The following functions are called from the main cast thread. - virtual void SetBitRate(int new_bit_rate) OVERRIDE; - virtual void GenerateKeyFrame() OVERRIDE; - virtual void LatestFrameIdToReference(uint32 frame_id) OVERRIDE; + virtual void SetBitRate(int new_bit_rate) override; + virtual void GenerateKeyFrame() override; + virtual void LatestFrameIdToReference(uint32 frame_id) override; private: scoped_refptr<CastEnvironment> cast_environment_; diff --git a/media/cast/sender/video_encoder_impl_unittest.cc b/media/cast/sender/video_encoder_impl_unittest.cc index 43f7366..cc73153 100644 --- a/media/cast/sender/video_encoder_impl_unittest.cc +++ b/media/cast/sender/video_encoder_impl_unittest.cc @@ -86,7 +86,7 @@ class VideoEncoderImplTest : public ::testing::Test { virtual ~VideoEncoderImplTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { testing_clock_ = new base::SimpleTestTickClock(); testing_clock_->Advance(base::TimeTicks::Now() - base::TimeTicks()); task_runner_ = new test::FakeSingleThreadTaskRunner(testing_clock_); @@ -97,7 +97,7 @@ class VideoEncoderImplTest : public ::testing::Test { task_runner_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { video_encoder_.reset(); task_runner_->RunTasks(); } diff --git a/media/cast/sender/video_sender.h b/media/cast/sender/video_sender.h index e7658ab..ebe0b10 100644 --- a/media/cast/sender/video_sender.h +++ b/media/cast/sender/video_sender.h @@ -57,9 +57,9 @@ class VideoSender : public FrameSender, const base::TimeTicks& capture_time); protected: - virtual int GetNumberOfFramesInEncoder() const OVERRIDE; - virtual base::TimeDelta GetInFlightMediaDuration() const OVERRIDE; - virtual void OnAck(uint32 frame_id) OVERRIDE; + virtual int GetNumberOfFramesInEncoder() const override; + virtual base::TimeDelta GetInFlightMediaDuration() const override; + virtual void OnAck(uint32 frame_id) override; private: // Called when the encoder is initialized or has failed to initialize. diff --git a/media/cast/sender/video_sender_unittest.cc b/media/cast/sender/video_sender_unittest.cc index be65944..d0cbdb2 100644 --- a/media/cast/sender/video_sender_unittest.cc +++ b/media/cast/sender/video_sender_unittest.cc @@ -65,7 +65,7 @@ class TestPacketSender : public PacketSender { // A singular packet implies a RTCP packet. virtual bool SendPacket(PacketRef packet, - const base::Closure& cb) OVERRIDE { + const base::Closure& cb) override { if (paused_) { stored_packet_ = packet; callback_ = cb; @@ -85,7 +85,7 @@ class TestPacketSender : public PacketSender { return true; } - virtual int64 GetBytesSent() OVERRIDE { + virtual int64 GetBytesSent() override { return 0; } @@ -160,7 +160,7 @@ class VideoSenderTest : public ::testing::Test { virtual ~VideoSenderTest() {} - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { video_sender_.reset(); task_runner_->RunTasks(); } diff --git a/media/cast/sender/vp8_encoder.h b/media/cast/sender/vp8_encoder.h index abe5eeb..0342703 100644 --- a/media/cast/sender/vp8_encoder.h +++ b/media/cast/sender/vp8_encoder.h @@ -33,19 +33,19 @@ class Vp8Encoder : public SoftwareVideoEncoder { // Initialize the encoder before Encode() can be called. This method // must be called on the thread that Encode() is called. - virtual void Initialize() OVERRIDE; + virtual void Initialize() override; // Encode a raw image (as a part of a video stream). virtual bool Encode(const scoped_refptr<media::VideoFrame>& video_frame, - EncodedFrame* encoded_image) OVERRIDE; + EncodedFrame* encoded_image) override; // Update the encoder with a new target bit rate. - virtual void UpdateRates(uint32 new_bitrate) OVERRIDE; + virtual void UpdateRates(uint32 new_bitrate) override; // Set the next frame to be a key frame. - virtual void GenerateKeyFrame() OVERRIDE; + virtual void GenerateKeyFrame() override; - virtual void LatestFrameIdToReference(uint32 frame_id) OVERRIDE; + virtual void LatestFrameIdToReference(uint32 frame_id) override; private: enum Vp8Buffers { diff --git a/media/cast/test/cast_benchmarks.cc b/media/cast/test/cast_benchmarks.cc index 880f4ad..6e1f8f1 100644 --- a/media/cast/test/cast_benchmarks.cc +++ b/media/cast/test/cast_benchmarks.cc @@ -111,7 +111,7 @@ class CastTransportSenderWrapper : public CastTransportSender { virtual void InitializeAudio( const CastTransportRtpConfig& config, const RtcpCastMessageCallback& cast_message_cb, - const RtcpRttCallback& rtt_cb) OVERRIDE { + const RtcpRttCallback& rtt_cb) override { audio_ssrc_ = config.ssrc; transport_->InitializeAudio(config, cast_message_cb, rtt_cb); } @@ -119,13 +119,13 @@ class CastTransportSenderWrapper : public CastTransportSender { virtual void InitializeVideo( const CastTransportRtpConfig& config, const RtcpCastMessageCallback& cast_message_cb, - const RtcpRttCallback& rtt_cb) OVERRIDE { + const RtcpRttCallback& rtt_cb) override { video_ssrc_ = config.ssrc; transport_->InitializeVideo(config, cast_message_cb, rtt_cb); } virtual void InsertFrame(uint32 ssrc, - const EncodedFrame& frame) OVERRIDE { + const EncodedFrame& frame) override { if (ssrc == audio_ssrc_) { *encoded_audio_bytes_ += frame.data.size(); } else if (ssrc == video_ssrc_) { @@ -137,7 +137,7 @@ class CastTransportSenderWrapper : public CastTransportSender { virtual void SendSenderReport( uint32 ssrc, base::TimeTicks current_time, - uint32 current_time_as_rtp_timestamp) OVERRIDE { + uint32 current_time_as_rtp_timestamp) override { transport_->SendSenderReport(ssrc, current_time, current_time_as_rtp_timestamp); @@ -145,16 +145,16 @@ class CastTransportSenderWrapper : public CastTransportSender { virtual void CancelSendingFrames( uint32 ssrc, - const std::vector<uint32>& frame_ids) OVERRIDE { + const std::vector<uint32>& frame_ids) override { transport_->CancelSendingFrames(ssrc, frame_ids); } virtual void ResendFrameForKickstart(uint32 ssrc, - uint32 frame_id) OVERRIDE { + uint32 frame_id) override { transport_->ResendFrameForKickstart(ssrc, frame_id); } - virtual PacketReceiverCallback PacketReceiverForTesting() OVERRIDE { + virtual PacketReceiverCallback PacketReceiverForTesting() override { return transport_->PacketReceiverForTesting(); } diff --git a/media/cast/test/end2end_unittest.cc b/media/cast/test/end2end_unittest.cc index a80912a..6c19be7 100644 --- a/media/cast/test/end2end_unittest.cc +++ b/media/cast/test/end2end_unittest.cc @@ -174,7 +174,7 @@ class LoopBackPacketPipe : public test::PacketPipe { virtual ~LoopBackPacketPipe() {} // PacketPipe implementations. - virtual void Send(scoped_ptr<Packet> packet) OVERRIDE { + virtual void Send(scoped_ptr<Packet> packet) override { packet_receiver_.Run(packet.Pass()); } @@ -207,7 +207,7 @@ class LoopBackTransport : public PacketSender { } virtual bool SendPacket(PacketRef packet, - const base::Closure& cb) OVERRIDE { + const base::Closure& cb) override { DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN)); if (!send_packets_) return true; @@ -224,7 +224,7 @@ class LoopBackTransport : public PacketSender { return true; } - virtual int64 GetBytesSent() OVERRIDE { + virtual int64 GetBytesSent() override { return bytes_sent_; } @@ -638,7 +638,7 @@ class End2EndTest : public ::testing::Test { &event_subscriber_sender_); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { cast_sender_.reset(); cast_receiver_.reset(); task_runner_->RunTasks(); diff --git a/media/cast/test/fake_receiver_time_offset_estimator.h b/media/cast/test/fake_receiver_time_offset_estimator.h index 2a4d3cd..2b78c06 100644 --- a/media/cast/test/fake_receiver_time_offset_estimator.h +++ b/media/cast/test/fake_receiver_time_offset_estimator.h @@ -23,12 +23,12 @@ class FakeReceiverTimeOffsetEstimator : public ReceiverTimeOffsetEstimator { virtual ~FakeReceiverTimeOffsetEstimator(); // RawReventSubscriber implementations. - virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) OVERRIDE; - virtual void OnReceivePacketEvent(const PacketEvent& packet_event) OVERRIDE; + virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) override; + virtual void OnReceivePacketEvent(const PacketEvent& packet_event) override; // ReceiverTimeOffsetEstimator virtual bool GetReceiverOffsetBounds(base::TimeDelta* lower_bound, - base::TimeDelta* upper_bound) OVERRIDE; + base::TimeDelta* upper_bound) override; private: const base::TimeDelta offset_; diff --git a/media/cast/test/fake_single_thread_task_runner.h b/media/cast/test/fake_single_thread_task_runner.h index 779a897..8392e4a 100644 --- a/media/cast/test/fake_single_thread_task_runner.h +++ b/media/cast/test/fake_single_thread_task_runner.h @@ -30,15 +30,15 @@ class FakeSingleThreadTaskRunner : public base::SingleThreadTaskRunner { // base::SingleThreadTaskRunner implementation. virtual bool PostDelayedTask(const tracked_objects::Location& from_here, const base::Closure& task, - base::TimeDelta delay) OVERRIDE; + base::TimeDelta delay) override; - virtual bool RunsTasksOnCurrentThread() const OVERRIDE; + virtual bool RunsTasksOnCurrentThread() const override; // This function is currently not used, and will return false. virtual bool PostNonNestableDelayedTask( const tracked_objects::Location& from_here, const base::Closure& task, - base::TimeDelta delay) OVERRIDE; + base::TimeDelta delay) override; protected: virtual ~FakeSingleThreadTaskRunner(); diff --git a/media/cast/test/fake_video_encode_accelerator.h b/media/cast/test/fake_video_encode_accelerator.h index 740b8aa..01f3441 100644 --- a/media/cast/test/fake_video_encode_accelerator.h +++ b/media/cast/test/fake_video_encode_accelerator.h @@ -29,22 +29,22 @@ class FakeVideoEncodeAccelerator : public VideoEncodeAccelerator { virtual ~FakeVideoEncodeAccelerator(); virtual std::vector<VideoEncodeAccelerator::SupportedProfile> - GetSupportedProfiles() OVERRIDE; + GetSupportedProfiles() override; virtual bool Initialize(media::VideoFrame::Format input_format, const gfx::Size& input_visible_size, VideoCodecProfile output_profile, uint32 initial_bitrate, - Client* client) OVERRIDE; + Client* client) override; virtual void Encode(const scoped_refptr<VideoFrame>& frame, - bool force_keyframe) OVERRIDE; + bool force_keyframe) override; - virtual void UseOutputBitstreamBuffer(const BitstreamBuffer& buffer) OVERRIDE; + virtual void UseOutputBitstreamBuffer(const BitstreamBuffer& buffer) override; virtual void RequestEncodingParametersChange(uint32 bitrate, - uint32 framerate) OVERRIDE; + uint32 framerate) override; - virtual void Destroy() OVERRIDE; + virtual void Destroy() override; void SendDummyFrameForTesting(bool key_frame); void SetWillInitializationSucceed(bool will_initialization_succeed) { diff --git a/media/cast/test/loopback_transport.cc b/media/cast/test/loopback_transport.cc index bc19f01..f3fbd64 100644 --- a/media/cast/test/loopback_transport.cc +++ b/media/cast/test/loopback_transport.cc @@ -23,7 +23,7 @@ class LoopBackPacketPipe : public test::PacketPipe { virtual ~LoopBackPacketPipe() {} // PacketPipe implementations. - virtual void Send(scoped_ptr<Packet> packet) OVERRIDE { + virtual void Send(scoped_ptr<Packet> packet) override { packet_receiver_.Run(packet.Pass()); } diff --git a/media/cast/test/loopback_transport.h b/media/cast/test/loopback_transport.h index cf29fbb..64d99e6 100644 --- a/media/cast/test/loopback_transport.h +++ b/media/cast/test/loopback_transport.h @@ -30,9 +30,9 @@ class LoopBackTransport : public PacketSender { virtual ~LoopBackTransport(); virtual bool SendPacket(PacketRef packet, - const base::Closure& cb) OVERRIDE; + const base::Closure& cb) override; - virtual int64 GetBytesSent() OVERRIDE; + virtual int64 GetBytesSent() override; // Initiailize this loopback transport. // Establish a flow of packets from |pipe| to |packet_receiver|. diff --git a/media/cast/test/receiver.cc b/media/cast/test/receiver.cc index 019b02c..b83733a 100644 --- a/media/cast/test/receiver.cc +++ b/media/cast/test/receiver.cc @@ -204,7 +204,7 @@ class NaivePlayer : public InProcessReceiver, virtual ~NaivePlayer() {} - virtual void Start() OVERRIDE { + virtual void Start() override { AudioManager::Get()->GetTaskRunner()->PostTask( FROM_HERE, base::Bind(&NaivePlayer::StartAudioOutputOnAudioManagerThread, @@ -214,7 +214,7 @@ class NaivePlayer : public InProcessReceiver, InProcessReceiver::Start(); } - virtual void Stop() OVERRIDE { + virtual void Stop() override { // First, stop audio output to the Chromium audio stack. base::WaitableEvent done(false, false); DCHECK(!AudioManager::Get()->GetTaskRunner()->BelongsToCurrentThread()); @@ -267,7 +267,7 @@ class NaivePlayer : public InProcessReceiver, virtual void OnVideoFrame(const scoped_refptr<VideoFrame>& video_frame, const base::TimeTicks& playout_time, - bool is_continuous) OVERRIDE { + bool is_continuous) override { DCHECK(cast_env()->CurrentlyOn(CastEnvironment::MAIN)); LOG_IF(WARNING, !is_continuous) << "Video: Discontinuity in received frames."; @@ -284,7 +284,7 @@ class NaivePlayer : public InProcessReceiver, virtual void OnAudioFrame(scoped_ptr<AudioBus> audio_frame, const base::TimeTicks& playout_time, - bool is_continuous) OVERRIDE { + bool is_continuous) override { DCHECK(cast_env()->CurrentlyOn(CastEnvironment::MAIN)); LOG_IF(WARNING, !is_continuous) << "Audio: Discontinuity in received frames."; @@ -317,7 +317,7 @@ class NaivePlayer : public InProcessReceiver, // AudioSourceCallback implementation. virtual int OnMoreData(AudioBus* dest, uint32 total_bytes_delay) - OVERRIDE { + override { // Note: This method is being invoked by a separate thread unknown to us // (i.e., outside of CastEnvironment). @@ -377,7 +377,7 @@ class NaivePlayer : public InProcessReceiver, return dest->frames(); } - virtual void OnError(AudioOutputStream* stream) OVERRIDE { + virtual void OnError(AudioOutputStream* stream) override { LOG(ERROR) << "AudioOutputStream reports an error. " << "Playback is unlikely to continue."; } diff --git a/media/cast/test/skewed_single_thread_task_runner.h b/media/cast/test/skewed_single_thread_task_runner.h index 5ad2f8d..93fc6aa 100644 --- a/media/cast/test/skewed_single_thread_task_runner.h +++ b/media/cast/test/skewed_single_thread_task_runner.h @@ -31,15 +31,15 @@ class SkewedSingleThreadTaskRunner : public base::SingleThreadTaskRunner { // base::SingleThreadTaskRunner implementation. virtual bool PostDelayedTask(const tracked_objects::Location& from_here, const base::Closure& task, - base::TimeDelta delay) OVERRIDE; + base::TimeDelta delay) override; - virtual bool RunsTasksOnCurrentThread() const OVERRIDE; + virtual bool RunsTasksOnCurrentThread() const override; // This function is currently not used, and will return false. virtual bool PostNonNestableDelayedTask( const tracked_objects::Location& from_here, const base::Closure& task, - base::TimeDelta delay) OVERRIDE; + base::TimeDelta delay) override; protected: virtual ~SkewedSingleThreadTaskRunner(); diff --git a/media/cast/test/skewed_tick_clock.h b/media/cast/test/skewed_tick_clock.h index dcb5384..3d5580f 100644 --- a/media/cast/test/skewed_tick_clock.h +++ b/media/cast/test/skewed_tick_clock.h @@ -25,7 +25,7 @@ class SkewedTickClock : public base::TickClock { // jump forwards or backwards, only changing the offset will // do that. void SetSkew(double skew, base::TimeDelta offset); - virtual base::TimeTicks NowTicks() OVERRIDE; + virtual base::TimeTicks NowTicks() override; private: base::TimeTicks SkewTicks(base::TimeTicks now); diff --git a/media/cast/test/utility/tap_proxy.cc b/media/cast/test/utility/tap_proxy.cc index 7827bf9..0546874 100644 --- a/media/cast/test/utility/tap_proxy.cc +++ b/media/cast/test/utility/tap_proxy.cc @@ -41,7 +41,7 @@ class SendToFDPipe : public PacketPipe { public: explicit SendToFDPipe(int fd) : fd_(fd) { } - virtual void Send(scoped_ptr<Packet> packet) OVERRIDE { + virtual void Send(scoped_ptr<Packet> packet) override { while (1) { int written = write( fd_, @@ -89,7 +89,7 @@ class QueueManager : public base::MessageLoopForIO::Watcher { } // MessageLoopForIO::Watcher methods - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE { + virtual void OnFileCanReadWithoutBlocking(int fd) override { scoped_ptr<Packet> packet(new Packet(kMaxPacketSize)); int nread = read(input_fd_, reinterpret_cast<char*>(&packet->front()), @@ -103,7 +103,7 @@ class QueueManager : public base::MessageLoopForIO::Watcher { packet->resize(nread); packet_pipe_->Send(packet.Pass()); } - virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE { + virtual void OnFileCanWriteWithoutBlocking(int fd) override { NOTREACHED(); } @@ -173,7 +173,7 @@ class ByteCounterPipe : public media::cast::test::PacketPipe { public: ByteCounterPipe(ByteCounter* counter) : counter_(counter) {} virtual void Send(scoped_ptr<media::cast::Packet> packet) - OVERRIDE { + override { counter_->Increment(packet->size()); pipe_->Send(packet.Pass()); } diff --git a/media/cast/test/utility/udp_proxy.cc b/media/cast/test/utility/udp_proxy.cc index 95640a3..b5a4a4e 100644 --- a/media/cast/test/utility/udp_proxy.cc +++ b/media/cast/test/utility/udp_proxy.cc @@ -56,7 +56,7 @@ class Buffer : public PacketPipe { CHECK_GT(max_megabits_per_second, 0); } - virtual void Send(scoped_ptr<Packet> packet) OVERRIDE { + virtual void Send(scoped_ptr<Packet> packet) override { if (packet->size() + buffer_size_ <= max_buffer_size_) { buffer_size_ += packet->size(); buffer_.push_back(linked_ptr<Packet>(packet.release())); @@ -116,7 +116,7 @@ class RandomDrop : public PacketPipe { RandomDrop(double drop_fraction) : drop_fraction_(static_cast<int>(drop_fraction * RAND_MAX)) {} - virtual void Send(scoped_ptr<Packet> packet) OVERRIDE { + virtual void Send(scoped_ptr<Packet> packet) override { if (rand() > drop_fraction_) { pipe_->Send(packet.Pass()); } @@ -135,7 +135,7 @@ class SimpleDelayBase : public PacketPipe { SimpleDelayBase() : weak_factory_(this) {} virtual ~SimpleDelayBase() {} - virtual void Send(scoped_ptr<Packet> packet) OVERRIDE { + virtual void Send(scoped_ptr<Packet> packet) override { double seconds = GetDelay(); task_runner_->PostDelayedTask( FROM_HERE, @@ -158,7 +158,7 @@ class SimpleDelayBase : public PacketPipe { class ConstantDelay : public SimpleDelayBase { public: ConstantDelay(double delay_seconds) : delay_seconds_(delay_seconds) {} - virtual double GetDelay() OVERRIDE { + virtual double GetDelay() override { return delay_seconds_; } @@ -174,7 +174,7 @@ class RandomUnsortedDelay : public SimpleDelayBase { public: RandomUnsortedDelay(double random_delay) : random_delay_(random_delay) {} - virtual double GetDelay() OVERRIDE { + virtual double GetDelay() override { return random_delay_ * base::RandDouble(); } @@ -193,11 +193,11 @@ class DuplicateAndDelay : public RandomUnsortedDelay { RandomUnsortedDelay(random_delay), delay_min_(delay_min) { } - virtual void Send(scoped_ptr<Packet> packet) OVERRIDE { + virtual void Send(scoped_ptr<Packet> packet) override { pipe_->Send(scoped_ptr<Packet>(new Packet(*packet.get()))); RandomUnsortedDelay::Send(packet.Pass()); } - virtual double GetDelay() OVERRIDE { + virtual double GetDelay() override { return RandomUnsortedDelay::GetDelay() + delay_min_; } private: @@ -220,7 +220,7 @@ class RandomSortedDelay : public PacketPipe { seconds_between_extra_delay_(seconds_between_extra_delay), weak_factory_(this) {} - virtual void Send(scoped_ptr<Packet> packet) OVERRIDE { + virtual void Send(scoped_ptr<Packet> packet) override { buffer_.push_back(linked_ptr<Packet>(packet.release())); if (buffer_.size() == 1) { next_send_ = std::max( @@ -232,7 +232,7 @@ class RandomSortedDelay : public PacketPipe { } virtual void InitOnIOThread( const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, - base::TickClock* clock) OVERRIDE { + base::TickClock* clock) override { PacketPipe::InitOnIOThread(task_runner, clock); // As we start the stream, assume that we are in a random // place between two extra delays, thus multiplier = 1.0; @@ -311,12 +311,12 @@ class NetworkGlitchPipe : public PacketPipe { virtual void InitOnIOThread( const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, - base::TickClock* clock) OVERRIDE { + base::TickClock* clock) override { PacketPipe::InitOnIOThread(task_runner, clock); Flip(); } - virtual void Send(scoped_ptr<Packet> packet) OVERRIDE { + virtual void Send(scoped_ptr<Packet> packet) override { if (works_) { pipe_->Send(packet.Pass()); } @@ -360,7 +360,7 @@ class InterruptedPoissonProcess::InternalBuffer : public PacketPipe { weak_factory_(this) { } - virtual void Send(scoped_ptr<Packet> packet) OVERRIDE { + virtual void Send(scoped_ptr<Packet> packet) override { // Drop if buffer is full. if (stored_size_ >= stored_limit_) return; @@ -372,7 +372,7 @@ class InterruptedPoissonProcess::InternalBuffer : public PacketPipe { virtual void InitOnIOThread( const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, - base::TickClock* clock) OVERRIDE { + base::TickClock* clock) override { clock_ = clock; if (ipp_) ipp_->InitOnIOThread(task_runner, clock); @@ -552,8 +552,8 @@ class PacketSender : public PacketPipe { public: PacketSender(UDPProxyImpl* udp_proxy, const net::IPEndPoint* destination) : udp_proxy_(udp_proxy), destination_(destination) {} - virtual void Send(scoped_ptr<Packet> packet) OVERRIDE; - virtual void AppendToPipe(scoped_ptr<PacketPipe> pipe) OVERRIDE { + virtual void Send(scoped_ptr<Packet> packet) override; + virtual void AppendToPipe(scoped_ptr<PacketPipe> pipe) override { NOTREACHED(); } diff --git a/media/cast/test/utility/udp_proxy_main.cc b/media/cast/test/utility/udp_proxy_main.cc index 9dd047a..425d2e3 100644 --- a/media/cast/test/utility/udp_proxy_main.cc +++ b/media/cast/test/utility/udp_proxy_main.cc @@ -69,7 +69,7 @@ class ByteCounterPipe : public media::cast::test::PacketPipe { public: ByteCounterPipe(ByteCounter* counter) : counter_(counter) {} virtual void Send(scoped_ptr<media::cast::Packet> packet) - OVERRIDE { + override { counter_->Increment(packet->size()); pipe_->Send(packet.Pass()); } diff --git a/media/cdm/aes_decryptor.h b/media/cdm/aes_decryptor.h index 98a79dd..306ceb9 100644 --- a/media/cdm/aes_decryptor.h +++ b/media/cdm/aes_decryptor.h @@ -36,45 +36,45 @@ class MEDIA_EXPORT AesDecryptor : public MediaKeys, public Decryptor { virtual void SetServerCertificate( const uint8* certificate_data, int certificate_data_length, - scoped_ptr<SimpleCdmPromise> promise) OVERRIDE; + scoped_ptr<SimpleCdmPromise> promise) override; virtual void CreateSession(const std::string& init_data_type, const uint8* init_data, int init_data_length, SessionType session_type, - scoped_ptr<NewSessionCdmPromise> promise) OVERRIDE; + scoped_ptr<NewSessionCdmPromise> promise) override; virtual void LoadSession(const std::string& web_session_id, - scoped_ptr<NewSessionCdmPromise> promise) OVERRIDE; + scoped_ptr<NewSessionCdmPromise> promise) override; virtual void UpdateSession(const std::string& web_session_id, const uint8* response, int response_length, - scoped_ptr<SimpleCdmPromise> promise) OVERRIDE; + scoped_ptr<SimpleCdmPromise> promise) override; virtual void CloseSession(const std::string& web_session_id, - scoped_ptr<SimpleCdmPromise> promise) OVERRIDE; + scoped_ptr<SimpleCdmPromise> promise) override; virtual void RemoveSession(const std::string& web_session_id, - scoped_ptr<SimpleCdmPromise> promise) OVERRIDE; + scoped_ptr<SimpleCdmPromise> promise) override; virtual void GetUsableKeyIds(const std::string& web_session_id, - scoped_ptr<KeyIdsPromise> promise) OVERRIDE; - virtual Decryptor* GetDecryptor() OVERRIDE; + scoped_ptr<KeyIdsPromise> promise) override; + virtual Decryptor* GetDecryptor() override; // Decryptor implementation. virtual void RegisterNewKeyCB(StreamType stream_type, - const NewKeyCB& key_added_cb) OVERRIDE; + const NewKeyCB& key_added_cb) override; virtual void Decrypt(StreamType stream_type, const scoped_refptr<DecoderBuffer>& encrypted, - const DecryptCB& decrypt_cb) OVERRIDE; - virtual void CancelDecrypt(StreamType stream_type) OVERRIDE; + const DecryptCB& decrypt_cb) override; + virtual void CancelDecrypt(StreamType stream_type) override; virtual void InitializeAudioDecoder(const AudioDecoderConfig& config, - const DecoderInitCB& init_cb) OVERRIDE; + const DecoderInitCB& init_cb) override; virtual void InitializeVideoDecoder(const VideoDecoderConfig& config, - const DecoderInitCB& init_cb) OVERRIDE; + const DecoderInitCB& init_cb) override; virtual void DecryptAndDecodeAudio( const scoped_refptr<DecoderBuffer>& encrypted, - const AudioDecodeCB& audio_decode_cb) OVERRIDE; + const AudioDecodeCB& audio_decode_cb) override; virtual void DecryptAndDecodeVideo( const scoped_refptr<DecoderBuffer>& encrypted, - const VideoDecodeCB& video_decode_cb) OVERRIDE; - virtual void ResetDecoder(StreamType stream_type) OVERRIDE; - virtual void DeinitializeDecoder(StreamType stream_type) OVERRIDE; + const VideoDecodeCB& video_decode_cb) override; + virtual void ResetDecoder(StreamType stream_type) override; + virtual void DeinitializeDecoder(StreamType stream_type) override; private: // TODO(fgalligan): Remove this and change KeyMap to use crypto::SymmetricKey diff --git a/media/cdm/player_tracker_impl.h b/media/cdm/player_tracker_impl.h index bcbeaf8c..768f5a6 100644 --- a/media/cdm/player_tracker_impl.h +++ b/media/cdm/player_tracker_impl.h @@ -25,8 +25,8 @@ class MEDIA_EXPORT PlayerTrackerImpl : public PlayerTracker { // PlayerTracker implementation. virtual int RegisterPlayer(const base::Closure& new_key_cb, - const base::Closure& cdm_unset_cb) OVERRIDE; - virtual void UnregisterPlayer(int registration_id) OVERRIDE; + const base::Closure& cdm_unset_cb) override; + virtual void UnregisterPlayer(int registration_id) override; // Helpers methods to fire registered callbacks. void NotifyNewKey(); diff --git a/media/cdm/ppapi/cdm_adapter.h b/media/cdm/ppapi/cdm_adapter.h index 98d38d3..ed06261 100644 --- a/media/cdm/ppapi/cdm_adapter.h +++ b/media/cdm/ppapi/cdm_adapter.h @@ -51,112 +51,112 @@ class CdmAdapter : public pp::Instance, // PPP_ContentDecryptor_Private implementation. // Note: Results of calls to these methods must be reported through the // PPB_ContentDecryptor_Private interface. - virtual void Initialize(const std::string& key_system) OVERRIDE; + virtual void Initialize(const std::string& key_system) override; virtual void SetServerCertificate( uint32_t promise_id, - pp::VarArrayBuffer server_certificate) OVERRIDE; + pp::VarArrayBuffer server_certificate) override; virtual void CreateSession(uint32_t promise_id, const std::string& init_data_type, pp::VarArrayBuffer init_data, - PP_SessionType session_type) OVERRIDE; + PP_SessionType session_type) override; virtual void LoadSession(uint32_t promise_id, - const std::string& web_session_id) OVERRIDE; + const std::string& web_session_id) override; virtual void UpdateSession(uint32_t promise_id, const std::string& web_session_id, - pp::VarArrayBuffer response) OVERRIDE; + pp::VarArrayBuffer response) override; virtual void CloseSession(uint32_t promise_id, const std::string& web_session_id); virtual void RemoveSession(uint32_t promise_id, - const std::string& web_session_id) OVERRIDE; + const std::string& web_session_id) override; virtual void GetUsableKeyIds(uint32_t promise_id, - const std::string& web_session_id) OVERRIDE; + const std::string& web_session_id) override; virtual void Decrypt( pp::Buffer_Dev encrypted_buffer, - const PP_EncryptedBlockInfo& encrypted_block_info) OVERRIDE; + const PP_EncryptedBlockInfo& encrypted_block_info) override; virtual void InitializeAudioDecoder( const PP_AudioDecoderConfig& decoder_config, - pp::Buffer_Dev extra_data_buffer) OVERRIDE; + pp::Buffer_Dev extra_data_buffer) override; virtual void InitializeVideoDecoder( const PP_VideoDecoderConfig& decoder_config, - pp::Buffer_Dev extra_data_buffer) OVERRIDE; + pp::Buffer_Dev extra_data_buffer) override; virtual void DeinitializeDecoder(PP_DecryptorStreamType decoder_type, - uint32_t request_id) OVERRIDE; + uint32_t request_id) override; virtual void ResetDecoder(PP_DecryptorStreamType decoder_type, - uint32_t request_id) OVERRIDE; + uint32_t request_id) override; virtual void DecryptAndDecode( PP_DecryptorStreamType decoder_type, pp::Buffer_Dev encrypted_buffer, - const PP_EncryptedBlockInfo& encrypted_block_info) OVERRIDE; + const PP_EncryptedBlockInfo& encrypted_block_info) override; // cdm::Host_4 and cdm::Host_6 implementation. - virtual cdm::Buffer* Allocate(uint32_t capacity) OVERRIDE; - virtual void SetTimer(int64_t delay_ms, void* context) OVERRIDE; + virtual cdm::Buffer* Allocate(uint32_t capacity) override; + virtual void SetTimer(int64_t delay_ms, void* context) override; // cdm::Host_4 implementation. - virtual double GetCurrentWallTimeInSeconds() OVERRIDE; + virtual double GetCurrentWallTimeInSeconds() override; virtual void OnSessionCreated(uint32_t session_id, const char* web_session_id, - uint32_t web_session_id_length) OVERRIDE; + uint32_t web_session_id_length) override; virtual void OnSessionMessage(uint32_t session_id, const char* message, uint32_t message_length, const char* destination_url, - uint32_t destination_url_length) OVERRIDE; - virtual void OnSessionReady(uint32_t session_id) OVERRIDE; - virtual void OnSessionClosed(uint32_t session_id) OVERRIDE; + uint32_t destination_url_length) override; + virtual void OnSessionReady(uint32_t session_id) override; + virtual void OnSessionClosed(uint32_t session_id) override; virtual void OnSessionError(uint32_t session_id, cdm::MediaKeyError error_code, - uint32_t system_code) OVERRIDE; + uint32_t system_code) override; // cdm::Host_6 implementation. - virtual cdm::Time GetCurrentWallTime() OVERRIDE; + virtual cdm::Time GetCurrentWallTime() override; virtual void OnResolveNewSessionPromise( uint32_t promise_id, const char* web_session_id, - uint32_t web_session_id_length) OVERRIDE; - virtual void OnResolvePromise(uint32_t promise_id) OVERRIDE; + uint32_t web_session_id_length) override; + virtual void OnResolvePromise(uint32_t promise_id) override; virtual void OnResolveKeyIdsPromise(uint32_t promise_id, const cdm::BinaryData* usable_key_ids, - uint32_t usable_key_ids_length) OVERRIDE; + uint32_t usable_key_ids_length) override; virtual void OnRejectPromise(uint32_t promise_id, cdm::Error error, uint32_t system_code, const char* error_message, - uint32_t error_message_length) OVERRIDE; + uint32_t error_message_length) override; virtual void OnSessionMessage(const char* web_session_id, uint32_t web_session_id_length, const char* message, uint32_t message_length, const char* destination_url, - uint32_t destination_url_length) OVERRIDE; + uint32_t destination_url_length) override; virtual void OnSessionUsableKeysChange( const char* web_session_id, uint32_t web_session_id_length, - bool has_additional_usable_key) OVERRIDE; + bool has_additional_usable_key) override; virtual void OnExpirationChange(const char* web_session_id, uint32_t web_session_id_length, - cdm::Time new_expiry_time) OVERRIDE; + cdm::Time new_expiry_time) override; virtual void OnSessionClosed(const char* web_session_id, - uint32_t web_session_id_length) OVERRIDE; + uint32_t web_session_id_length) override; virtual void OnSessionError(const char* web_session_id, uint32_t web_session_id_length, cdm::Error error, uint32_t system_code, const char* error_message, - uint32_t error_message_length) OVERRIDE; + uint32_t error_message_length) override; // cdm::Host_4 and cdm::Host_6 implementation. virtual void SendPlatformChallenge(const char* service_id, uint32_t service_id_length, const char* challenge, - uint32_t challenge_length) OVERRIDE; + uint32_t challenge_length) override; virtual void EnableOutputProtection( - uint32_t desired_protection_mask) OVERRIDE; - virtual void QueryOutputProtectionStatus() OVERRIDE; + uint32_t desired_protection_mask) override; + virtual void QueryOutputProtectionStatus() override; virtual void OnDeferredInitializationDone( cdm::StreamType stream_type, - cdm::Status decoder_status) OVERRIDE; - virtual cdm::FileIO* CreateFileIO(cdm::FileIOClient* client) OVERRIDE; + cdm::Status decoder_status) override; + virtual cdm::FileIO* CreateFileIO(cdm::FileIOClient* client) override; private: // These are reported to UMA server. Do not change the existing values! diff --git a/media/cdm/ppapi/cdm_file_io_impl.h b/media/cdm/ppapi/cdm_file_io_impl.h index 0957758..d885f1c 100644 --- a/media/cdm/ppapi/cdm_file_io_impl.h +++ b/media/cdm/ppapi/cdm_file_io_impl.h @@ -54,10 +54,10 @@ class CdmFileIOImpl : public cdm::FileIO { const pp::CompletionCallback& first_file_read_cb); // cdm::FileIO implementation. - virtual void Open(const char* file_name, uint32_t file_name_size) OVERRIDE; - virtual void Read() OVERRIDE; - virtual void Write(const uint8_t* data, uint32_t data_size) OVERRIDE; - virtual void Close() OVERRIDE; + virtual void Open(const char* file_name, uint32_t file_name_size) override; + virtual void Read() override; + virtual void Write(const uint8_t* data, uint32_t data_size) override; + virtual void Close() override; private: // TODO(xhwang): Introduce more detailed states for UMA logging if needed. diff --git a/media/cdm/ppapi/cdm_file_io_test.h b/media/cdm/ppapi/cdm_file_io_test.h index 3e0060c..189c1f6 100644 --- a/media/cdm/ppapi/cdm_file_io_test.h +++ b/media/cdm/ppapi/cdm_file_io_test.h @@ -96,11 +96,11 @@ class FileIOTest : public cdm::FileIOClient { static bool MatchesResult(const TestStep& a, const TestStep& b); // cdm::FileIOClient implementation. - virtual void OnOpenComplete(Status status) OVERRIDE; + virtual void OnOpenComplete(Status status) override; virtual void OnReadComplete(Status status, const uint8_t* data, - uint32_t data_size) OVERRIDE; - virtual void OnWriteComplete(Status status) OVERRIDE; + uint32_t data_size) override; + virtual void OnWriteComplete(Status status) override; // Runs the next step in this test case. void RunNextStep(); diff --git a/media/cdm/ppapi/cdm_helpers.h b/media/cdm/ppapi/cdm_helpers.h index 1ee579b..48d4bc5 100644 --- a/media/cdm/ppapi/cdm_helpers.h +++ b/media/cdm/ppapi/cdm_helpers.h @@ -33,11 +33,11 @@ class PpbBuffer : public cdm::Buffer { PpbBufferAllocator* allocator); // cdm::Buffer implementation. - virtual void Destroy() OVERRIDE; - virtual uint32_t Capacity() const OVERRIDE; - virtual uint8_t* Data() OVERRIDE; - virtual void SetSize(uint32_t size) OVERRIDE; - virtual uint32_t Size() const OVERRIDE { return size_; } + virtual void Destroy() override; + virtual uint32_t Capacity() const override; + virtual uint8_t* Data() override; + virtual void SetSize(uint32_t size) override; + virtual uint32_t Size() const override { return size_; } // Takes the |buffer_| from this class and returns it. // Note: The caller must ensure |allocator->Release()| is called later so that @@ -97,15 +97,15 @@ class DecryptedBlockImpl : public cdm::DecryptedBlock { DecryptedBlockImpl() : buffer_(NULL), timestamp_(0) {} virtual ~DecryptedBlockImpl() { if (buffer_) buffer_->Destroy(); } - virtual void SetDecryptedBuffer(cdm::Buffer* buffer) OVERRIDE { + virtual void SetDecryptedBuffer(cdm::Buffer* buffer) override { buffer_ = static_cast<PpbBuffer*>(buffer); } - virtual cdm::Buffer* DecryptedBuffer() OVERRIDE { return buffer_; } + virtual cdm::Buffer* DecryptedBuffer() override { return buffer_; } - virtual void SetTimestamp(int64_t timestamp) OVERRIDE { + virtual void SetTimestamp(int64_t timestamp) override { timestamp_ = timestamp; } - virtual int64_t Timestamp() const OVERRIDE { return timestamp_; } + virtual int64_t Timestamp() const override { return timestamp_; } private: PpbBuffer* buffer_; @@ -119,42 +119,42 @@ class VideoFrameImpl : public cdm::VideoFrame { VideoFrameImpl(); virtual ~VideoFrameImpl(); - virtual void SetFormat(cdm::VideoFormat format) OVERRIDE { + virtual void SetFormat(cdm::VideoFormat format) override { format_ = format; } - virtual cdm::VideoFormat Format() const OVERRIDE { return format_; } + virtual cdm::VideoFormat Format() const override { return format_; } - virtual void SetSize(cdm::Size size) OVERRIDE { size_ = size; } - virtual cdm::Size Size() const OVERRIDE { return size_; } + virtual void SetSize(cdm::Size size) override { size_ = size; } + virtual cdm::Size Size() const override { return size_; } - virtual void SetFrameBuffer(cdm::Buffer* frame_buffer) OVERRIDE { + virtual void SetFrameBuffer(cdm::Buffer* frame_buffer) override { frame_buffer_ = static_cast<PpbBuffer*>(frame_buffer); } - virtual cdm::Buffer* FrameBuffer() OVERRIDE { return frame_buffer_; } + virtual cdm::Buffer* FrameBuffer() override { return frame_buffer_; } virtual void SetPlaneOffset(cdm::VideoFrame::VideoPlane plane, - uint32_t offset) OVERRIDE { + uint32_t offset) override { PP_DCHECK(plane < kMaxPlanes); plane_offsets_[plane] = offset; } - virtual uint32_t PlaneOffset(VideoPlane plane) OVERRIDE { + virtual uint32_t PlaneOffset(VideoPlane plane) override { PP_DCHECK(plane < kMaxPlanes); return plane_offsets_[plane]; } - virtual void SetStride(VideoPlane plane, uint32_t stride) OVERRIDE { + virtual void SetStride(VideoPlane plane, uint32_t stride) override { PP_DCHECK(plane < kMaxPlanes); strides_[plane] = stride; } - virtual uint32_t Stride(VideoPlane plane) OVERRIDE { + virtual uint32_t Stride(VideoPlane plane) override { PP_DCHECK(plane < kMaxPlanes); return strides_[plane]; } - virtual void SetTimestamp(int64_t timestamp) OVERRIDE { + virtual void SetTimestamp(int64_t timestamp) override { timestamp_ = timestamp; } - virtual int64_t Timestamp() const OVERRIDE { return timestamp_; } + virtual int64_t Timestamp() const override { return timestamp_; } private: // The video buffer format. @@ -189,16 +189,16 @@ class AudioFramesImpl : public cdm::AudioFrames_2 { } // AudioFrames implementation. - virtual void SetFrameBuffer(cdm::Buffer* buffer) OVERRIDE { + virtual void SetFrameBuffer(cdm::Buffer* buffer) override { buffer_ = static_cast<PpbBuffer*>(buffer); } - virtual cdm::Buffer* FrameBuffer() OVERRIDE { + virtual cdm::Buffer* FrameBuffer() override { return buffer_; } - virtual void SetFormat(cdm::AudioFormat format) OVERRIDE { + virtual void SetFormat(cdm::AudioFormat format) override { format_ = format; } - virtual cdm::AudioFormat Format() const OVERRIDE { + virtual cdm::AudioFormat Format() const override { return format_; } diff --git a/media/cdm/ppapi/cdm_wrapper.h b/media/cdm/ppapi/cdm_wrapper.h index 9e648b5..7d05a44 100644 --- a/media/cdm/ppapi/cdm_wrapper.h +++ b/media/cdm/ppapi/cdm_wrapper.h @@ -182,7 +182,7 @@ class CdmWrapperImpl : public CdmWrapper { virtual bool SetServerCertificate( uint32_t promise_id, const uint8_t* server_certificate_data, - uint32_t server_certificate_data_size) OVERRIDE { + uint32_t server_certificate_data_size) override { cdm_->SetServerCertificate( promise_id, server_certificate_data, server_certificate_data_size); return true; @@ -193,7 +193,7 @@ class CdmWrapperImpl : public CdmWrapper { uint32_t init_data_type_size, const uint8_t* init_data, uint32_t init_data_size, - cdm::SessionType session_type) OVERRIDE { + cdm::SessionType session_type) override { // TODO(jrummell): Remove this code once |session_type| is passed through // Pepper. When removing, add the header back in for CDM4. PP_DCHECK(session_type == cdm::kTemporary); @@ -218,7 +218,7 @@ class CdmWrapperImpl : public CdmWrapper { virtual void LoadSession(uint32_t promise_id, const char* web_session_id, - uint32_t web_session_id_size) OVERRIDE { + uint32_t web_session_id_size) override { cdm_->LoadSession(promise_id, web_session_id, web_session_id_size); } @@ -226,7 +226,7 @@ class CdmWrapperImpl : public CdmWrapper { const char* web_session_id, uint32_t web_session_id_size, const uint8_t* response, - uint32_t response_size) OVERRIDE { + uint32_t response_size) override { cdm_->UpdateSession(promise_id, web_session_id, web_session_id_size, @@ -236,71 +236,71 @@ class CdmWrapperImpl : public CdmWrapper { virtual bool CloseSession(uint32_t promise_id, const char* web_session_id, - uint32_t web_session_id_size) OVERRIDE { + uint32_t web_session_id_size) override { cdm_->CloseSession(promise_id, web_session_id, web_session_id_size); return true; } virtual void RemoveSession(uint32_t promise_id, const char* web_session_id, - uint32_t web_session_id_size) OVERRIDE { + uint32_t web_session_id_size) override { cdm_->RemoveSession(promise_id, web_session_id, web_session_id_size); } virtual bool GetUsableKeyIds(uint32_t promise_id, const char* web_session_id, - uint32_t web_session_id_size) OVERRIDE { + uint32_t web_session_id_size) override { cdm_->GetUsableKeyIds(promise_id, web_session_id, web_session_id_size); return true; } - virtual void TimerExpired(void* context) OVERRIDE { + virtual void TimerExpired(void* context) override { cdm_->TimerExpired(context); } virtual cdm::Status Decrypt(const cdm::InputBuffer& encrypted_buffer, - cdm::DecryptedBlock* decrypted_buffer) OVERRIDE { + cdm::DecryptedBlock* decrypted_buffer) override { return cdm_->Decrypt(encrypted_buffer, decrypted_buffer); } virtual cdm::Status InitializeAudioDecoder( - const cdm::AudioDecoderConfig& audio_decoder_config) OVERRIDE { + const cdm::AudioDecoderConfig& audio_decoder_config) override { return cdm_->InitializeAudioDecoder(audio_decoder_config); } virtual cdm::Status InitializeVideoDecoder( - const cdm::VideoDecoderConfig& video_decoder_config) OVERRIDE { + const cdm::VideoDecoderConfig& video_decoder_config) override { return cdm_->InitializeVideoDecoder(video_decoder_config); } - virtual void DeinitializeDecoder(cdm::StreamType decoder_type) OVERRIDE { + virtual void DeinitializeDecoder(cdm::StreamType decoder_type) override { cdm_->DeinitializeDecoder(decoder_type); } - virtual void ResetDecoder(cdm::StreamType decoder_type) OVERRIDE { + virtual void ResetDecoder(cdm::StreamType decoder_type) override { cdm_->ResetDecoder(decoder_type); } virtual cdm::Status DecryptAndDecodeFrame( const cdm::InputBuffer& encrypted_buffer, - cdm::VideoFrame* video_frame) OVERRIDE { + cdm::VideoFrame* video_frame) override { return cdm_->DecryptAndDecodeFrame(encrypted_buffer, video_frame); } virtual cdm::Status DecryptAndDecodeSamples( const cdm::InputBuffer& encrypted_buffer, - cdm::AudioFrames* audio_frames) OVERRIDE { + cdm::AudioFrames* audio_frames) override { return cdm_->DecryptAndDecodeSamples(encrypted_buffer, audio_frames); } virtual void OnPlatformChallengeResponse( - const cdm::PlatformChallengeResponse& response) OVERRIDE { + const cdm::PlatformChallengeResponse& response) override { cdm_->OnPlatformChallengeResponse(response); } virtual void OnQueryOutputProtectionStatus( uint32_t link_mask, - uint32_t output_protection_mask) OVERRIDE { + uint32_t output_protection_mask) override { cdm_->OnQueryOutputProtectionStatus(link_mask, output_protection_mask); } diff --git a/media/cdm/ppapi/external_clear_key/clear_key_cdm.h b/media/cdm/ppapi/external_clear_key/clear_key_cdm.h index 19d41f8..f75dcc5 100644 --- a/media/cdm/ppapi/external_clear_key/clear_key_cdm.h +++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.h @@ -40,48 +40,48 @@ class ClearKeyCdm : public ClearKeyCdmInterface { uint32 init_data_type_size, const uint8* init_data, uint32 init_data_size, - cdm::SessionType session_type) OVERRIDE; + cdm::SessionType session_type) override; virtual void LoadSession(uint32 promise_id, const char* web_session_id, - uint32_t web_session_id_length) OVERRIDE; + uint32_t web_session_id_length) override; virtual void UpdateSession(uint32 promise_id, const char* web_session_id, uint32_t web_session_id_length, const uint8* response, - uint32 response_size) OVERRIDE; + uint32 response_size) override; virtual void CloseSession(uint32 promise_id, const char* web_session_id, - uint32_t web_session_id_length) OVERRIDE; + uint32_t web_session_id_length) override; virtual void RemoveSession(uint32 promise_id, const char* web_session_id, - uint32_t web_session_id_length) OVERRIDE; + uint32_t web_session_id_length) override; virtual void GetUsableKeyIds(uint32_t promise_id, const char* web_session_id, - uint32_t web_session_id_length) OVERRIDE; + uint32_t web_session_id_length) override; virtual void SetServerCertificate( uint32 promise_id, const uint8_t* server_certificate_data, - uint32_t server_certificate_data_size) OVERRIDE; - virtual void TimerExpired(void* context) OVERRIDE; + uint32_t server_certificate_data_size) override; + virtual void TimerExpired(void* context) override; virtual cdm::Status Decrypt(const cdm::InputBuffer& encrypted_buffer, - cdm::DecryptedBlock* decrypted_block) OVERRIDE; + cdm::DecryptedBlock* decrypted_block) override; virtual cdm::Status InitializeAudioDecoder( - const cdm::AudioDecoderConfig& audio_decoder_config) OVERRIDE; + const cdm::AudioDecoderConfig& audio_decoder_config) override; virtual cdm::Status InitializeVideoDecoder( - const cdm::VideoDecoderConfig& video_decoder_config) OVERRIDE; - virtual void DeinitializeDecoder(cdm::StreamType decoder_type) OVERRIDE; - virtual void ResetDecoder(cdm::StreamType decoder_type) OVERRIDE; + const cdm::VideoDecoderConfig& video_decoder_config) override; + virtual void DeinitializeDecoder(cdm::StreamType decoder_type) override; + virtual void ResetDecoder(cdm::StreamType decoder_type) override; virtual cdm::Status DecryptAndDecodeFrame( const cdm::InputBuffer& encrypted_buffer, - cdm::VideoFrame* video_frame) OVERRIDE; + cdm::VideoFrame* video_frame) override; virtual cdm::Status DecryptAndDecodeSamples( const cdm::InputBuffer& encrypted_buffer, - cdm::AudioFrames* audio_frames) OVERRIDE; - virtual void Destroy() OVERRIDE; + cdm::AudioFrames* audio_frames) override; + virtual void Destroy() override; virtual void OnPlatformChallengeResponse( - const cdm::PlatformChallengeResponse& response) OVERRIDE; + const cdm::PlatformChallengeResponse& response) override; virtual void OnQueryOutputProtectionStatus( - uint32_t link_mask, uint32_t output_protection_mask) OVERRIDE; + uint32_t link_mask, uint32_t output_protection_mask) override; private: // Emulates a session stored for |session_id_for_emulated_loadsession_|. This diff --git a/media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h b/media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h index 57469d1..6bc5e32 100644 --- a/media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h +++ b/media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h @@ -18,14 +18,14 @@ class FakeCdmVideoDecoder : public CdmVideoDecoder { virtual ~FakeCdmVideoDecoder(); // CdmVideoDecoder implementation. - virtual bool Initialize(const cdm::VideoDecoderConfig& config) OVERRIDE; - virtual void Deinitialize() OVERRIDE; - virtual void Reset() OVERRIDE; + virtual bool Initialize(const cdm::VideoDecoderConfig& config) override; + virtual void Deinitialize() override; + virtual void Reset() override; virtual cdm::Status DecodeFrame(const uint8_t* compressed_frame, int32_t compressed_frame_size, int64_t timestamp, - cdm::VideoFrame* decoded_frame) OVERRIDE; - virtual bool is_initialized() const OVERRIDE { return is_initialized_; } + cdm::VideoFrame* decoded_frame) override; + virtual bool is_initialized() const override { return is_initialized_; } private: bool is_initialized_; diff --git a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h index 446fb28..00e11fd 100644 --- a/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h +++ b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h @@ -23,14 +23,14 @@ class FFmpegCdmVideoDecoder : public CdmVideoDecoder { virtual ~FFmpegCdmVideoDecoder(); // CdmVideoDecoder implementation. - virtual bool Initialize(const cdm::VideoDecoderConfig& config) OVERRIDE; - virtual void Deinitialize() OVERRIDE; - virtual void Reset() OVERRIDE; + virtual bool Initialize(const cdm::VideoDecoderConfig& config) override; + virtual void Deinitialize() override; + virtual void Reset() override; virtual cdm::Status DecodeFrame(const uint8_t* compressed_frame, int32_t compressed_frame_size, int64_t timestamp, - cdm::VideoFrame* decoded_frame) OVERRIDE; - virtual bool is_initialized() const OVERRIDE { return is_initialized_; } + cdm::VideoFrame* decoded_frame) override; + virtual bool is_initialized() const override { return is_initialized_; } // Returns true when |format| and |data_size| specify a supported video // output configuration. diff --git a/media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.h b/media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.h index efa0e36..0ba05b9 100644 --- a/media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.h +++ b/media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.h @@ -21,14 +21,14 @@ class LibvpxCdmVideoDecoder : public CdmVideoDecoder { virtual ~LibvpxCdmVideoDecoder(); // CdmVideoDecoder implementation. - virtual bool Initialize(const cdm::VideoDecoderConfig& config) OVERRIDE; - virtual void Deinitialize() OVERRIDE; - virtual void Reset() OVERRIDE; + virtual bool Initialize(const cdm::VideoDecoderConfig& config) override; + virtual void Deinitialize() override; + virtual void Reset() override; virtual cdm::Status DecodeFrame(const uint8_t* compressed_frame, int32_t compressed_frame_size, int64_t timestamp, - cdm::VideoFrame* decoded_frame) OVERRIDE; - virtual bool is_initialized() const OVERRIDE { return is_initialized_; } + cdm::VideoFrame* decoded_frame) override; + virtual bool is_initialized() const override { return is_initialized_; } // Returns true when |format| and |data_size| specify a supported video // output configuration. diff --git a/media/filters/audio_renderer_impl.h b/media/filters/audio_renderer_impl.h index ac8c3ad..96c848e 100644 --- a/media/filters/audio_renderer_impl.h +++ b/media/filters/audio_renderer_impl.h @@ -70,12 +70,12 @@ class MEDIA_EXPORT AudioRendererImpl virtual ~AudioRendererImpl(); // TimeSource implementation. - virtual void StartTicking() OVERRIDE; - virtual void StopTicking() OVERRIDE; - virtual void SetPlaybackRate(float rate) OVERRIDE; - virtual void SetMediaTime(base::TimeDelta time) OVERRIDE; - virtual base::TimeDelta CurrentMediaTime() OVERRIDE; - virtual base::TimeDelta CurrentMediaTimeForSyncingVideo() OVERRIDE; + virtual void StartTicking() override; + virtual void StopTicking() override; + virtual void SetPlaybackRate(float rate) override; + virtual void SetMediaTime(base::TimeDelta time) override; + virtual base::TimeDelta CurrentMediaTime() override; + virtual base::TimeDelta CurrentMediaTimeForSyncingVideo() override; // AudioRenderer implementation. virtual void Initialize(DemuxerStream* stream, @@ -83,11 +83,11 @@ class MEDIA_EXPORT AudioRendererImpl const StatisticsCB& statistics_cb, const BufferingStateCB& buffering_state_cb, const base::Closure& ended_cb, - const PipelineStatusCB& error_cb) OVERRIDE; - virtual TimeSource* GetTimeSource() OVERRIDE; - virtual void Flush(const base::Closure& callback) OVERRIDE; - virtual void StartPlaying() OVERRIDE; - virtual void SetVolume(float volume) OVERRIDE; + const PipelineStatusCB& error_cb) override; + virtual TimeSource* GetTimeSource() override; + virtual void Flush(const base::Closure& callback) override; + virtual void StartPlaying() override; + virtual void SetVolume(float volume) override; private: friend class AudioRendererImplTest; @@ -152,8 +152,8 @@ class MEDIA_EXPORT AudioRendererImpl // this case |audio_delay_milliseconds| should be used to indicate when in the // future should the filled buffer be played. virtual int Render(AudioBus* audio_bus, - int audio_delay_milliseconds) OVERRIDE; - virtual void OnRenderError() OVERRIDE; + int audio_delay_milliseconds) override; + virtual void OnRenderError() override; // Helper methods that schedule an asynchronous read from the decoder as long // as there isn't a pending read. diff --git a/media/filters/blocking_url_protocol.h b/media/filters/blocking_url_protocol.h index 4d44967..bfb40b7 100644 --- a/media/filters/blocking_url_protocol.h +++ b/media/filters/blocking_url_protocol.h @@ -31,11 +31,11 @@ class MEDIA_EXPORT BlockingUrlProtocol : public FFmpegURLProtocol { void Abort(); // FFmpegURLProtocol implementation. - virtual int Read(int size, uint8* data) OVERRIDE; - virtual bool GetPosition(int64* position_out) OVERRIDE; - virtual bool SetPosition(int64 position) OVERRIDE; - virtual bool GetSize(int64* size_out) OVERRIDE; - virtual bool IsStreaming() OVERRIDE; + virtual int Read(int size, uint8* data) override; + virtual bool GetPosition(int64* position_out) override; + virtual bool SetPosition(int64 position) override; + virtual bool GetSize(int64* size_out) override; + virtual bool IsStreaming() override; private: // Sets |last_read_bytes_| and signals the blocked thread that the read diff --git a/media/filters/chunk_demuxer.h b/media/filters/chunk_demuxer.h index 4837dff4..a617d3d 100644 --- a/media/filters/chunk_demuxer.h +++ b/media/filters/chunk_demuxer.h @@ -80,12 +80,12 @@ class MEDIA_EXPORT ChunkDemuxerStream : public DemuxerStream { void UnmarkEndOfStream(); // DemuxerStream methods. - virtual void Read(const ReadCB& read_cb) OVERRIDE; - virtual Type type() OVERRIDE; - virtual AudioDecoderConfig audio_decoder_config() OVERRIDE; - virtual VideoDecoderConfig video_decoder_config() OVERRIDE; - virtual bool SupportsConfigChanges() OVERRIDE; - virtual VideoRotation video_rotation() OVERRIDE; + virtual void Read(const ReadCB& read_cb) override; + virtual Type type() override; + virtual AudioDecoderConfig audio_decoder_config() override; + virtual VideoDecoderConfig video_decoder_config() override; + virtual bool SupportsConfigChanges() override; + virtual VideoRotation video_rotation() override; // Returns the text track configuration. It is an error to call this method // if type() != TEXT. @@ -159,13 +159,13 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer { // Demuxer implementation. virtual void Initialize(DemuxerHost* host, const PipelineStatusCB& cb, - bool enable_text_tracks) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) OVERRIDE; - virtual base::Time GetTimelineOffset() const OVERRIDE; - virtual DemuxerStream* GetStream(DemuxerStream::Type type) OVERRIDE; - virtual base::TimeDelta GetStartTime() const OVERRIDE; - virtual Liveness GetLiveness() const OVERRIDE; + bool enable_text_tracks) override; + virtual void Stop() override; + virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) override; + virtual base::Time GetTimelineOffset() const override; + virtual DemuxerStream* GetStream(DemuxerStream::Type type) override; + virtual base::TimeDelta GetStartTime() const override; + virtual Liveness GetLiveness() const override; // Methods used by an external object to control this demuxer. // diff --git a/media/filters/clockless_video_frame_scheduler.h b/media/filters/clockless_video_frame_scheduler.h index e52a73b..0ead91a 100644 --- a/media/filters/clockless_video_frame_scheduler.h +++ b/media/filters/clockless_video_frame_scheduler.h @@ -20,8 +20,8 @@ class ClocklessVideoFrameScheduler : public VideoFrameScheduler { // VideoFrameScheduler implementation. virtual void ScheduleVideoFrame(const scoped_refptr<VideoFrame>& frame, base::TimeTicks wall_ticks, - const DoneCB& done_cb) OVERRIDE; - virtual void Reset() OVERRIDE; + const DoneCB& done_cb) override; + virtual void Reset() override; private: DisplayCB display_cb_; diff --git a/media/filters/decrypting_audio_decoder.h b/media/filters/decrypting_audio_decoder.h index 5dd455c..544dc55 100644 --- a/media/filters/decrypting_audio_decoder.h +++ b/media/filters/decrypting_audio_decoder.h @@ -43,13 +43,13 @@ class MEDIA_EXPORT DecryptingAudioDecoder : public AudioDecoder { virtual ~DecryptingAudioDecoder(); // AudioDecoder implementation. - virtual std::string GetDisplayName() const OVERRIDE; + virtual std::string GetDisplayName() const override; virtual void Initialize(const AudioDecoderConfig& config, const PipelineStatusCB& status_cb, - const OutputCB& output_cb) OVERRIDE; + const OutputCB& output_cb) override; virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer, - const DecodeCB& decode_cb) OVERRIDE; - virtual void Reset(const base::Closure& closure) OVERRIDE; + const DecodeCB& decode_cb) override; + virtual void Reset(const base::Closure& closure) override; private: // For a detailed state diagram please see this link: http://goo.gl/8jAok diff --git a/media/filters/decrypting_demuxer_stream.h b/media/filters/decrypting_demuxer_stream.h index b987277..bad4fad 100644 --- a/media/filters/decrypting_demuxer_stream.h +++ b/media/filters/decrypting_demuxer_stream.h @@ -45,13 +45,13 @@ class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream { void Reset(const base::Closure& closure); // DemuxerStream implementation. - virtual void Read(const ReadCB& read_cb) OVERRIDE; - virtual AudioDecoderConfig audio_decoder_config() OVERRIDE; - virtual VideoDecoderConfig video_decoder_config() OVERRIDE; - virtual Type type() OVERRIDE; - virtual void EnableBitstreamConverter() OVERRIDE; - virtual bool SupportsConfigChanges() OVERRIDE; - virtual VideoRotation video_rotation() OVERRIDE; + virtual void Read(const ReadCB& read_cb) override; + virtual AudioDecoderConfig audio_decoder_config() override; + virtual VideoDecoderConfig video_decoder_config() override; + virtual Type type() override; + virtual void EnableBitstreamConverter() override; + virtual bool SupportsConfigChanges() override; + virtual VideoRotation video_rotation() override; private: // For a detailed state diagram please see this link: http://goo.gl/8jAok diff --git a/media/filters/decrypting_video_decoder.h b/media/filters/decrypting_video_decoder.h index c301e55..892c429 100644 --- a/media/filters/decrypting_video_decoder.h +++ b/media/filters/decrypting_video_decoder.h @@ -32,14 +32,14 @@ class MEDIA_EXPORT DecryptingVideoDecoder : public VideoDecoder { virtual ~DecryptingVideoDecoder(); // VideoDecoder implementation. - virtual std::string GetDisplayName() const OVERRIDE; + virtual std::string GetDisplayName() const override; virtual void Initialize(const VideoDecoderConfig& config, bool low_delay, const PipelineStatusCB& status_cb, - const OutputCB& output_cb) OVERRIDE; + const OutputCB& output_cb) override; virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer, - const DecodeCB& decode_cb) OVERRIDE; - virtual void Reset(const base::Closure& closure) OVERRIDE; + const DecodeCB& decode_cb) override; + virtual void Reset(const base::Closure& closure) override; private: // For a detailed state diagram please see this link: http://goo.gl/8jAok diff --git a/media/filters/fake_demuxer_stream.h b/media/filters/fake_demuxer_stream.h index 2846ed9..fbb6151 100644 --- a/media/filters/fake_demuxer_stream.h +++ b/media/filters/fake_demuxer_stream.h @@ -28,12 +28,12 @@ class FakeDemuxerStream : public DemuxerStream { virtual ~FakeDemuxerStream(); // DemuxerStream implementation. - virtual void Read(const ReadCB& read_cb) OVERRIDE; - virtual AudioDecoderConfig audio_decoder_config() OVERRIDE; - virtual VideoDecoderConfig video_decoder_config() OVERRIDE; - virtual Type type() OVERRIDE; - virtual bool SupportsConfigChanges() OVERRIDE; - virtual VideoRotation video_rotation() OVERRIDE; + virtual void Read(const ReadCB& read_cb) override; + virtual AudioDecoderConfig audio_decoder_config() override; + virtual VideoDecoderConfig video_decoder_config() override; + virtual Type type() override; + virtual bool SupportsConfigChanges() override; + virtual VideoRotation video_rotation() override; void Initialize(); diff --git a/media/filters/fake_video_decoder.h b/media/filters/fake_video_decoder.h index e96dc16..e36ce3c7 100644 --- a/media/filters/fake_video_decoder.h +++ b/media/filters/fake_video_decoder.h @@ -36,15 +36,15 @@ class FakeVideoDecoder : public VideoDecoder { virtual ~FakeVideoDecoder(); // VideoDecoder implementation. - virtual std::string GetDisplayName() const OVERRIDE; + virtual std::string GetDisplayName() const override; virtual void Initialize(const VideoDecoderConfig& config, bool low_delay, const PipelineStatusCB& status_cb, - const OutputCB& output_cb) OVERRIDE; + const OutputCB& output_cb) override; virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer, - const DecodeCB& decode_cb) OVERRIDE; - virtual void Reset(const base::Closure& closure) OVERRIDE; - virtual int GetMaxDecodeRequests() const OVERRIDE; + const DecodeCB& decode_cb) override; + virtual void Reset(const base::Closure& closure) override; + virtual int GetMaxDecodeRequests() const override; // Holds the next init/decode/reset callback from firing. void HoldNextInit(); diff --git a/media/filters/ffmpeg_audio_decoder.h b/media/filters/ffmpeg_audio_decoder.h index b13a016..bd0128c 100644 --- a/media/filters/ffmpeg_audio_decoder.h +++ b/media/filters/ffmpeg_audio_decoder.h @@ -36,13 +36,13 @@ class MEDIA_EXPORT FFmpegAudioDecoder : public AudioDecoder { virtual ~FFmpegAudioDecoder(); // AudioDecoder implementation. - virtual std::string GetDisplayName() const OVERRIDE; + virtual std::string GetDisplayName() const override; virtual void Initialize(const AudioDecoderConfig& config, const PipelineStatusCB& status_cb, - const OutputCB& output_cb) OVERRIDE; + const OutputCB& output_cb) override; virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer, - const DecodeCB& decode_cb) OVERRIDE; - virtual void Reset(const base::Closure& closure) OVERRIDE; + const DecodeCB& decode_cb) override; + virtual void Reset(const base::Closure& closure) override; private: // There are four states the decoder can be in: diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h index d2855e0..6209a0f 100644 --- a/media/filters/ffmpeg_demuxer.h +++ b/media/filters/ffmpeg_demuxer.h @@ -86,13 +86,13 @@ class FFmpegDemuxerStream : public DemuxerStream { } // DemuxerStream implementation. - virtual Type type() OVERRIDE; - virtual void Read(const ReadCB& read_cb) OVERRIDE; - virtual void EnableBitstreamConverter() OVERRIDE; - virtual bool SupportsConfigChanges() OVERRIDE; - virtual AudioDecoderConfig audio_decoder_config() OVERRIDE; - virtual VideoDecoderConfig video_decoder_config() OVERRIDE; - virtual VideoRotation video_rotation() OVERRIDE; + virtual Type type() override; + virtual void Read(const ReadCB& read_cb) override; + virtual void EnableBitstreamConverter() override; + virtual bool SupportsConfigChanges() override; + virtual AudioDecoderConfig audio_decoder_config() override; + virtual VideoDecoderConfig video_decoder_config() override; + virtual VideoRotation video_rotation() override; // Returns the range of buffered data in this stream. Ranges<base::TimeDelta> GetBufferedRanges() const; @@ -163,13 +163,13 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer { // Demuxer implementation. virtual void Initialize(DemuxerHost* host, const PipelineStatusCB& status_cb, - bool enable_text_tracks) OVERRIDE; - virtual void Stop() OVERRIDE; - virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) OVERRIDE; - virtual base::Time GetTimelineOffset() const OVERRIDE; - virtual DemuxerStream* GetStream(DemuxerStream::Type type) OVERRIDE; - virtual base::TimeDelta GetStartTime() const OVERRIDE; - virtual Liveness GetLiveness() const OVERRIDE; + bool enable_text_tracks) override; + virtual void Stop() override; + virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) override; + virtual base::Time GetTimelineOffset() const override; + virtual DemuxerStream* GetStream(DemuxerStream::Type type) override; + virtual base::TimeDelta GetStartTime() const override; + virtual Liveness GetLiveness() const override; // Calls |need_key_cb_| with the initialization data encountered in the file. void FireNeedKey(const std::string& init_data_type, diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h index 909a578..76b6af5 100644 --- a/media/filters/ffmpeg_video_decoder.h +++ b/media/filters/ffmpeg_video_decoder.h @@ -36,14 +36,14 @@ class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder { void set_decode_nalus(bool decode_nalus) { decode_nalus_ = decode_nalus; } // VideoDecoder implementation. - virtual std::string GetDisplayName() const OVERRIDE; + virtual std::string GetDisplayName() const override; virtual void Initialize(const VideoDecoderConfig& config, bool low_delay, const PipelineStatusCB& status_cb, - const OutputCB& output_cb) OVERRIDE; + const OutputCB& output_cb) override; virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer, - const DecodeCB& decode_cb) OVERRIDE; - virtual void Reset(const base::Closure& closure) OVERRIDE; + const DecodeCB& decode_cb) override; + virtual void Reset(const base::Closure& closure) override; // Callback called from within FFmpeg to allocate a buffer based on // the dimensions of |codec_context|. See AVCodecContext.get_buffer2 diff --git a/media/filters/file_data_source.h b/media/filters/file_data_source.h index 78884ea..b743e0f 100644 --- a/media/filters/file_data_source.h +++ b/media/filters/file_data_source.h @@ -25,12 +25,12 @@ class MEDIA_EXPORT FileDataSource : public DataSource { bool Initialize(const base::FilePath& file_path); // Implementation of DataSource. - virtual void Stop() OVERRIDE; + virtual void Stop() override; virtual void Read(int64 position, int size, uint8* data, - const DataSource::ReadCB& read_cb) OVERRIDE; - virtual bool GetSize(int64* size_out) OVERRIDE; - virtual bool IsStreaming() OVERRIDE; - virtual void SetBitrate(int bitrate) OVERRIDE; + const DataSource::ReadCB& read_cb) override; + virtual bool GetSize(int64* size_out) override; + virtual bool IsStreaming() override; + virtual void SetBitrate(int bitrate) override; // Unit test helpers. Recreate the object if you want the default behaviour. void force_read_errors_for_testing() { force_read_errors_ = true; } diff --git a/media/filters/gpu_video_decoder.h b/media/filters/gpu_video_decoder.h index 743c127..132335c 100644 --- a/media/filters/gpu_video_decoder.h +++ b/media/filters/gpu_video_decoder.h @@ -41,28 +41,28 @@ class MEDIA_EXPORT GpuVideoDecoder const scoped_refptr<GpuVideoAcceleratorFactories>& factories); // VideoDecoder implementation. - virtual std::string GetDisplayName() const OVERRIDE; + virtual std::string GetDisplayName() const override; virtual void Initialize(const VideoDecoderConfig& config, bool low_delay, const PipelineStatusCB& status_cb, - const OutputCB& output_cb) OVERRIDE; + const OutputCB& output_cb) override; virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer, - const DecodeCB& decode_cb) OVERRIDE; - virtual void Reset(const base::Closure& closure) OVERRIDE; - virtual bool NeedsBitstreamConversion() const OVERRIDE; - virtual bool CanReadWithoutStalling() const OVERRIDE; - virtual int GetMaxDecodeRequests() const OVERRIDE; + const DecodeCB& decode_cb) override; + virtual void Reset(const base::Closure& closure) override; + virtual bool NeedsBitstreamConversion() const override; + virtual bool CanReadWithoutStalling() const override; + virtual int GetMaxDecodeRequests() const override; // VideoDecodeAccelerator::Client implementation. virtual void ProvidePictureBuffers(uint32 count, const gfx::Size& size, - uint32 texture_target) OVERRIDE; - virtual void DismissPictureBuffer(int32 id) OVERRIDE; - virtual void PictureReady(const media::Picture& picture) OVERRIDE; - virtual void NotifyEndOfBitstreamBuffer(int32 id) OVERRIDE; - virtual void NotifyFlushDone() OVERRIDE; - virtual void NotifyResetDone() OVERRIDE; - virtual void NotifyError(media::VideoDecodeAccelerator::Error error) OVERRIDE; + uint32 texture_target) override; + virtual void DismissPictureBuffer(int32 id) override; + virtual void PictureReady(const media::Picture& picture) override; + virtual void NotifyEndOfBitstreamBuffer(int32 id) override; + virtual void NotifyFlushDone() override; + virtual void NotifyResetDone() override; + virtual void NotifyError(media::VideoDecodeAccelerator::Error error) override; protected: virtual ~GpuVideoDecoder(); diff --git a/media/filters/in_memory_url_protocol.h b/media/filters/in_memory_url_protocol.h index 5c323c1..85aa1ed 100644 --- a/media/filters/in_memory_url_protocol.h +++ b/media/filters/in_memory_url_protocol.h @@ -22,11 +22,11 @@ class MEDIA_EXPORT InMemoryUrlProtocol : public FFmpegURLProtocol { virtual ~InMemoryUrlProtocol(); // FFmpegURLProtocol methods. - virtual int Read(int size, uint8* data) OVERRIDE; - virtual bool GetPosition(int64* position_out) OVERRIDE; - virtual bool SetPosition(int64 position) OVERRIDE; - virtual bool GetSize(int64* size_out) OVERRIDE; - virtual bool IsStreaming() OVERRIDE; + virtual int Read(int size, uint8* data) override; + virtual bool GetPosition(int64* position_out) override; + virtual bool SetPosition(int64 position) override; + virtual bool GetSize(int64* size_out) override; + virtual bool IsStreaming() override; private: const uint8* data_; diff --git a/media/filters/mock_gpu_video_accelerator_factories.h b/media/filters/mock_gpu_video_accelerator_factories.h index bfa89a1..949f35d 100644 --- a/media/filters/mock_gpu_video_accelerator_factories.h +++ b/media/filters/mock_gpu_video_accelerator_factories.h @@ -49,10 +49,10 @@ class MockGpuVideoAcceleratorFactories : public GpuVideoAcceleratorFactories { std::vector<VideoEncodeAccelerator::SupportedProfile>()); virtual scoped_ptr<VideoDecodeAccelerator> CreateVideoDecodeAccelerator() - OVERRIDE; + override; virtual scoped_ptr<VideoEncodeAccelerator> CreateVideoEncodeAccelerator() - OVERRIDE; + override; private: virtual ~MockGpuVideoAcceleratorFactories(); diff --git a/media/filters/opus_audio_decoder.h b/media/filters/opus_audio_decoder.h index b69af92..f1955ab 100644 --- a/media/filters/opus_audio_decoder.h +++ b/media/filters/opus_audio_decoder.h @@ -31,13 +31,13 @@ class MEDIA_EXPORT OpusAudioDecoder : public AudioDecoder { virtual ~OpusAudioDecoder(); // AudioDecoder implementation. - virtual std::string GetDisplayName() const OVERRIDE; + virtual std::string GetDisplayName() const override; virtual void Initialize(const AudioDecoderConfig& config, const PipelineStatusCB& status_cb, - const OutputCB& output_cb) OVERRIDE; + const OutputCB& output_cb) override; virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer, - const DecodeCB& decode_cb) OVERRIDE; - virtual void Reset(const base::Closure& closure) OVERRIDE; + const DecodeCB& decode_cb) override; + virtual void Reset(const base::Closure& closure) override; private: // Reads from the demuxer stream with corresponding callback method. diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc index 27e6344..ea3ff44 100644 --- a/media/filters/pipeline_integration_test.cc +++ b/media/filters/pipeline_integration_test.cc @@ -233,25 +233,25 @@ class KeyProvidingApp : public FakeEncryptedMedia::AppBase { virtual void OnSessionMessage(const std::string& web_session_id, const std::vector<uint8>& message, - const GURL& destination_url) OVERRIDE { + const GURL& destination_url) override { EXPECT_FALSE(web_session_id.empty()); EXPECT_FALSE(message.empty()); EXPECT_EQ(current_session_id_, web_session_id); } - virtual void OnSessionClosed(const std::string& web_session_id) OVERRIDE { + virtual void OnSessionClosed(const std::string& web_session_id) override { EXPECT_EQ(current_session_id_, web_session_id); } virtual void OnSessionKeysChange(const std::string& web_session_id, - bool has_additional_usable_key) OVERRIDE { + bool has_additional_usable_key) override { EXPECT_EQ(current_session_id_, web_session_id); EXPECT_EQ(has_additional_usable_key, true); } virtual void NeedKey(const std::string& type, const std::vector<uint8>& init_data, - AesDecryptor* decryptor) OVERRIDE { + AesDecryptor* decryptor) override { if (current_session_id_.empty()) { decryptor->CreateSession(type, kInitData, @@ -293,7 +293,7 @@ class RotatingKeyProvidingApp : public KeyProvidingApp { virtual void NeedKey(const std::string& type, const std::vector<uint8>& init_data, - AesDecryptor* decryptor) OVERRIDE { + AesDecryptor* decryptor) override { // Skip the request if the |init_data| has been seen. if (init_data == prev_init_data_) return; @@ -360,26 +360,26 @@ class NoResponseApp : public FakeEncryptedMedia::AppBase { public: virtual void OnSessionMessage(const std::string& web_session_id, const std::vector<uint8>& message, - const GURL& default_url) OVERRIDE { + const GURL& default_url) override { EXPECT_FALSE(web_session_id.empty()); EXPECT_FALSE(message.empty()); FAIL() << "Unexpected Message"; } - virtual void OnSessionClosed(const std::string& web_session_id) OVERRIDE { + virtual void OnSessionClosed(const std::string& web_session_id) override { EXPECT_FALSE(web_session_id.empty()); FAIL() << "Unexpected Closed"; } virtual void OnSessionKeysChange(const std::string& web_session_id, - bool has_additional_usable_key) OVERRIDE { + bool has_additional_usable_key) override { EXPECT_FALSE(web_session_id.empty()); EXPECT_EQ(has_additional_usable_key, true); } virtual void NeedKey(const std::string& type, const std::vector<uint8>& init_data, - AesDecryptor* decryptor) OVERRIDE { + AesDecryptor* decryptor) override { } }; diff --git a/media/filters/pipeline_integration_test_base.h b/media/filters/pipeline_integration_test_base.h index cfa9f30..2f0d647 100644 --- a/media/filters/pipeline_integration_test_base.h +++ b/media/filters/pipeline_integration_test_base.h @@ -39,7 +39,7 @@ class DummyTickClock : public base::TickClock { public: DummyTickClock() : now_() {} virtual ~DummyTickClock() {} - virtual base::TimeTicks NowTicks() OVERRIDE; + virtual base::TimeTicks NowTicks() override; private: base::TimeTicks now_; }; diff --git a/media/filters/renderer_impl.h b/media/filters/renderer_impl.h index 4c1d00d..8d2fbe8 100644 --- a/media/filters/renderer_impl.h +++ b/media/filters/renderer_impl.h @@ -47,15 +47,15 @@ class MEDIA_EXPORT RendererImpl : public Renderer { const StatisticsCB& statistics_cb, const base::Closure& ended_cb, const PipelineStatusCB& error_cb, - const BufferingStateCB& buffering_state_cb) OVERRIDE; - virtual void Flush(const base::Closure& flush_cb) OVERRIDE; - virtual void StartPlayingFrom(base::TimeDelta time) OVERRIDE; - virtual void SetPlaybackRate(float playback_rate) OVERRIDE; - virtual void SetVolume(float volume) OVERRIDE; - virtual base::TimeDelta GetMediaTime() OVERRIDE; - virtual bool HasAudio() OVERRIDE; - virtual bool HasVideo() OVERRIDE; - virtual void SetCdm(MediaKeys* cdm) OVERRIDE; + const BufferingStateCB& buffering_state_cb) override; + virtual void Flush(const base::Closure& flush_cb) override; + virtual void StartPlayingFrom(base::TimeDelta time) override; + virtual void SetPlaybackRate(float playback_rate) override; + virtual void SetVolume(float volume) override; + virtual base::TimeDelta GetMediaTime() override; + virtual bool HasAudio() override; + virtual bool HasVideo() override; + virtual void SetCdm(MediaKeys* cdm) override; // Helper functions for testing purposes. Must be called before Initialize(). void DisableUnderflowForTesting(); diff --git a/media/filters/skcanvas_video_renderer.cc b/media/filters/skcanvas_video_renderer.cc index 9bdd393..4113ccb 100644 --- a/media/filters/skcanvas_video_renderer.cc +++ b/media/filters/skcanvas_video_renderer.cc @@ -214,7 +214,7 @@ class VideoImageGenerator : public SkImageGenerator { void set_frame(const scoped_refptr<VideoFrame>& frame) { frame_ = frame; } protected: - virtual bool onGetInfo(SkImageInfo* info) OVERRIDE { + virtual bool onGetInfo(SkImageInfo* info) override { info->fWidth = frame_->visible_rect().width(); info->fHeight = frame_->visible_rect().height(); info->fColorType = kN32_SkColorType; @@ -226,7 +226,7 @@ class VideoImageGenerator : public SkImageGenerator { void* pixels, size_t row_bytes, SkPMColor ctable[], - int* ctable_count) OVERRIDE { + int* ctable_count) override { if (!frame_.get()) return false; if (!pixels) @@ -240,7 +240,7 @@ class VideoImageGenerator : public SkImageGenerator { virtual bool onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t row_bytes[3], - SkYUVColorSpace* color_space) OVERRIDE { + SkYUVColorSpace* color_space) override { if (!frame_.get() || !IsYUV(frame_->format())) return false; diff --git a/media/filters/test_video_frame_scheduler.h b/media/filters/test_video_frame_scheduler.h index c292062..bfe9771 100644 --- a/media/filters/test_video_frame_scheduler.h +++ b/media/filters/test_video_frame_scheduler.h @@ -31,8 +31,8 @@ class TestVideoFrameScheduler : public VideoFrameScheduler { // VideoFrameScheduler implementation. virtual void ScheduleVideoFrame(const scoped_refptr<VideoFrame>& frame, base::TimeTicks wall_ticks, - const DoneCB& done_cb) OVERRIDE; - virtual void Reset() OVERRIDE; + const DoneCB& done_cb) override; + virtual void Reset() override; // Displays all frames with scheduled times <= |wall_ticks|. void DisplayFramesUpTo(base::TimeTicks wall_ticks); diff --git a/media/filters/video_frame_scheduler_impl.h b/media/filters/video_frame_scheduler_impl.h index f6bc78d..e2c0a9d 100644 --- a/media/filters/video_frame_scheduler_impl.h +++ b/media/filters/video_frame_scheduler_impl.h @@ -36,8 +36,8 @@ class MEDIA_EXPORT VideoFrameSchedulerImpl : public VideoFrameScheduler { // VideoFrameScheduler implementation. virtual void ScheduleVideoFrame(const scoped_refptr<VideoFrame>& frame, base::TimeTicks wall_ticks, - const DoneCB& done_cb) OVERRIDE; - virtual void Reset() OVERRIDE; + const DoneCB& done_cb) override; + virtual void Reset() override; void SetTickClockForTesting(scoped_ptr<base::TickClock> tick_clock); diff --git a/media/filters/video_frame_scheduler_proxy.h b/media/filters/video_frame_scheduler_proxy.h index 9130f60..315bf28 100644 --- a/media/filters/video_frame_scheduler_proxy.h +++ b/media/filters/video_frame_scheduler_proxy.h @@ -32,8 +32,8 @@ class MEDIA_EXPORT VideoFrameSchedulerProxy : public VideoFrameScheduler { // VideoFrameScheduler implementation. virtual void ScheduleVideoFrame(const scoped_refptr<VideoFrame>& frame, base::TimeTicks wall_ticks, - const DoneCB& done_cb) OVERRIDE; - virtual void Reset() OVERRIDE; + const DoneCB& done_cb) override; + virtual void Reset() override; private: scoped_refptr<base::SingleThreadTaskRunner> task_runner_; diff --git a/media/filters/video_renderer_impl.h b/media/filters/video_renderer_impl.h index a1f027d..3cda321 100644 --- a/media/filters/video_renderer_impl.h +++ b/media/filters/video_renderer_impl.h @@ -66,12 +66,12 @@ class MEDIA_EXPORT VideoRendererImpl const BufferingStateCB& buffering_state_cb, const base::Closure& ended_cb, const PipelineStatusCB& error_cb, - const TimeDeltaCB& get_time_cb) OVERRIDE; - virtual void Flush(const base::Closure& callback) OVERRIDE; - virtual void StartPlayingFrom(base::TimeDelta timestamp) OVERRIDE; + const TimeDeltaCB& get_time_cb) override; + virtual void Flush(const base::Closure& callback) override; + virtual void StartPlayingFrom(base::TimeDelta timestamp) override; // PlatformThread::Delegate implementation. - virtual void ThreadMain() OVERRIDE; + virtual void ThreadMain() override; private: // Callback for |video_frame_stream_| initialization. diff --git a/media/filters/vpx_video_decoder.h b/media/filters/vpx_video_decoder.h index fdc5958..37ceb2f 100644 --- a/media/filters/vpx_video_decoder.h +++ b/media/filters/vpx_video_decoder.h @@ -32,14 +32,14 @@ class MEDIA_EXPORT VpxVideoDecoder : public VideoDecoder { virtual ~VpxVideoDecoder(); // VideoDecoder implementation. - virtual std::string GetDisplayName() const OVERRIDE; + virtual std::string GetDisplayName() const override; virtual void Initialize(const VideoDecoderConfig& config, bool low_delay, const PipelineStatusCB& status_cb, - const OutputCB& output_cb) OVERRIDE; + const OutputCB& output_cb) override; virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer, - const DecodeCB& decode_cb) OVERRIDE; - virtual void Reset(const base::Closure& closure) OVERRIDE; + const DecodeCB& decode_cb) override; + virtual void Reset(const base::Closure& closure) override; private: enum DecoderState { diff --git a/media/formats/common/offset_byte_queue_unittest.cc b/media/formats/common/offset_byte_queue_unittest.cc index 43d693a..b9489fe 100644 --- a/media/formats/common/offset_byte_queue_unittest.cc +++ b/media/formats/common/offset_byte_queue_unittest.cc @@ -13,7 +13,7 @@ namespace media { class OffsetByteQueueTest : public testing::Test { public: - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { uint8 buf[256]; for (int i = 0; i < 256; i++) { buf[i] = i; diff --git a/media/formats/mp2t/es_parser_adts.h b/media/formats/mp2t/es_parser_adts.h index 55516b7..39998ec 100644 --- a/media/formats/mp2t/es_parser_adts.h +++ b/media/formats/mp2t/es_parser_adts.h @@ -36,14 +36,14 @@ class MEDIA_EXPORT EsParserAdts : public EsParser { virtual ~EsParserAdts(); // EsParser implementation. - virtual void Flush() OVERRIDE; + virtual void Flush() override; private: struct AdtsFrame; // EsParser implementation. - virtual bool ParseFromEsQueue() OVERRIDE; - virtual void ResetInternal() OVERRIDE; + virtual bool ParseFromEsQueue() override; + virtual void ResetInternal() override; // Synchronize the stream on an ADTS syncword (consuming bytes from // |es_queue_| if needed). diff --git a/media/formats/mp2t/es_parser_h264.h b/media/formats/mp2t/es_parser_h264.h index dd9184d..a6a67b5 100644 --- a/media/formats/mp2t/es_parser_h264.h +++ b/media/formats/mp2t/es_parser_h264.h @@ -45,12 +45,12 @@ class MEDIA_EXPORT EsParserH264 : public EsParser { virtual ~EsParserH264(); // EsParser implementation. - virtual void Flush() OVERRIDE; + virtual void Flush() override; private: // EsParser implementation. - virtual bool ParseFromEsQueue() OVERRIDE; - virtual void ResetInternal() OVERRIDE; + virtual bool ParseFromEsQueue() override; + virtual void ResetInternal() override; // Find the AUD located at or after |*stream_pos|. // Return true if an AUD is found. diff --git a/media/formats/mp2t/es_parser_mpeg1audio.h b/media/formats/mp2t/es_parser_mpeg1audio.h index 8ae1c1b..f754d3b 100644 --- a/media/formats/mp2t/es_parser_mpeg1audio.h +++ b/media/formats/mp2t/es_parser_mpeg1audio.h @@ -37,7 +37,7 @@ class MEDIA_EXPORT EsParserMpeg1Audio : public EsParser { virtual ~EsParserMpeg1Audio(); // EsParser implementation. - virtual void Flush() OVERRIDE; + virtual void Flush() override; private: // Used to link a PTS with a byte position in the ES stream. @@ -47,8 +47,8 @@ class MEDIA_EXPORT EsParserMpeg1Audio : public EsParser { struct Mpeg1AudioFrame; // EsParser implementation. - virtual bool ParseFromEsQueue() OVERRIDE; - virtual void ResetInternal() OVERRIDE; + virtual bool ParseFromEsQueue() override; + virtual void ResetInternal() override; // Synchronize the stream on a Mpeg1 audio syncword (consuming bytes from // |es_queue_| if needed). diff --git a/media/formats/mp2t/mp2t_stream_parser.h b/media/formats/mp2t/mp2t_stream_parser.h index 71f147c..3efe2a78 100644 --- a/media/formats/mp2t/mp2t_stream_parser.h +++ b/media/formats/mp2t/mp2t_stream_parser.h @@ -38,9 +38,9 @@ class MEDIA_EXPORT Mp2tStreamParser : public StreamParser { const NeedKeyCB& need_key_cb, const NewMediaSegmentCB& new_segment_cb, const base::Closure& end_of_segment_cb, - const LogCB& log_cb) OVERRIDE; - virtual void Flush() OVERRIDE; - virtual bool Parse(const uint8* buf, int size) OVERRIDE; + const LogCB& log_cb) override; + virtual void Flush() override; + virtual bool Parse(const uint8* buf, int size) override; private: typedef std::map<int, PidState*> PidMap; diff --git a/media/formats/mp2t/ts_section_pat.h b/media/formats/mp2t/ts_section_pat.h index f8079ad..32e934e 100644 --- a/media/formats/mp2t/ts_section_pat.h +++ b/media/formats/mp2t/ts_section_pat.h @@ -21,8 +21,8 @@ class TsSectionPat : public TsSectionPsi { virtual ~TsSectionPat(); // TsSectionPsi implementation. - virtual bool ParsePsiSection(BitReader* bit_reader) OVERRIDE; - virtual void ResetPsiSection() OVERRIDE; + virtual bool ParsePsiSection(BitReader* bit_reader) override; + virtual void ResetPsiSection() override; private: RegisterPmtCb register_pmt_cb_; diff --git a/media/formats/mp2t/ts_section_pes.h b/media/formats/mp2t/ts_section_pes.h index 56aa883..2309146 100644 --- a/media/formats/mp2t/ts_section_pes.h +++ b/media/formats/mp2t/ts_section_pes.h @@ -25,9 +25,9 @@ class TsSectionPes : public TsSection { // TsSection implementation. virtual bool Parse(bool payload_unit_start_indicator, - const uint8* buf, int size) OVERRIDE; - virtual void Flush() OVERRIDE; - virtual void Reset() OVERRIDE; + const uint8* buf, int size) override; + virtual void Flush() override; + virtual void Reset() override; private: // Emit a reassembled PES packet. diff --git a/media/formats/mp2t/ts_section_pmt.h b/media/formats/mp2t/ts_section_pmt.h index c1b3d46..1d17c06 100644 --- a/media/formats/mp2t/ts_section_pmt.h +++ b/media/formats/mp2t/ts_section_pmt.h @@ -24,8 +24,8 @@ class TsSectionPmt : public TsSectionPsi { virtual ~TsSectionPmt(); // Mpeg2TsPsiParser implementation. - virtual bool ParsePsiSection(BitReader* bit_reader) OVERRIDE; - virtual void ResetPsiSection() OVERRIDE; + virtual bool ParsePsiSection(BitReader* bit_reader) override; + virtual void ResetPsiSection() override; private: RegisterPesCb register_pes_cb_; diff --git a/media/formats/mp2t/ts_section_psi.h b/media/formats/mp2t/ts_section_psi.h index 1b81884..8db91bb 100644 --- a/media/formats/mp2t/ts_section_psi.h +++ b/media/formats/mp2t/ts_section_psi.h @@ -22,9 +22,9 @@ class TsSectionPsi : public TsSection { // TsSection implementation. virtual bool Parse(bool payload_unit_start_indicator, - const uint8* buf, int size) OVERRIDE; - virtual void Flush() OVERRIDE; - virtual void Reset() OVERRIDE; + const uint8* buf, int size) override; + virtual void Flush() override; + virtual void Reset() override; // Parse the content of the PSI section. virtual bool ParsePsiSection(BitReader* bit_reader) = 0; diff --git a/media/formats/mp4/box_definitions.h b/media/formats/mp4/box_definitions.h index f823fee..89522a1 100644 --- a/media/formats/mp4/box_definitions.h +++ b/media/formats/mp4/box_definitions.h @@ -33,8 +33,8 @@ enum SampleFlags { #define DECLARE_BOX_METHODS(T) \ T(); \ virtual ~T(); \ - virtual bool Parse(BoxReader* reader) OVERRIDE; \ - virtual FourCC BoxType() const OVERRIDE; \ + virtual bool Parse(BoxReader* reader) override; \ + virtual FourCC BoxType() const override; \ struct MEDIA_EXPORT FileType : Box { DECLARE_BOX_METHODS(FileType); diff --git a/media/formats/mp4/box_reader_unittest.cc b/media/formats/mp4/box_reader_unittest.cc index 77729b6..72a7765 100644 --- a/media/formats/mp4/box_reader_unittest.cc +++ b/media/formats/mp4/box_reader_unittest.cc @@ -31,19 +31,19 @@ static const uint8 kSkipBox[] = { 0x00 }; struct FreeBox : Box { - virtual bool Parse(BoxReader* reader) OVERRIDE { + virtual bool Parse(BoxReader* reader) override { return true; } - virtual FourCC BoxType() const OVERRIDE { return FOURCC_FREE; } + virtual FourCC BoxType() const override { return FOURCC_FREE; } }; struct PsshBox : Box { uint32 val; - virtual bool Parse(BoxReader* reader) OVERRIDE { + virtual bool Parse(BoxReader* reader) override { return reader->Read4(&val); } - virtual FourCC BoxType() const OVERRIDE { return FOURCC_PSSH; } + virtual FourCC BoxType() const override { return FOURCC_PSSH; } }; struct SkipBox : Box { @@ -55,7 +55,7 @@ struct SkipBox : Box { std::vector<PsshBox> kids; FreeBox mpty; - virtual bool Parse(BoxReader* reader) OVERRIDE { + virtual bool Parse(BoxReader* reader) override { RCHECK(reader->ReadFullBoxHeader() && reader->Read1(&a) && reader->Read1(&b) && @@ -66,7 +66,7 @@ struct SkipBox : Box { reader->ReadChildren(&kids) && reader->MaybeReadChild(&mpty); } - virtual FourCC BoxType() const OVERRIDE { return FOURCC_SKIP; } + virtual FourCC BoxType() const override { return FOURCC_SKIP; } SkipBox(); virtual ~SkipBox(); diff --git a/media/formats/mp4/mp4_stream_parser.h b/media/formats/mp4/mp4_stream_parser.h index bf7bfa0..b8439bc 100644 --- a/media/formats/mp4/mp4_stream_parser.h +++ b/media/formats/mp4/mp4_stream_parser.h @@ -34,9 +34,9 @@ class MEDIA_EXPORT MP4StreamParser : public StreamParser { const NeedKeyCB& need_key_cb, const NewMediaSegmentCB& new_segment_cb, const base::Closure& end_of_segment_cb, - const LogCB& log_cb) OVERRIDE; - virtual void Flush() OVERRIDE; - virtual bool Parse(const uint8* buf, int size) OVERRIDE; + const LogCB& log_cb) override; + virtual void Flush() override; + virtual bool Parse(const uint8* buf, int size) override; private: enum State { diff --git a/media/formats/mpeg/adts_stream_parser.h b/media/formats/mpeg/adts_stream_parser.h index e036d8d..30354dc 100644 --- a/media/formats/mpeg/adts_stream_parser.h +++ b/media/formats/mpeg/adts_stream_parser.h @@ -24,7 +24,7 @@ class MEDIA_EXPORT ADTSStreamParser : public MPEGAudioStreamParserBase { int* sample_rate, ChannelLayout* channel_layout, int* sample_count, - bool* metadata_frame) const OVERRIDE; + bool* metadata_frame) const override; DISALLOW_COPY_AND_ASSIGN(ADTSStreamParser); }; diff --git a/media/formats/mpeg/mpeg1_audio_stream_parser.h b/media/formats/mpeg/mpeg1_audio_stream_parser.h index a5f9826..0f33f50 100644 --- a/media/formats/mpeg/mpeg1_audio_stream_parser.h +++ b/media/formats/mpeg/mpeg1_audio_stream_parser.h @@ -78,7 +78,7 @@ class MEDIA_EXPORT MPEG1AudioStreamParser : public MPEGAudioStreamParserBase { int* sample_rate, ChannelLayout* channel_layout, int* sample_count, - bool* metadata_frame) const OVERRIDE; + bool* metadata_frame) const override; DISALLOW_COPY_AND_ASSIGN(MPEG1AudioStreamParser); }; diff --git a/media/formats/mpeg/mpeg_audio_stream_parser_base.h b/media/formats/mpeg/mpeg_audio_stream_parser_base.h index 31a1b7c..fde850a 100644 --- a/media/formats/mpeg/mpeg_audio_stream_parser_base.h +++ b/media/formats/mpeg/mpeg_audio_stream_parser_base.h @@ -38,9 +38,9 @@ class MEDIA_EXPORT MPEGAudioStreamParserBase : public StreamParser { const NeedKeyCB& need_key_cb, const NewMediaSegmentCB& new_segment_cb, const base::Closure& end_of_segment_cb, - const LogCB& log_cb) OVERRIDE; - virtual void Flush() OVERRIDE; - virtual bool Parse(const uint8* buf, int size) OVERRIDE; + const LogCB& log_cb) override; + virtual void Flush() override; + virtual bool Parse(const uint8* buf, int size) override; protected: // Subclasses implement this method to parse format specific frame headers. diff --git a/media/formats/webm/webm_audio_client.h b/media/formats/webm/webm_audio_client.h index a723b0d..df274f1 100644 --- a/media/formats/webm/webm_audio_client.h +++ b/media/formats/webm/webm_audio_client.h @@ -38,8 +38,8 @@ class WebMAudioClient : public WebMParserClient { private: // WebMParserClient implementation. - virtual bool OnUInt(int id, int64 val) OVERRIDE; - virtual bool OnFloat(int id, double val) OVERRIDE; + virtual bool OnUInt(int id, int64 val) override; + virtual bool OnFloat(int id, double val) override; LogCB log_cb_; int channels_; diff --git a/media/formats/webm/webm_cluster_parser.h b/media/formats/webm/webm_cluster_parser.h index 1f18205..d7d78cb 100644 --- a/media/formats/webm/webm_cluster_parser.h +++ b/media/formats/webm/webm_cluster_parser.h @@ -191,10 +191,10 @@ class MEDIA_EXPORT WebMClusterParser : public WebMParserClient { private: // WebMParserClient methods. - virtual WebMParserClient* OnListStart(int id) OVERRIDE; - virtual bool OnListEnd(int id) OVERRIDE; - virtual bool OnUInt(int id, int64 val) OVERRIDE; - virtual bool OnBinary(int id, const uint8* data, int size) OVERRIDE; + virtual WebMParserClient* OnListStart(int id) override; + virtual bool OnListEnd(int id) override; + virtual bool OnUInt(int id, int64 val) override; + virtual bool OnBinary(int id, const uint8* data, int size) override; bool ParseBlock(bool is_simple_block, const uint8* buf, int size, const uint8* additional, int additional_size, int duration, diff --git a/media/formats/webm/webm_content_encodings_client.h b/media/formats/webm/webm_content_encodings_client.h index d00281e..5421bbc 100644 --- a/media/formats/webm/webm_content_encodings_client.h +++ b/media/formats/webm/webm_content_encodings_client.h @@ -28,10 +28,10 @@ class MEDIA_EXPORT WebMContentEncodingsClient : public WebMParserClient { const ContentEncodings& content_encodings() const; // WebMParserClient methods - virtual WebMParserClient* OnListStart(int id) OVERRIDE; - virtual bool OnListEnd(int id) OVERRIDE; - virtual bool OnUInt(int id, int64 val) OVERRIDE; - virtual bool OnBinary(int id, const uint8* data, int size) OVERRIDE; + virtual WebMParserClient* OnListStart(int id) override; + virtual bool OnListEnd(int id) override; + virtual bool OnUInt(int id, int64 val) override; + virtual bool OnBinary(int id, const uint8* data, int size) override; private: LogCB log_cb_; diff --git a/media/formats/webm/webm_info_parser.h b/media/formats/webm/webm_info_parser.h index 36aac92..f129f4e1 100644 --- a/media/formats/webm/webm_info_parser.h +++ b/media/formats/webm/webm_info_parser.h @@ -31,12 +31,12 @@ class MEDIA_EXPORT WebMInfoParser : public WebMParserClient { private: // WebMParserClient methods - virtual WebMParserClient* OnListStart(int id) OVERRIDE; - virtual bool OnListEnd(int id) OVERRIDE; - virtual bool OnUInt(int id, int64 val) OVERRIDE; - virtual bool OnFloat(int id, double val) OVERRIDE; - virtual bool OnBinary(int id, const uint8* data, int size) OVERRIDE; - virtual bool OnString(int id, const std::string& str) OVERRIDE; + virtual WebMParserClient* OnListStart(int id) override; + virtual bool OnListEnd(int id) override; + virtual bool OnUInt(int id, int64 val) override; + virtual bool OnFloat(int id, double val) override; + virtual bool OnBinary(int id, const uint8* data, int size) override; + virtual bool OnString(int id, const std::string& str) override; int64 timecode_scale_; double duration_; diff --git a/media/formats/webm/webm_stream_parser.h b/media/formats/webm/webm_stream_parser.h index 8a41f37..7a99f3a 100644 --- a/media/formats/webm/webm_stream_parser.h +++ b/media/formats/webm/webm_stream_parser.h @@ -29,9 +29,9 @@ class WebMStreamParser : public StreamParser { const NeedKeyCB& need_key_cb, const NewMediaSegmentCB& new_segment_cb, const base::Closure& end_of_segment_cb, - const LogCB& log_cb) OVERRIDE; - virtual void Flush() OVERRIDE; - virtual bool Parse(const uint8* buf, int size) OVERRIDE; + const LogCB& log_cb) override; + virtual void Flush() override; + virtual bool Parse(const uint8* buf, int size) override; private: enum State { diff --git a/media/formats/webm/webm_tracks_parser.h b/media/formats/webm/webm_tracks_parser.h index d1639e5..2b9d350 100644 --- a/media/formats/webm/webm_tracks_parser.h +++ b/media/formats/webm/webm_tracks_parser.h @@ -75,12 +75,12 @@ class MEDIA_EXPORT WebMTracksParser : public WebMParserClient { private: // WebMParserClient implementation. - virtual WebMParserClient* OnListStart(int id) OVERRIDE; - virtual bool OnListEnd(int id) OVERRIDE; - virtual bool OnUInt(int id, int64 val) OVERRIDE; - virtual bool OnFloat(int id, double val) OVERRIDE; - virtual bool OnBinary(int id, const uint8* data, int size) OVERRIDE; - virtual bool OnString(int id, const std::string& str) OVERRIDE; + virtual WebMParserClient* OnListStart(int id) override; + virtual bool OnListEnd(int id) override; + virtual bool OnUInt(int id, int64 val) override; + virtual bool OnFloat(int id, double val) override; + virtual bool OnBinary(int id, const uint8* data, int size) override; + virtual bool OnString(int id, const std::string& str) override; int64 track_type_; int64 track_num_; diff --git a/media/formats/webm/webm_video_client.h b/media/formats/webm/webm_video_client.h index 5545e0a..73e3955 100644 --- a/media/formats/webm/webm_video_client.h +++ b/media/formats/webm/webm_video_client.h @@ -37,9 +37,9 @@ class WebMVideoClient : public WebMParserClient { private: // WebMParserClient implementation. - virtual bool OnUInt(int id, int64 val) OVERRIDE; - virtual bool OnBinary(int id, const uint8* data, int size) OVERRIDE; - virtual bool OnFloat(int id, double val) OVERRIDE; + virtual bool OnUInt(int id, int64 val) override; + virtual bool OnBinary(int id, const uint8* data, int size) override; + virtual bool OnFloat(int id, double val) override; LogCB log_cb_; int64 pixel_width_; diff --git a/media/midi/midi_manager_alsa.h b/media/midi/midi_manager_alsa.h index c523bb9..c59beef 100644 --- a/media/midi/midi_manager_alsa.h +++ b/media/midi/midi_manager_alsa.h @@ -23,11 +23,11 @@ class MidiManagerAlsa : public MidiManager { virtual ~MidiManagerAlsa(); // MidiManager implementation. - virtual void StartInitialization() OVERRIDE; + virtual void StartInitialization() override; virtual void DispatchSendMidiData(MidiManagerClient* client, uint32 port_index, const std::vector<uint8>& data, - double timestamp) OVERRIDE; + double timestamp) override; private: // An internal callback that runs on MidiSendThread. diff --git a/media/midi/midi_manager_mac.h b/media/midi/midi_manager_mac.h index 5c514ff..30581d7 100644 --- a/media/midi/midi_manager_mac.h +++ b/media/midi/midi_manager_mac.h @@ -24,11 +24,11 @@ class MEDIA_EXPORT MidiManagerMac : public MidiManager { virtual ~MidiManagerMac(); // MidiManager implementation. - virtual void StartInitialization() OVERRIDE; + virtual void StartInitialization() override; virtual void DispatchSendMidiData(MidiManagerClient* client, uint32 port_index, const std::vector<uint8>& data, - double timestamp) OVERRIDE; + double timestamp) override; private: // CoreMIDI callback for MIDI data. diff --git a/media/midi/midi_manager_unittest.cc b/media/midi/midi_manager_unittest.cc index 0350813..2e9127e 100644 --- a/media/midi/midi_manager_unittest.cc +++ b/media/midi/midi_manager_unittest.cc @@ -22,14 +22,14 @@ class FakeMidiManager : public MidiManager { virtual ~FakeMidiManager() {} // MidiManager implementation. - virtual void StartInitialization() OVERRIDE { + virtual void StartInitialization() override { start_initialization_is_called_ = true; } virtual void DispatchSendMidiData(MidiManagerClient* client, uint32 port_index, const std::vector<uint8>& data, - double timestamp) OVERRIDE {} + double timestamp) override {} // Utility functions for testing. void CallCompleteInitialization(MidiResult result) { @@ -59,7 +59,7 @@ class FakeMidiManagerClient : public MidiManagerClient { virtual ~FakeMidiManagerClient() {} // MidiManagerClient implementation. - virtual void CompleteStartSession(int client_id, MidiResult result) OVERRIDE { + virtual void CompleteStartSession(int client_id, MidiResult result) override { EXPECT_TRUE(wait_for_result_); CHECK_EQ(client_id_, client_id); result_ = result; @@ -67,8 +67,8 @@ class FakeMidiManagerClient : public MidiManagerClient { } virtual void ReceiveMidiData(uint32 port_index, const uint8* data, - size_t size, double timestamp) OVERRIDE {} - virtual void AccumulateMidiBytesSent(size_t size) OVERRIDE {} + size_t size, double timestamp) override {} + virtual void AccumulateMidiBytesSent(size_t size) override {} int client_id() const { return client_id_; } MidiResult result() const { return result_; } diff --git a/media/midi/midi_manager_usb.h b/media/midi/midi_manager_usb.h index 694a051..ccc0222 100644 --- a/media/midi/midi_manager_usb.h +++ b/media/midi/midi_manager_usb.h @@ -32,24 +32,24 @@ class MEDIA_EXPORT MidiManagerUsb : public MidiManager, virtual ~MidiManagerUsb(); // MidiManager implementation. - virtual void StartInitialization() OVERRIDE; + virtual void StartInitialization() override; virtual void DispatchSendMidiData(MidiManagerClient* client, uint32 port_index, const std::vector<uint8>& data, - double timestamp) OVERRIDE; + double timestamp) override; // UsbMidiDeviceDelegate implementation. virtual void ReceiveUsbMidiData(UsbMidiDevice* device, int endpoint_number, const uint8* data, size_t size, - base::TimeTicks time) OVERRIDE; + base::TimeTicks time) override; // UsbMidiInputStream::Delegate implementation. virtual void OnReceivedData(size_t jack_index, const uint8* data, size_t size, - base::TimeTicks time) OVERRIDE; + base::TimeTicks time) override; const ScopedVector<UsbMidiOutputStream>& output_streams() const { return output_streams_; diff --git a/media/midi/midi_manager_usb_unittest.cc b/media/midi/midi_manager_usb_unittest.cc index 88bfd93..dda6775 100644 --- a/media/midi/midi_manager_usb_unittest.cc +++ b/media/midi/midi_manager_usb_unittest.cc @@ -45,13 +45,13 @@ class FakeUsbMidiDevice : public UsbMidiDevice { explicit FakeUsbMidiDevice(Logger* logger) : logger_(logger) {} virtual ~FakeUsbMidiDevice() {} - virtual std::vector<uint8> GetDescriptor() OVERRIDE { + virtual std::vector<uint8> GetDescriptor() override { logger_->AddLog("UsbMidiDevice::GetDescriptor\n"); return descriptor_; } virtual void Send(int endpoint_number, - const std::vector<uint8>& data) OVERRIDE { + const std::vector<uint8>& data) override { logger_->AddLog("UsbMidiDevice::Send "); logger_->AddLog(base::StringPrintf("endpoint = %d data =", endpoint_number)); @@ -79,7 +79,7 @@ class FakeMidiManagerClient : public MidiManagerClient { logger_(logger) {} virtual ~FakeMidiManagerClient() {} - virtual void CompleteStartSession(int client_id, MidiResult result) OVERRIDE { + virtual void CompleteStartSession(int client_id, MidiResult result) override { complete_start_session_ = true; result_ = result; } @@ -87,7 +87,7 @@ class FakeMidiManagerClient : public MidiManagerClient { virtual void ReceiveMidiData(uint32 port_index, const uint8* data, size_t size, - double timestamp) OVERRIDE { + double timestamp) override { logger_->AddLog("MidiManagerClient::ReceiveMidiData "); logger_->AddLog(base::StringPrintf("port_index = %d data =", port_index)); for (size_t i = 0; i < size; ++i) @@ -95,7 +95,7 @@ class FakeMidiManagerClient : public MidiManagerClient { logger_->AddLog("\n"); } - virtual void AccumulateMidiBytesSent(size_t size) OVERRIDE { + virtual void AccumulateMidiBytesSent(size_t size) override { logger_->AddLog("MidiManagerClient::AccumulateMidiBytesSent "); // Windows has no "%zu". logger_->AddLog(base::StringPrintf("size = %u\n", @@ -116,7 +116,7 @@ class TestUsbMidiDeviceFactory : public UsbMidiDevice::Factory { TestUsbMidiDeviceFactory() {} virtual ~TestUsbMidiDeviceFactory() {} virtual void EnumerateDevices(UsbMidiDeviceDelegate* device, - Callback callback) OVERRIDE { + Callback callback) override { callback_ = callback; } diff --git a/media/midi/midi_manager_win.h b/media/midi/midi_manager_win.h index 8a951f8..63096ab 100644 --- a/media/midi/midi_manager_win.h +++ b/media/midi/midi_manager_win.h @@ -20,11 +20,11 @@ class MidiManagerWin : public MidiManager { virtual ~MidiManagerWin(); // MidiManager implementation. - virtual void StartInitialization() OVERRIDE; + virtual void StartInitialization() override; virtual void DispatchSendMidiData(MidiManagerClient* client, uint32 port_index, const std::vector<uint8>& data, - double timestamp) OVERRIDE; + double timestamp) override; private: class InDeviceInfo; diff --git a/media/midi/usb_midi_device_android.h b/media/midi/usb_midi_device_android.h index 70d1855..053e50e 100644 --- a/media/midi/usb_midi_device_android.h +++ b/media/midi/usb_midi_device_android.h @@ -26,9 +26,9 @@ class MEDIA_EXPORT UsbMidiDeviceAndroid : public UsbMidiDevice { virtual ~UsbMidiDeviceAndroid(); // UsbMidiDevice implementation. - virtual std::vector<uint8> GetDescriptor() OVERRIDE; + virtual std::vector<uint8> GetDescriptor() override; virtual void Send(int endpoint_number, - const std::vector<uint8>& data) OVERRIDE; + const std::vector<uint8>& data) override; // Called by the Java world. void OnData(JNIEnv* env, diff --git a/media/midi/usb_midi_device_factory_android.h b/media/midi/usb_midi_device_factory_android.h index 63a9eb3..fb1792e 100644 --- a/media/midi/usb_midi_device_factory_android.h +++ b/media/midi/usb_midi_device_factory_android.h @@ -26,7 +26,7 @@ class MEDIA_EXPORT UsbMidiDeviceFactoryAndroid : public UsbMidiDevice::Factory { // UsbMidiDevice::Factory implementation. virtual void EnumerateDevices(UsbMidiDeviceDelegate* delegate, - Callback callback) OVERRIDE; + Callback callback) override; void OnUsbMidiDeviceRequestDone(JNIEnv* env, jobject caller, diff --git a/media/midi/usb_midi_input_stream_unittest.cc b/media/midi/usb_midi_input_stream_unittest.cc index 7dadba2..9846cfa 100644 --- a/media/midi/usb_midi_input_stream_unittest.cc +++ b/media/midi/usb_midi_input_stream_unittest.cc @@ -23,11 +23,11 @@ class TestUsbMidiDevice : public UsbMidiDevice { public: TestUsbMidiDevice() {} virtual ~TestUsbMidiDevice() {} - virtual std::vector<uint8> GetDescriptor() OVERRIDE { + virtual std::vector<uint8> GetDescriptor() override { return std::vector<uint8>(); } virtual void Send(int endpoint_number, - const std::vector<uint8>& data) OVERRIDE {} + const std::vector<uint8>& data) override {} private: DISALLOW_COPY_AND_ASSIGN(TestUsbMidiDevice); @@ -40,7 +40,7 @@ class MockDelegate : public UsbMidiInputStream::Delegate { virtual void OnReceivedData(size_t jack_index, const uint8* data, size_t size, - base::TimeTicks time) OVERRIDE { + base::TimeTicks time) override { for (size_t i = 0; i < size; ++i) received_data_ += base::StringPrintf("0x%02x ", data[i]); received_data_ += "\n"; diff --git a/media/midi/usb_midi_output_stream_unittest.cc b/media/midi/usb_midi_output_stream_unittest.cc index 661d611..a8b4735 100644 --- a/media/midi/usb_midi_output_stream_unittest.cc +++ b/media/midi/usb_midi_output_stream_unittest.cc @@ -26,12 +26,12 @@ class MockUsbMidiDevice : public UsbMidiDevice { MockUsbMidiDevice() {} virtual ~MockUsbMidiDevice() {} - virtual std::vector<uint8> GetDescriptor() OVERRIDE { + virtual std::vector<uint8> GetDescriptor() override { return std::vector<uint8>(); } virtual void Send(int endpoint_number, const std::vector<uint8>& data) - OVERRIDE { + override { for (size_t i = 0; i < data.size(); ++i) { log_ += base::StringPrintf("0x%02x ", data[i]); } diff --git a/media/mojo/services/mojo_demuxer_stream_adapter.h b/media/mojo/services/mojo_demuxer_stream_adapter.h index 1e792da..89ecfb5 100644 --- a/media/mojo/services/mojo_demuxer_stream_adapter.h +++ b/media/mojo/services/mojo_demuxer_stream_adapter.h @@ -32,18 +32,18 @@ class MojoDemuxerStreamAdapter : public media::DemuxerStream, virtual ~MojoDemuxerStreamAdapter(); // media::DemuxerStream implementation. - virtual void Read(const ReadCB& read_cb) OVERRIDE; - virtual AudioDecoderConfig audio_decoder_config() OVERRIDE; - virtual VideoDecoderConfig video_decoder_config() OVERRIDE; - virtual Type type() OVERRIDE; - virtual void EnableBitstreamConverter() OVERRIDE; - virtual bool SupportsConfigChanges() OVERRIDE; - virtual VideoRotation video_rotation() OVERRIDE; + virtual void Read(const ReadCB& read_cb) override; + virtual AudioDecoderConfig audio_decoder_config() override; + virtual VideoDecoderConfig video_decoder_config() override; + virtual Type type() override; + virtual void EnableBitstreamConverter() override; + virtual bool SupportsConfigChanges() override; + virtual VideoRotation video_rotation() override; // mojo::DemuxerStreamClient implementation. - virtual void OnStreamReady(mojo::ScopedDataPipeConsumerHandle pipe) OVERRIDE; + virtual void OnStreamReady(mojo::ScopedDataPipeConsumerHandle pipe) override; virtual void OnAudioDecoderConfigChanged( - mojo::AudioDecoderConfigPtr config) OVERRIDE; + mojo::AudioDecoderConfigPtr config) override; private: // The callback from |demuxer_stream_| that a read operation has completed. diff --git a/media/mojo/services/mojo_demuxer_stream_impl.h b/media/mojo/services/mojo_demuxer_stream_impl.h index 62dbfd2..85b0c17 100644 --- a/media/mojo/services/mojo_demuxer_stream_impl.h +++ b/media/mojo/services/mojo_demuxer_stream_impl.h @@ -26,10 +26,10 @@ class MojoDemuxerStreamImpl : public mojo::InterfaceImpl<mojo::DemuxerStream> { // mojo::DemuxerStream implementation. virtual void Read(const mojo::Callback< void(mojo::DemuxerStream::Status, mojo::MediaDecoderBufferPtr)>& callback) - OVERRIDE; + override; // mojo::InterfaceImpl overrides. - virtual void OnConnectionEstablished() OVERRIDE; + virtual void OnConnectionEstablished() override; private: // |callback| is the callback that was passed to the initiating Read() diff --git a/media/mojo/services/mojo_renderer_service.cc b/media/mojo/services/mojo_renderer_service.cc index 5109a42..b4557b8 100644 --- a/media/mojo/services/mojo_renderer_service.cc +++ b/media/mojo/services/mojo_renderer_service.cc @@ -28,7 +28,7 @@ class MojoRendererApplication public: // mojo::ApplicationDelegate implementation. virtual bool ConfigureIncomingConnection( - mojo::ApplicationConnection* connection) OVERRIDE { + mojo::ApplicationConnection* connection) override { connection->AddService(this); return true; } @@ -36,7 +36,7 @@ class MojoRendererApplication // mojo::InterfaceFactory<mojo::MediaRenderer> implementation. virtual void Create( mojo::ApplicationConnection* connection, - mojo::InterfaceRequest<mojo::MediaRenderer> request) OVERRIDE { + mojo::InterfaceRequest<mojo::MediaRenderer> request) override { mojo::BindToRequest(new MojoRendererService(connection), &request); } }; diff --git a/media/mojo/services/renderer_unittest.cc b/media/mojo/services/renderer_unittest.cc index e9fbb67..830592d 100644 --- a/media/mojo/services/renderer_unittest.cc +++ b/media/mojo/services/renderer_unittest.cc @@ -28,7 +28,7 @@ class MojoRendererTestHelper : public mojo::ApplicationDelegate { virtual ~MojoRendererTestHelper() {} // ApplicationDelegate implementation. - virtual void Initialize(mojo::ApplicationImpl* app) OVERRIDE { + virtual void Initialize(mojo::ApplicationImpl* app) override { application_impl_ = app; } @@ -53,18 +53,18 @@ class FakeDemuxerStream : public media::DemuxerStreamProvider, // media::Demuxer implementation. virtual media::DemuxerStream* GetStream( - media::DemuxerStream::Type type) OVERRIDE { + media::DemuxerStream::Type type) override { DCHECK_EQ(media::DemuxerStream::AUDIO, type); return this; } - virtual media::DemuxerStreamProvider::Liveness GetLiveness() const OVERRIDE { + virtual media::DemuxerStreamProvider::Liveness GetLiveness() const override { return media::DemuxerStreamProvider::LIVENESS_UNKNOWN; } // media::DemuxerStream implementation. - virtual void Read(const ReadCB& read_cb) OVERRIDE {} + virtual void Read(const ReadCB& read_cb) override {} - virtual media::AudioDecoderConfig audio_decoder_config() OVERRIDE { + virtual media::AudioDecoderConfig audio_decoder_config() override { media::AudioDecoderConfig config; config.Initialize(media::kCodecAAC, media::kSampleFormatU8, @@ -79,20 +79,20 @@ class FakeDemuxerStream : public media::DemuxerStreamProvider, return config; } - virtual media::VideoDecoderConfig video_decoder_config() OVERRIDE { + virtual media::VideoDecoderConfig video_decoder_config() override { NOTREACHED(); return media::VideoDecoderConfig(); } - virtual media::DemuxerStream::Type type() OVERRIDE { + virtual media::DemuxerStream::Type type() override { return media::DemuxerStream::AUDIO; } - virtual void EnableBitstreamConverter() OVERRIDE {} + virtual void EnableBitstreamConverter() override {} - virtual bool SupportsConfigChanges() OVERRIDE { return true; } + virtual bool SupportsConfigChanges() override { return true; } - virtual media::VideoRotation video_rotation() OVERRIDE { + virtual media::VideoRotation video_rotation() override { NOTREACHED(); return media::VIDEO_ROTATION_0; } @@ -109,7 +109,7 @@ class MojoRendererTest : public testing::Test { public: MojoRendererTest() : service_provider_(NULL) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { demuxer_stream_provider_.reset(new FakeDemuxerStream()); service_provider_ = g_test_delegate->application_impl() diff --git a/media/tools/player_x11/data_source_logger.h b/media/tools/player_x11/data_source_logger.h index 1cb0a80..df8840f 100644 --- a/media/tools/player_x11/data_source_logger.h +++ b/media/tools/player_x11/data_source_logger.h @@ -22,13 +22,13 @@ class DataSourceLogger : public media::DataSource { virtual ~DataSourceLogger(); // media::DataSource implementation. - virtual void Stop() OVERRIDE; + virtual void Stop() override; virtual void Read( int64 position, int size, uint8* data, - const media::DataSource::ReadCB& read_cb) OVERRIDE; - virtual bool GetSize(int64* size_out) OVERRIDE; - virtual bool IsStreaming() OVERRIDE; - virtual void SetBitrate(int bitrate) OVERRIDE; + const media::DataSource::ReadCB& read_cb) override; + virtual bool GetSize(int64* size_out) override; + virtual bool IsStreaming() override; + virtual void SetBitrate(int bitrate) override; private: scoped_ptr<media::DataSource> data_source_; diff --git a/media/video/capture/android/video_capture_device_android.h b/media/video/capture/android/video_capture_device_android.h index 1a2e8b8..f3a2e93 100644 --- a/media/video/capture/android/video_capture_device_android.h +++ b/media/video/capture/android/video_capture_device_android.h @@ -43,8 +43,8 @@ class MEDIA_EXPORT VideoCaptureDeviceAndroid : public VideoCaptureDevice { // VideoCaptureDevice implementation. virtual void AllocateAndStart(const VideoCaptureParams& params, - scoped_ptr<Client> client) OVERRIDE; - virtual void StopAndDeAllocate() OVERRIDE; + scoped_ptr<Client> client) override; + virtual void StopAndDeAllocate() override; // Implement org.chromium.media.VideoCapture.nativeOnFrameAvailable. void OnFrameAvailable( diff --git a/media/video/capture/android/video_capture_device_factory_android.h b/media/video/capture/android/video_capture_device_factory_android.h index d87416f..415b802 100644 --- a/media/video/capture/android/video_capture_device_factory_android.h +++ b/media/video/capture/android/video_capture_device_factory_android.h @@ -34,11 +34,11 @@ class MEDIA_EXPORT VideoCaptureDeviceFactoryAndroid : virtual ~VideoCaptureDeviceFactoryAndroid() {} virtual scoped_ptr<VideoCaptureDevice> Create( - const VideoCaptureDevice::Name& device_name) OVERRIDE; - virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) OVERRIDE; + const VideoCaptureDevice::Name& device_name) override; + virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) override; virtual void GetDeviceSupportedFormats( const VideoCaptureDevice::Name& device, - VideoCaptureFormats* supported_formats) OVERRIDE; + VideoCaptureFormats* supported_formats) override; private: diff --git a/media/video/capture/fake_video_capture_device.h b/media/video/capture/fake_video_capture_device.h index 96264e8..c04ae24 100644 --- a/media/video/capture/fake_video_capture_device.h +++ b/media/video/capture/fake_video_capture_device.h @@ -28,8 +28,8 @@ class MEDIA_EXPORT FakeVideoCaptureDevice : public VideoCaptureDevice { // VideoCaptureDevice implementation. virtual void AllocateAndStart( const VideoCaptureParams& params, - scoped_ptr<VideoCaptureDevice::Client> client) OVERRIDE; - virtual void StopAndDeAllocate() OVERRIDE; + scoped_ptr<VideoCaptureDevice::Client> client) override; + virtual void StopAndDeAllocate() override; // Sets the formats to use sequentially when the device is configured as // variable capture resolution. Works only before AllocateAndStart() or diff --git a/media/video/capture/fake_video_capture_device_factory.h b/media/video/capture/fake_video_capture_device_factory.h index 5c7312b..a45dfa3 100644 --- a/media/video/capture/fake_video_capture_device_factory.h +++ b/media/video/capture/fake_video_capture_device_factory.h @@ -20,11 +20,11 @@ class MEDIA_EXPORT FakeVideoCaptureDeviceFactory : virtual ~FakeVideoCaptureDeviceFactory() {} virtual scoped_ptr<VideoCaptureDevice> Create( - const VideoCaptureDevice::Name& device_name) OVERRIDE; - virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) OVERRIDE; + const VideoCaptureDevice::Name& device_name) override; + virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) override; virtual void GetDeviceSupportedFormats( const VideoCaptureDevice::Name& device, - VideoCaptureFormats* supported_formats) OVERRIDE; + VideoCaptureFormats* supported_formats) override; void set_number_of_devices(int number_of_devices) { DCHECK(thread_checker_.CalledOnValidThread()); diff --git a/media/video/capture/fake_video_capture_device_unittest.cc b/media/video/capture/fake_video_capture_device_unittest.cc index 02b075b..9942220 100644 --- a/media/video/capture/fake_video_capture_device_unittest.cc +++ b/media/video/capture/fake_video_capture_device_unittest.cc @@ -29,7 +29,7 @@ class MockClient : public media::VideoCaptureDevice::Client { explicit MockClient(base::Callback<void(const VideoCaptureFormat&)> frame_cb) : main_thread_(base::MessageLoopProxy::current()), frame_cb_(frame_cb) {} - virtual void OnError(const std::string& error_message) OVERRIDE { + virtual void OnError(const std::string& error_message) override { OnErr(); } @@ -37,7 +37,7 @@ class MockClient : public media::VideoCaptureDevice::Client { int length, const VideoCaptureFormat& format, int rotation, - base::TimeTicks timestamp) OVERRIDE { + base::TimeTicks timestamp) override { main_thread_->PostTask(FROM_HERE, base::Bind(frame_cb_, format)); } @@ -45,7 +45,7 @@ class MockClient : public media::VideoCaptureDevice::Client { const scoped_refptr<Buffer>& buffer, const media::VideoCaptureFormat& buffer_format, const scoped_refptr<media::VideoFrame>& frame, - base::TimeTicks timestamp) OVERRIDE { + base::TimeTicks timestamp) override { NOTREACHED(); } diff --git a/media/video/capture/file_video_capture_device.h b/media/video/capture/file_video_capture_device.h index e2e066b..85c63d9 100644 --- a/media/video/capture/file_video_capture_device.h +++ b/media/video/capture/file_video_capture_device.h @@ -38,8 +38,8 @@ class MEDIA_EXPORT FileVideoCaptureDevice : public VideoCaptureDevice { virtual ~FileVideoCaptureDevice(); virtual void AllocateAndStart( const VideoCaptureParams& params, - scoped_ptr<VideoCaptureDevice::Client> client) OVERRIDE; - virtual void StopAndDeAllocate() OVERRIDE; + scoped_ptr<VideoCaptureDevice::Client> client) override; + virtual void StopAndDeAllocate() override; private: // Returns size in bytes of an I420 frame, not including possible paddings, diff --git a/media/video/capture/file_video_capture_device_factory.h b/media/video/capture/file_video_capture_device_factory.h index 986a266..a696abe 100644 --- a/media/video/capture/file_video_capture_device_factory.h +++ b/media/video/capture/file_video_capture_device_factory.h @@ -19,11 +19,11 @@ class MEDIA_EXPORT FileVideoCaptureDeviceFactory : virtual ~FileVideoCaptureDeviceFactory() {} virtual scoped_ptr<VideoCaptureDevice> Create( - const VideoCaptureDevice::Name& device_name) OVERRIDE; - virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) OVERRIDE; + const VideoCaptureDevice::Name& device_name) override; + virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) override; virtual void GetDeviceSupportedFormats( const VideoCaptureDevice::Name& device, - VideoCaptureFormats* supported_formats) OVERRIDE; + VideoCaptureFormats* supported_formats) override; }; } // namespace media diff --git a/media/video/capture/linux/video_capture_device_chromeos.cc b/media/video/capture/linux/video_capture_device_chromeos.cc index 8758ea1..abbc3b2 100644 --- a/media/video/capture/linux/video_capture_device_chromeos.cc +++ b/media/video/capture/linux/video_capture_device_chromeos.cc @@ -45,10 +45,10 @@ class VideoCaptureDeviceChromeOS::ScreenObserverDelegate DCHECK(!capture_device_); } - virtual void OnDisplayAdded(const gfx::Display& /*new_display*/) OVERRIDE {} - virtual void OnDisplayRemoved(const gfx::Display& /*old_display*/) OVERRIDE {} + virtual void OnDisplayAdded(const gfx::Display& /*new_display*/) override {} + virtual void OnDisplayRemoved(const gfx::Display& /*old_display*/) override {} virtual void OnDisplayMetricsChanged(const gfx::Display& display, - uint32_t metrics) OVERRIDE { + uint32_t metrics) override { DCHECK(ui_task_runner_->BelongsToCurrentThread()); if (!(metrics & DISPLAY_METRIC_ROTATION)) return; diff --git a/media/video/capture/linux/video_capture_device_factory_linux.h b/media/video/capture/linux/video_capture_device_factory_linux.h index 9702cdd..47f8628 100644 --- a/media/video/capture/linux/video_capture_device_factory_linux.h +++ b/media/video/capture/linux/video_capture_device_factory_linux.h @@ -23,11 +23,11 @@ class MEDIA_EXPORT VideoCaptureDeviceFactoryLinux virtual ~VideoCaptureDeviceFactoryLinux(); virtual scoped_ptr<VideoCaptureDevice> Create( - const VideoCaptureDevice::Name& device_name) OVERRIDE; - virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) OVERRIDE; + const VideoCaptureDevice::Name& device_name) override; + virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) override; virtual void GetDeviceSupportedFormats( const VideoCaptureDevice::Name& device, - VideoCaptureFormats* supported_formats) OVERRIDE; + VideoCaptureFormats* supported_formats) override; private: scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_; diff --git a/media/video/capture/linux/video_capture_device_linux.h b/media/video/capture/linux/video_capture_device_linux.h index c6d1518..3efc050 100644 --- a/media/video/capture/linux/video_capture_device_linux.h +++ b/media/video/capture/linux/video_capture_device_linux.h @@ -31,9 +31,9 @@ class VideoCaptureDeviceLinux : public VideoCaptureDevice { // VideoCaptureDevice implementation. virtual void AllocateAndStart(const VideoCaptureParams& params, - scoped_ptr<Client> client) OVERRIDE; + scoped_ptr<Client> client) override; - virtual void StopAndDeAllocate() OVERRIDE; + virtual void StopAndDeAllocate() override; protected: void SetRotation(int rotation); diff --git a/media/video/capture/mac/video_capture_device_decklink_mac.h b/media/video/capture/mac/video_capture_device_decklink_mac.h index b70191a..13cc9d8 100644 --- a/media/video/capture/mac/video_capture_device_decklink_mac.h +++ b/media/video/capture/mac/video_capture_device_decklink_mac.h @@ -61,8 +61,8 @@ class MEDIA_EXPORT VideoCaptureDeviceDeckLinkMac : public VideoCaptureDevice { // VideoCaptureDevice implementation. virtual void AllocateAndStart( const VideoCaptureParams& params, - scoped_ptr<VideoCaptureDevice::Client> client) OVERRIDE; - virtual void StopAndDeAllocate() OVERRIDE; + scoped_ptr<VideoCaptureDevice::Client> client) override; + virtual void StopAndDeAllocate() override; // Protects concurrent setting and using of |client_|. base::Lock lock_; diff --git a/media/video/capture/mac/video_capture_device_decklink_mac.mm b/media/video/capture/mac/video_capture_device_decklink_mac.mm index 7906dd5..e51a3bd 100644 --- a/media/video/capture/mac/video_capture_device_decklink_mac.mm +++ b/media/video/capture/mac/video_capture_device_decklink_mac.mm @@ -60,15 +60,15 @@ class DeckLinkCaptureDelegate : virtual HRESULT VideoInputFormatChanged( BMDVideoInputFormatChangedEvents notification_events, IDeckLinkDisplayMode *new_display_mode, - BMDDetectedVideoInputFormatFlags detected_signal_flags) OVERRIDE; + BMDDetectedVideoInputFormatFlags detected_signal_flags) override; virtual HRESULT VideoInputFrameArrived( IDeckLinkVideoInputFrame* video_frame, - IDeckLinkAudioInputPacket* audio_packet) OVERRIDE; + IDeckLinkAudioInputPacket* audio_packet) override; // IUnknown interface implementation. - virtual HRESULT QueryInterface(REFIID iid, void** ppv) OVERRIDE; - virtual ULONG AddRef() OVERRIDE; - virtual ULONG Release() OVERRIDE; + virtual HRESULT QueryInterface(REFIID iid, void** ppv) override; + virtual ULONG AddRef() override; + virtual ULONG Release() override; // Forwarder to VideoCaptureDeviceDeckLinkMac::SendErrorString(). void SendErrorString(const std::string& reason); diff --git a/media/video/capture/mac/video_capture_device_factory_mac.h b/media/video/capture/mac/video_capture_device_factory_mac.h index 7bc8153..9756c12 100644 --- a/media/video/capture/mac/video_capture_device_factory_mac.h +++ b/media/video/capture/mac/video_capture_device_factory_mac.h @@ -22,13 +22,13 @@ class MEDIA_EXPORT VideoCaptureDeviceFactoryMac : virtual ~VideoCaptureDeviceFactoryMac(); virtual scoped_ptr<VideoCaptureDevice> Create( - const VideoCaptureDevice::Name& device_name) OVERRIDE; - virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) OVERRIDE; + const VideoCaptureDevice::Name& device_name) override; + virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) override; virtual void EnumerateDeviceNames(const base::Callback< - void(scoped_ptr<media::VideoCaptureDevice::Names>)>& callback) OVERRIDE; + void(scoped_ptr<media::VideoCaptureDevice::Names>)>& callback) override; virtual void GetDeviceSupportedFormats( const VideoCaptureDevice::Name& device, - VideoCaptureFormats* supported_formats) OVERRIDE; + VideoCaptureFormats* supported_formats) override; private: // Cache of |ui_task_runner| for enumerating devices there for QTKit. diff --git a/media/video/capture/mac/video_capture_device_mac.h b/media/video/capture/mac/video_capture_device_mac.h index 7bda9e3..ec902d3 100644 --- a/media/video/capture/mac/video_capture_device_mac.h +++ b/media/video/capture/mac/video_capture_device_mac.h @@ -61,8 +61,8 @@ class VideoCaptureDeviceMac : public VideoCaptureDevice { // VideoCaptureDevice implementation. virtual void AllocateAndStart( const VideoCaptureParams& params, - scoped_ptr<VideoCaptureDevice::Client> client) OVERRIDE; - virtual void StopAndDeAllocate() OVERRIDE; + scoped_ptr<VideoCaptureDevice::Client> client) override; + virtual void StopAndDeAllocate() override; bool Init(VideoCaptureDevice::Name::CaptureApiType capture_api_type); diff --git a/media/video/capture/video_capture_device_unittest.cc b/media/video/capture/video_capture_device_unittest.cc index 0abd90e..5b13464 100644 --- a/media/video/capture/video_capture_device_unittest.cc +++ b/media/video/capture/video_capture_device_unittest.cc @@ -72,7 +72,7 @@ class MockClient : public media::VideoCaptureDevice::Client { explicit MockClient(base::Callback<void(const VideoCaptureFormat&)> frame_cb) : main_thread_(base::MessageLoopProxy::current()), frame_cb_(frame_cb) {} - virtual void OnError(const std::string& error_message) OVERRIDE { + virtual void OnError(const std::string& error_message) override { OnErr(); } @@ -80,7 +80,7 @@ class MockClient : public media::VideoCaptureDevice::Client { int length, const VideoCaptureFormat& format, int rotation, - base::TimeTicks timestamp) OVERRIDE { + base::TimeTicks timestamp) override { main_thread_->PostTask(FROM_HERE, base::Bind(frame_cb_, format)); } @@ -88,7 +88,7 @@ class MockClient : public media::VideoCaptureDevice::Client { const scoped_refptr<Buffer>& buffer, const media::VideoCaptureFormat& buffer_format, const scoped_refptr<media::VideoFrame>& frame, - base::TimeTicks timestamp) OVERRIDE { + base::TimeTicks timestamp) override { NOTREACHED(); } diff --git a/media/video/capture/win/filter_base_win.cc b/media/video/capture/win/filter_base_win.cc index 768c486..50cbcff 100644 --- a/media/video/capture/win/filter_base_win.cc +++ b/media/video/capture/win/filter_base_win.cc @@ -9,7 +9,7 @@ namespace media { // Implement IEnumPins. -class PinEnumerator FINAL +class PinEnumerator final : public IEnumPins, public base::RefCounted<PinEnumerator> { public: diff --git a/media/video/capture/win/pin_base_win.cc b/media/video/capture/win/pin_base_win.cc index ef535e1..5f4611d 100644 --- a/media/video/capture/win/pin_base_win.cc +++ b/media/video/capture/win/pin_base_win.cc @@ -9,7 +9,7 @@ namespace media { // Implement IEnumPins. -class TypeEnumerator FINAL +class TypeEnumerator final : public IEnumMediaTypes, public base::RefCounted<TypeEnumerator> { public: diff --git a/media/video/capture/win/video_capture_device_factory_win.h b/media/video/capture/win/video_capture_device_factory_win.h index fdec127..849e1ad 100644 --- a/media/video/capture/win/video_capture_device_factory_win.h +++ b/media/video/capture/win/video_capture_device_factory_win.h @@ -22,11 +22,11 @@ class MEDIA_EXPORT VideoCaptureDeviceFactoryWin : virtual ~VideoCaptureDeviceFactoryWin() {} virtual scoped_ptr<VideoCaptureDevice> Create( - const VideoCaptureDevice::Name& device_name) OVERRIDE; - virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) OVERRIDE; + const VideoCaptureDevice::Name& device_name) override; + virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) override; virtual void GetDeviceSupportedFormats( const VideoCaptureDevice::Name& device, - VideoCaptureFormats* supported_formats) OVERRIDE; + VideoCaptureFormats* supported_formats) override; private: bool use_media_foundation_; diff --git a/media/video/capture/win/video_capture_device_mf_win.cc b/media/video/capture/win/video_capture_device_mf_win.cc index 0e199da..2fa25db 100644 --- a/media/video/capture/win/video_capture_device_mf_win.cc +++ b/media/video/capture/win/video_capture_device_mf_win.cc @@ -89,7 +89,7 @@ HRESULT FillCapabilities(IMFSourceReader* source, } -class MFReaderCallback FINAL +class MFReaderCallback final : public base::RefCountedThreadSafe<MFReaderCallback>, public IMFSourceReaderCallback { public: diff --git a/media/video/capture/win/video_capture_device_mf_win.h b/media/video/capture/win/video_capture_device_mf_win.h index 0d2c207..fc11d19 100644 --- a/media/video/capture/win/video_capture_device_mf_win.h +++ b/media/video/capture/win/video_capture_device_mf_win.h @@ -44,8 +44,8 @@ class MEDIA_EXPORT VideoCaptureDeviceMFWin // VideoCaptureDevice implementation. virtual void AllocateAndStart(const VideoCaptureParams& params, scoped_ptr<VideoCaptureDevice::Client> client) - OVERRIDE; - virtual void StopAndDeAllocate() OVERRIDE; + override; + virtual void StopAndDeAllocate() override; // Captured new video data. void OnIncomingCapturedData(const uint8* data, diff --git a/media/video/capture/win/video_capture_device_win.h b/media/video/capture/win/video_capture_device_win.h index 2518960..a52aba6a 100644 --- a/media/video/capture/win/video_capture_device_win.h +++ b/media/video/capture/win/video_capture_device_win.h @@ -71,8 +71,8 @@ class VideoCaptureDeviceWin // VideoCaptureDevice implementation. virtual void AllocateAndStart( const VideoCaptureParams& params, - scoped_ptr<VideoCaptureDevice::Client> client) OVERRIDE; - virtual void StopAndDeAllocate() OVERRIDE; + scoped_ptr<VideoCaptureDevice::Client> client) override; + virtual void StopAndDeAllocate() override; private: enum InternalState { |