diff options
165 files changed, 1171 insertions, 1250 deletions
diff --git a/media/audio/audio_device_thread.cc b/media/audio/audio_device_thread.cc index 98d1018..b9cd00f 100644 --- a/media/audio/audio_device_thread.cc +++ b/media/audio/audio_device_thread.cc @@ -42,10 +42,10 @@ class AudioDeviceThread::Thread private: friend class base::RefCountedThreadSafe<AudioDeviceThread::Thread>; - virtual ~Thread(); + ~Thread() override; // Overrides from PlatformThread::Delegate. - virtual void ThreadMain() override; + 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 3c3c327..4bacaa5 100644 --- a/media/audio/audio_input_controller.h +++ b/media/audio/audio_input_controller.h @@ -227,11 +227,11 @@ class MEDIA_EXPORT AudioInputController // AudioInputCallback implementation. Threading details depends on the // device-specific implementation. - virtual void OnData(AudioInputStream* stream, - const AudioBus* source, - uint32 hardware_delay_bytes, - double volume) override; - virtual void OnError(AudioInputStream* stream) override; + void OnData(AudioInputStream* stream, + const AudioBus* source, + uint32 hardware_delay_bytes, + double volume) override; + void OnError(AudioInputStream* stream) override; bool SharedMemoryAndSyncSocketMode() const { return sync_writer_ != NULL; } @@ -268,7 +268,7 @@ class MEDIA_EXPORT AudioInputController AudioInputController(EventHandler* handler, SyncWriter* sync_writer, UserInputMonitor* user_input_monitor); - virtual ~AudioInputController(); + ~AudioInputController() override; // Methods called on the audio thread (owned by the AudioManager). void DoCreate(AudioManager* audio_manager, diff --git a/media/audio/audio_input_device.cc b/media/audio/audio_input_device.cc index d54c72a..3735a5b 100644 --- a/media/audio/audio_input_device.cc +++ b/media/audio/audio_input_device.cc @@ -31,12 +31,12 @@ class AudioInputDevice::AudioThreadCallback int memory_length, int total_segments, CaptureCallback* capture_callback); - virtual ~AudioThreadCallback(); + ~AudioThreadCallback() override; - virtual void MapSharedMemory() override; + void MapSharedMemory() override; // Called whenever we receive notifications about pending data. - virtual void Process(int pending_data) override; + 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 b971176..abfca76 100644 --- a/media/audio/audio_input_device.h +++ b/media/audio/audio_input_device.h @@ -85,28 +85,27 @@ class MEDIA_EXPORT AudioInputDevice const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner); // 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; + void Initialize(const AudioParameters& params, + CaptureCallback* callback, + int session_id) override; + void Start() override; + void Stop() override; + void SetVolume(double volume) override; + void SetAutomaticGainControl(bool enabled) override; protected: friend class base::RefCountedThreadSafe<AudioInputDevice>; - virtual ~AudioInputDevice(); + ~AudioInputDevice() override; // Methods called on IO thread ---------------------------------------------- // AudioInputIPCDelegate implementation. - virtual void OnStreamCreated(base::SharedMemoryHandle handle, - base::SyncSocket::Handle socket_handle, - int length, - int total_segments) override; - virtual void OnVolume(double volume) override; - virtual void OnStateChanged( - AudioInputIPCDelegate::State state) override; - virtual void OnIPCClosed() override; + void OnStreamCreated(base::SharedMemoryHandle handle, + base::SyncSocket::Handle socket_handle, + int length, + int total_segments) override; + void OnVolume(double volume) override; + void OnStateChanged(AudioInputIPCDelegate::State state) override; + void OnIPCClosed() override; private: // Note: The ordering of members in this enum is critical to correct behavior! @@ -128,7 +127,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; + void WillDestroyCurrentMessageLoop() override; AudioParameters audio_parameters_; diff --git a/media/audio/audio_input_unittest.cc b/media/audio/audio_input_unittest.cc index 3c977b0..9b3e71a 100644 --- a/media/audio/audio_input_unittest.cc +++ b/media/audio/audio_input_unittest.cc @@ -23,15 +23,13 @@ class TestInputCallback : public AudioInputStream::AudioInputCallback { : callback_count_(0), had_error_(0) { } - virtual void OnData(AudioInputStream* stream, - const AudioBus* source, - uint32 hardware_delay_bytes, - double volume) override { + void OnData(AudioInputStream* stream, + const AudioBus* source, + uint32 hardware_delay_bytes, + double volume) override { ++callback_count_; } - virtual void OnError(AudioInputStream* stream) override { - ++had_error_; - } + void OnError(AudioInputStream* stream) override { ++had_error_; } // Returns how many times OnData() has been called. int callback_count() const { return callback_count_; diff --git a/media/audio/audio_manager_base.h b/media/audio/audio_manager_base.h index 6ed8fd4..113a0202 100644 --- a/media/audio/audio_manager_base.h +++ b/media/audio/audio_manager_base.h @@ -46,30 +46,27 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager { // stream, otherwise stream initialization may fail. static const char kLoopbackInputDeviceId[]; - virtual ~AudioManagerBase(); + ~AudioManagerBase() override; - virtual scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() override; - virtual scoped_refptr<base::SingleThreadTaskRunner> GetWorkerTaskRunner() - override; + scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() override; + scoped_refptr<base::SingleThreadTaskRunner> GetWorkerTaskRunner() override; - virtual base::string16 GetAudioInputDeviceModel() override; + base::string16 GetAudioInputDeviceModel() override; - virtual void ShowAudioInputSettings() override; + void ShowAudioInputSettings() override; - virtual void GetAudioInputDeviceNames( - AudioDeviceNames* device_names) override; + void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override; - virtual void GetAudioOutputDeviceNames( - AudioDeviceNames* device_names) override; + void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override; - virtual AudioOutputStream* MakeAudioOutputStream( + AudioOutputStream* MakeAudioOutputStream( const AudioParameters& params, const std::string& device_id) override; - virtual AudioInputStream* MakeAudioInputStream( - const AudioParameters& params, const std::string& device_id) override; + AudioInputStream* MakeAudioInputStream(const AudioParameters& params, + const std::string& device_id) override; - virtual AudioOutputStream* MakeAudioOutputStreamProxy( + AudioOutputStream* MakeAudioOutputStreamProxy( const AudioParameters& params, const std::string& device_id) override; @@ -97,25 +94,23 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager { const AudioParameters& params, const std::string& device_id) = 0; // Listeners will be notified on the GetTaskRunner() task runner. - virtual void AddOutputDeviceChangeListener( - AudioDeviceListener* listener) override; - virtual void RemoveOutputDeviceChangeListener( - AudioDeviceListener* listener) override; + void AddOutputDeviceChangeListener(AudioDeviceListener* listener) override; + void RemoveOutputDeviceChangeListener(AudioDeviceListener* listener) override; - virtual AudioParameters GetDefaultOutputStreamParameters() override; - virtual AudioParameters GetOutputStreamParameters( + AudioParameters GetDefaultOutputStreamParameters() override; + AudioParameters GetOutputStreamParameters( const std::string& device_id) override; - virtual AudioParameters GetInputStreamParameters( + AudioParameters GetInputStreamParameters( const std::string& device_id) override; - virtual std::string GetAssociatedOutputDeviceID( + std::string GetAssociatedOutputDeviceID( const std::string& input_device_id) override; - virtual scoped_ptr<AudioLog> CreateAudioLog( + scoped_ptr<AudioLog> CreateAudioLog( AudioLogFactory::AudioComponent component) override; - virtual void SetHasKeyboardMic() override; + 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 3058f58..23dc897 100644 --- a/media/audio/audio_output_controller.h +++ b/media/audio/audio_output_controller.h @@ -154,20 +154,19 @@ class MEDIA_EXPORT AudioOutputController const base::Closure& callback); // AudioSourceCallback implementation. - virtual int OnMoreData(AudioBus* dest, - uint32 total_bytes_delay) override; - virtual void OnError(AudioOutputStream* stream) override; + int OnMoreData(AudioBus* dest, uint32 total_bytes_delay) override; + 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; + void OnDeviceChange() override; // AudioSourceDiverter implementation. - virtual const AudioParameters& GetAudioParameters() override; - virtual void StartDiverting(AudioOutputStream* to_stream) override; - virtual void StopDiverting() override; + const AudioParameters& GetAudioParameters() override; + void StartDiverting(AudioOutputStream* to_stream) override; + void StopDiverting() override; // Accessor for AudioPowerMonitor::ReadCurrentPowerAndClip(). See comments in // audio_power_monitor.h for usage. This may be called on any thread. @@ -189,7 +188,7 @@ class MEDIA_EXPORT AudioOutputController enum { kPowerMeasurementTimeConstantMillis = 10 }; friend class base::RefCountedThreadSafe<AudioOutputController>; - virtual ~AudioOutputController(); + ~AudioOutputController() override; private: AudioOutputController(AudioManager* audio_manager, EventHandler* handler, diff --git a/media/audio/audio_output_device.cc b/media/audio/audio_output_device.cc index d18a764..c34d7cc 100644 --- a/media/audio/audio_output_device.cc +++ b/media/audio/audio_output_device.cc @@ -23,12 +23,12 @@ class AudioOutputDevice::AudioThreadCallback base::SharedMemoryHandle memory, int memory_length, AudioRendererSink::RenderCallback* render_callback); - virtual ~AudioThreadCallback(); + ~AudioThreadCallback() override; - virtual void MapSharedMemory() override; + void MapSharedMemory() override; // Called whenever we receive notifications about pending data. - virtual void Process(int pending_data) override; + 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 b2e0b14..ca11b80 100644 --- a/media/audio/audio_output_device.h +++ b/media/audio/audio_output_device.h @@ -88,27 +88,27 @@ class MEDIA_EXPORT AudioOutputDevice int session_id); // 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; + void Initialize(const AudioParameters& params, + RenderCallback* callback) override; + void Start() override; + void Stop() override; + void Play() override; + void Pause() override; + bool SetVolume(double volume) override; // Methods called on IO thread ---------------------------------------------- // AudioOutputIPCDelegate methods. - 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; + void OnStateChanged(AudioOutputIPCDelegate::State state) override; + void OnStreamCreated(base::SharedMemoryHandle handle, + base::SyncSocket::Handle socket_handle, + int length) override; + void OnIPCClosed() override; protected: // Magic required by ref_counted.h to avoid any code deleting the object // accidentally while there are references to it. friend class base::RefCountedThreadSafe<AudioOutputDevice>; - virtual ~AudioOutputDevice(); + ~AudioOutputDevice() override; private: // Note: The ordering of members in this enum is critical to correct behavior! @@ -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; + 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 031896f..1aa5a32 100644 --- a/media/audio/audio_output_dispatcher_impl.h +++ b/media/audio/audio_output_dispatcher_impl.h @@ -40,30 +40,29 @@ 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; + 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; + bool StartStream(AudioOutputStream::AudioSourceCallback* callback, + 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; + void StopStream(AudioOutputProxy* stream_proxy) override; - virtual void StreamVolumeSet(AudioOutputProxy* stream_proxy, - double volume) override; + void StreamVolumeSet(AudioOutputProxy* stream_proxy, 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; + void CloseStream(AudioOutputProxy* stream_proxy) override; - virtual void Shutdown() override; + void Shutdown() override; private: friend class base::RefCountedThreadSafe<AudioOutputDispatcherImpl>; - virtual ~AudioOutputDispatcherImpl(); + ~AudioOutputDispatcherImpl() override; // Creates a new physical output stream, opens it and pushes to // |idle_streams_|. Returns false if the stream couldn't be created or diff --git a/media/audio/audio_output_proxy.h b/media/audio/audio_output_proxy.h index a1e79dc..504b4ef 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; + bool Open() override; + void Start(AudioSourceCallback* callback) override; + void Stop() override; + void SetVolume(double volume) override; + void GetVolume(double* volume) override; + void Close() override; private: enum State { @@ -49,7 +49,7 @@ class MEDIA_EXPORT AudioOutputProxy kStartError, }; - virtual ~AudioOutputProxy(); + ~AudioOutputProxy() override; scoped_refptr<AudioOutputDispatcher> dispatcher_; State state_; diff --git a/media/audio/audio_output_proxy_unittest.cc b/media/audio/audio_output_proxy_unittest.cc index a1c5768..7f3c3d8 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 { + 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 { + 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 4c4b601..7aa3284 100644 --- a/media/audio/audio_output_resampler.cc +++ b/media/audio/audio_output_resampler.cc @@ -27,12 +27,11 @@ class OnMoreDataConverter public: OnMoreDataConverter(const AudioParameters& input_params, const AudioParameters& output_params); - virtual ~OnMoreDataConverter(); + ~OnMoreDataConverter() override; // AudioSourceCallback interface. - virtual int OnMoreData(AudioBus* dest, - uint32 total_bytes_delay) override; - virtual void OnError(AudioOutputStream* stream) override; + int OnMoreData(AudioBus* dest, uint32 total_bytes_delay) override; + void OnError(AudioOutputStream* stream) override; // Sets |source_callback_|. If this is not a new object, then Stop() must be // called before Start(). @@ -45,8 +44,8 @@ class OnMoreDataConverter private: // AudioConverter::InputCallback implementation. - virtual double ProvideInput(AudioBus* audio_bus, - base::TimeDelta buffer_delay) override; + double ProvideInput(AudioBus* audio_bus, + 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 085330b..4c7be29 100644 --- a/media/audio/audio_output_resampler.h +++ b/media/audio/audio_output_resampler.h @@ -44,18 +44,17 @@ class MEDIA_EXPORT AudioOutputResampler : public AudioOutputDispatcher { const base::TimeDelta& close_delay); // AudioOutputDispatcher interface. - virtual bool OpenStream() override; - virtual bool StartStream(AudioOutputStream::AudioSourceCallback* callback, - 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; + bool OpenStream() override; + bool StartStream(AudioOutputStream::AudioSourceCallback* callback, + AudioOutputProxy* stream_proxy) override; + void StopStream(AudioOutputProxy* stream_proxy) override; + void StreamVolumeSet(AudioOutputProxy* stream_proxy, double volume) override; + void CloseStream(AudioOutputProxy* stream_proxy) override; + void Shutdown() override; private: friend class base::RefCountedThreadSafe<AudioOutputResampler>; - virtual ~AudioOutputResampler(); + ~AudioOutputResampler() override; // Converts low latency based output parameters into high latency // appropriate output parameters in error situations. diff --git a/media/audio/clockless_audio_sink.cc b/media/audio/clockless_audio_sink.cc index 1bb22e2..88e25b8 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 { + 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 1c2bf69..075c55a 100644 --- a/media/audio/clockless_audio_sink.h +++ b/media/audio/clockless_audio_sink.h @@ -25,19 +25,19 @@ class MEDIA_EXPORT ClocklessAudioSink 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; + void Initialize(const AudioParameters& params, + RenderCallback* callback) override; + void Start() override; + void Stop() override; + void Pause() override; + void Play() override; + bool SetVolume(double volume) override; // Returns the time taken to consume all the audio. base::TimeDelta render_time() { return playback_time_; } protected: - virtual ~ClocklessAudioSink(); + ~ClocklessAudioSink() override; private: scoped_ptr<ClocklessAudioSinkThread> thread_; diff --git a/media/audio/fake_audio_input_stream.h b/media/audio/fake_audio_input_stream.h index dba6aaa..5f9f804ab 100644 --- a/media/audio/fake_audio_input_stream.h +++ b/media/audio/fake_audio_input_stream.h @@ -27,16 +27,16 @@ 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 bool IsMuted() override; - virtual void SetAutomaticGainControl(bool enabled) override; - virtual bool GetAutomaticGainControl() override; + bool Open() override; + void Start(AudioInputCallback* callback) override; + void Stop() override; + void Close() override; + double GetMaxVolume() override; + void SetVolume(double volume) override; + double GetVolume() override; + bool IsMuted() override; + void SetAutomaticGainControl(bool enabled) override; + bool GetAutomaticGainControl() override; // Generate one beep sound. This method is called by // FakeVideoCaptureDevice to test audio/video synchronization. @@ -53,7 +53,7 @@ class MEDIA_EXPORT FakeAudioInputStream FakeAudioInputStream(AudioManagerBase* manager, const AudioParameters& params); - virtual ~FakeAudioInputStream(); + ~FakeAudioInputStream() override; void DoCallback(); diff --git a/media/audio/fake_audio_log_factory.cc b/media/audio/fake_audio_log_factory.cc index af5dc8e..e8677f2 100644 --- a/media/audio/fake_audio_log_factory.cc +++ b/media/audio/fake_audio_log_factory.cc @@ -9,15 +9,15 @@ namespace media { class FakeAudioLogImpl : public AudioLog { public: FakeAudioLogImpl() {} - 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 {} + ~FakeAudioLogImpl() override {} + void OnCreated(int component_id, + const media::AudioParameters& params, + const std::string& device_id) override {} + void OnStarted(int component_id) override {} + void OnStopped(int component_id) override {} + void OnClosed(int component_id) override {} + void OnError(int component_id) override {} + 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 c5fae46..704fcc2 100644 --- a/media/audio/fake_audio_log_factory.h +++ b/media/audio/fake_audio_log_factory.h @@ -16,9 +16,8 @@ class MEDIA_EXPORT FakeAudioLogFactory : NON_EXPORTED_BASE(public AudioLogFactory) { public: FakeAudioLogFactory(); - virtual ~FakeAudioLogFactory(); - virtual scoped_ptr<AudioLog> CreateAudioLog( - AudioComponent component) override; + ~FakeAudioLogFactory() override; + scoped_ptr<AudioLog> CreateAudioLog(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 8fc57bd..ce24c3e 100644 --- a/media/audio/fake_audio_manager.h +++ b/media/audio/fake_audio_manager.h @@ -18,28 +18,28 @@ class MEDIA_EXPORT FakeAudioManager : public AudioManagerBase { FakeAudioManager(AudioLogFactory* audio_log_factory); // Implementation of AudioManager. - virtual bool HasAudioOutputDevices() override; - virtual bool HasAudioInputDevices() override; + bool HasAudioOutputDevices() override; + bool HasAudioInputDevices() override; // Implementation of AudioManagerBase. - virtual AudioOutputStream* MakeLinearOutputStream( + AudioOutputStream* MakeLinearOutputStream( const AudioParameters& params) override; - virtual AudioOutputStream* MakeLowLatencyOutputStream( + AudioOutputStream* MakeLowLatencyOutputStream( const AudioParameters& params, const std::string& device_id) override; - virtual AudioInputStream* MakeLinearInputStream(const AudioParameters& params, - const std::string& device_id) - override; - virtual AudioInputStream* MakeLowLatencyInputStream( + AudioInputStream* MakeLinearInputStream( const AudioParameters& params, const std::string& device_id) override; - virtual AudioParameters GetInputStreamParameters( + AudioInputStream* MakeLowLatencyInputStream( + const AudioParameters& params, + const std::string& device_id) override; + AudioParameters GetInputStreamParameters( const std::string& device_id) override; protected: - virtual ~FakeAudioManager(); + ~FakeAudioManager() override; - virtual AudioParameters GetPreferredOutputStreamParameters( + AudioParameters GetPreferredOutputStreamParameters( const std::string& output_device_id, const AudioParameters& input_params) override; diff --git a/media/audio/fake_audio_output_stream.h b/media/audio/fake_audio_output_stream.h index c0fd386..e5e6291 100644 --- a/media/audio/fake_audio_output_stream.h +++ b/media/audio/fake_audio_output_stream.h @@ -23,17 +23,17 @@ 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; + bool Open() override; + void Start(AudioSourceCallback* callback) override; + void Stop() override; + void SetVolume(double volume) override; + void GetVolume(double* volume) override; + void Close() override; private: FakeAudioOutputStream(AudioManagerBase* manager, const AudioParameters& params); - virtual ~FakeAudioOutputStream(); + ~FakeAudioOutputStream() override; // Task that periodically calls OnMoreData() to consume audio data. void CallOnMoreData(AudioBus* audio_bus); diff --git a/media/audio/mac/audio_auhal_mac.h b/media/audio/mac/audio_auhal_mac.h index 62d0439..fd468ffb 100644 --- a/media/audio/mac/audio_auhal_mac.h +++ b/media/audio/mac/audio_auhal_mac.h @@ -59,15 +59,15 @@ class AUHALStream : public AudioOutputStream { AudioDeviceID device); // The dtor is typically called by the AudioManager only and it is usually // triggered by calling AudioOutputStream::Close(). - virtual ~AUHALStream(); + ~AUHALStream() override; // 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; + bool Open() override; + void Close() override; + void Start(AudioSourceCallback* callback) override; + void Stop() override; + void SetVolume(double volume) override; + 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 6c1b4a14f..56453d2 100644 --- a/media/audio/mac/audio_input_mac.h +++ b/media/audio/mac/audio_input_mac.h @@ -26,19 +26,19 @@ class PCMQueueInAudioInputStream : public AudioInputStream { // Parameters as per AudioManager::MakeAudioInputStream. PCMQueueInAudioInputStream(AudioManagerMac* manager, const AudioParameters& params); - virtual ~PCMQueueInAudioInputStream(); + ~PCMQueueInAudioInputStream() override; // 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 IsMuted() override; + bool Open() override; + void Start(AudioInputCallback* callback) override; + void Stop() override; + void Close() override; + double GetMaxVolume() override; + void SetVolume(double volume) override; + double GetVolume() override; + void SetAutomaticGainControl(bool enabled) override; + bool GetAutomaticGainControl() override; + bool IsMuted() 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 b3950ffd..33eabcc 100644 --- a/media/audio/mac/audio_low_latency_input_mac.h +++ b/media/audio/mac/audio_low_latency_input_mac.h @@ -62,17 +62,17 @@ class AUAudioInputStream : public AgcAudioStream<AudioInputStream> { AudioDeviceID audio_device_id); // The dtor is typically called by the AudioManager only and it is usually // triggered by calling AudioInputStream::Close(). - virtual ~AUAudioInputStream(); + ~AUAudioInputStream() override; // 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 IsMuted() override; + bool Open() override; + void Start(AudioInputCallback* callback) override; + void Stop() override; + void Close() override; + double GetMaxVolume() override; + void SetVolume(double volume) override; + double GetVolume() override; + bool IsMuted() 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 add37fa..7960b42c 100644 --- a/media/audio/mac/audio_low_latency_input_mac_unittest.cc +++ b/media/audio/mac/audio_low_latency_input_mac_unittest.cc @@ -56,7 +56,7 @@ class WriteToFileAudioSink : public AudioInputStream::AudioInputCallback { bytes_to_write_(0) { } - virtual ~WriteToFileAudioSink() { + ~WriteToFileAudioSink() override { int bytes_written = 0; while (bytes_written < bytes_to_write_) { const uint8* chunk; @@ -75,10 +75,10 @@ class WriteToFileAudioSink : public AudioInputStream::AudioInputCallback { } // AudioInputStream::AudioInputCallback implementation. - virtual void OnData(AudioInputStream* stream, - const AudioBus* src, - uint32 hardware_delay_bytes, - double volume) override { + void OnData(AudioInputStream* stream, + const AudioBus* src, + uint32 hardware_delay_bytes, + 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 {} + 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 809c923..b6ecf17 100644 --- a/media/audio/mac/audio_manager_mac.cc +++ b/media/audio/mac/audio_manager_mac.cc @@ -236,7 +236,7 @@ class AudioManagerMac::AudioPowerObserver : public base::PowerObserver { base::PowerMonitor::Get()->AddObserver(this); } - virtual ~AudioPowerObserver() { + ~AudioPowerObserver() override { DCHECK(thread_checker_.CalledOnValidThread()); if (!is_monitoring_) return; @@ -251,12 +251,12 @@ class AudioManagerMac::AudioPowerObserver : public base::PowerObserver { } private: - virtual void OnSuspend() override { + void OnSuspend() override { DCHECK(thread_checker_.CalledOnValidThread()); is_suspending_ = true; } - virtual void OnResume() override { + 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 5dd6d6e1..f31e052b 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 void GetAudioInputDeviceNames( - AudioDeviceNames* device_names) override; - virtual void GetAudioOutputDeviceNames( - AudioDeviceNames* device_names) override; - virtual AudioParameters GetInputStreamParameters( + bool HasAudioOutputDevices() override; + bool HasAudioInputDevices() override; + void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override; + void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override; + AudioParameters GetInputStreamParameters( const std::string& device_id) override; - virtual std::string GetAssociatedOutputDeviceID( + std::string GetAssociatedOutputDeviceID( const std::string& input_device_id) override; // Implementation of AudioManagerBase. - virtual AudioOutputStream* MakeLinearOutputStream( + AudioOutputStream* MakeLinearOutputStream( const AudioParameters& params) override; - virtual AudioOutputStream* MakeLowLatencyOutputStream( + AudioOutputStream* MakeLowLatencyOutputStream( const AudioParameters& params, const std::string& device_id) override; - virtual AudioInputStream* MakeLinearInputStream( - 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; + AudioInputStream* MakeLinearInputStream( + const AudioParameters& params, + const std::string& device_id) override; + AudioInputStream* MakeLowLatencyInputStream( + const AudioParameters& params, + const std::string& device_id) override; + 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; + void ReleaseOutputStream(AudioOutputStream* stream) override; + void ReleaseInputStream(AudioInputStream* stream) override; static bool GetDefaultInputDevice(AudioDeviceID* device); static bool GetDefaultOutputDevice(AudioDeviceID* device); @@ -76,9 +76,9 @@ class MEDIA_EXPORT AudioManagerMac : public AudioManagerBase { bool ShouldDeferStreamStart(); protected: - virtual ~AudioManagerMac(); + ~AudioManagerMac() override; - virtual AudioParameters GetPreferredOutputStreamParameters( + AudioParameters GetPreferredOutputStreamParameters( const std::string& output_device_id, const AudioParameters& input_params) override; diff --git a/media/audio/mock_audio_manager.h b/media/audio/mock_audio_manager.h index b78b2ef..dcae43b 100644 --- a/media/audio/mock_audio_manager.h +++ b/media/audio/mock_audio_manager.h @@ -24,56 +24,52 @@ class MockAudioManager : public media::AudioManager { explicit MockAudioManager( const scoped_refptr<base::SingleThreadTaskRunner>& task_runner); - virtual bool HasAudioOutputDevices() override; + bool HasAudioOutputDevices() override; - virtual bool HasAudioInputDevices() override; + bool HasAudioInputDevices() override; - virtual base::string16 GetAudioInputDeviceModel() override; + base::string16 GetAudioInputDeviceModel() override; - virtual void ShowAudioInputSettings() override; + void ShowAudioInputSettings() override; - virtual void GetAudioInputDeviceNames( - media::AudioDeviceNames* device_names) override; + void GetAudioInputDeviceNames(media::AudioDeviceNames* device_names) override; - virtual void GetAudioOutputDeviceNames( + void GetAudioOutputDeviceNames( media::AudioDeviceNames* device_names) override; - virtual media::AudioOutputStream* MakeAudioOutputStream( + media::AudioOutputStream* MakeAudioOutputStream( const media::AudioParameters& params, const std::string& device_id) override; - virtual media::AudioOutputStream* MakeAudioOutputStreamProxy( + media::AudioOutputStream* MakeAudioOutputStreamProxy( const media::AudioParameters& params, const std::string& device_id) override; - virtual media::AudioInputStream* MakeAudioInputStream( + media::AudioInputStream* MakeAudioInputStream( const media::AudioParameters& params, const std::string& device_id) override; - virtual scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() override; - virtual scoped_refptr<base::SingleThreadTaskRunner> GetWorkerTaskRunner() - override; + scoped_refptr<base::SingleThreadTaskRunner> GetTaskRunner() override; + scoped_refptr<base::SingleThreadTaskRunner> GetWorkerTaskRunner() override; - virtual void AddOutputDeviceChangeListener( - AudioDeviceListener* listener) override; - virtual void RemoveOutputDeviceChangeListener( - AudioDeviceListener* listener) override; + void AddOutputDeviceChangeListener(AudioDeviceListener* listener) override; + void RemoveOutputDeviceChangeListener(AudioDeviceListener* listener) override; - virtual AudioParameters GetDefaultOutputStreamParameters() override; - virtual AudioParameters GetOutputStreamParameters( + AudioParameters GetDefaultOutputStreamParameters() override; + AudioParameters GetOutputStreamParameters( const std::string& device_id) override; - virtual AudioParameters GetInputStreamParameters( + AudioParameters GetInputStreamParameters( const std::string& device_id) override; - virtual std::string GetAssociatedOutputDeviceID( + std::string GetAssociatedOutputDeviceID( const std::string& input_device_id) override; - virtual scoped_ptr<AudioLog> CreateAudioLog( + scoped_ptr<AudioLog> CreateAudioLog( AudioLogFactory::AudioComponent component) override; - virtual void SetHasKeyboardMic() override; + void SetHasKeyboardMic() override; protected: - virtual ~MockAudioManager(); + ~MockAudioManager() override; private: scoped_refptr<base::SingleThreadTaskRunner> task_runner_; diff --git a/media/audio/null_audio_sink.h b/media/audio/null_audio_sink.h index 6054a95..d261602 100644 --- a/media/audio/null_audio_sink.h +++ b/media/audio/null_audio_sink.h @@ -25,13 +25,13 @@ class MEDIA_EXPORT NullAudioSink NullAudioSink(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner); // 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; + void Initialize(const AudioParameters& params, + RenderCallback* callback) override; + void Start() override; + void Stop() override; + void Pause() override; + void Play() override; + bool SetVolume(double volume) override; // Enables audio frame hashing. Must be called prior to Initialize(). void StartAudioHashForTesting(); @@ -40,7 +40,7 @@ class MEDIA_EXPORT NullAudioSink std::string GetAudioHashForTesting(); protected: - virtual ~NullAudioSink(); + ~NullAudioSink() override; private: // Task that periodically calls Render() to consume audio data. diff --git a/media/audio/scoped_task_runner_observer.h b/media/audio/scoped_task_runner_observer.h index ce9adf9..85e5247 100644 --- a/media/audio/scoped_task_runner_observer.h +++ b/media/audio/scoped_task_runner_observer.h @@ -28,7 +28,7 @@ class ScopedTaskRunnerObserver const scoped_refptr<base::SingleThreadTaskRunner>& task_runner); protected: - virtual ~ScopedTaskRunnerObserver(); + ~ScopedTaskRunnerObserver() override; // Accessor to the loop that's used by the derived class. const scoped_refptr<base::SingleThreadTaskRunner>& task_runner() { diff --git a/media/audio/simple_sources.h b/media/audio/simple_sources.h index 98caf28..7a2176f 100644 --- a/media/audio/simple_sources.h +++ b/media/audio/simple_sources.h @@ -19,7 +19,7 @@ class MEDIA_EXPORT SineWaveAudioSource // hertz and it has to be less than half of the sampling frequency // |sample_freq| or else you will get aliasing. SineWaveAudioSource(int channels, double freq, double sample_freq); - virtual ~SineWaveAudioSource() {} + ~SineWaveAudioSource() override {} // Return up to |cap| samples of data via OnMoreData(). Use Reset() to // allow more data to be served. @@ -27,9 +27,8 @@ class MEDIA_EXPORT SineWaveAudioSource void Reset(); // Implementation of AudioSourceCallback. - virtual int OnMoreData(AudioBus* audio_bus, - uint32 total_bytes_delay) override; - virtual void OnError(AudioOutputStream* stream) override; + int OnMoreData(AudioBus* audio_bus, uint32 total_bytes_delay) override; + 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 e57612e..ac9c87b 100644 --- a/media/audio/sounds/audio_stream_handler.cc +++ b/media/audio/sounds/audio_stream_handler.cc @@ -43,7 +43,7 @@ class AudioStreamHandler::AudioStreamContainer delayed_stop_posted_(false), wav_audio_(wav_audio) {} - virtual ~AudioStreamContainer() { + ~AudioStreamContainer() override { DCHECK(AudioManager::Get()->GetTaskRunner()->BelongsToCurrentThread()); } @@ -104,8 +104,7 @@ class AudioStreamHandler::AudioStreamContainer private: // AudioOutputStream::AudioSourceCallback overrides: // Following methods could be called from *ANY* thread. - virtual int OnMoreData(AudioBus* dest, - uint32 /* total_bytes_delay */) override { + int OnMoreData(AudioBus* dest, uint32 /* total_bytes_delay */) override { base::AutoLock al(state_lock_); size_t bytes_written = 0; @@ -124,7 +123,7 @@ class AudioStreamHandler::AudioStreamContainer return dest->frames(); } - virtual void OnError(AudioOutputStream* /* stream */) override { + void OnError(AudioOutputStream* /* stream */) override { LOG(ERROR) << "Error during system sound reproduction."; } diff --git a/media/audio/sounds/sounds_manager.cc b/media/audio/sounds/sounds_manager.cc index e75f3f2..58ca238 100644 --- a/media/audio/sounds/sounds_manager.cc +++ b/media/audio/sounds/sounds_manager.cc @@ -24,13 +24,12 @@ bool g_initialized_for_testing = false; class SoundsManagerImpl : public SoundsManager { public: SoundsManagerImpl(); - virtual ~SoundsManagerImpl(); + ~SoundsManagerImpl() override; // 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; + bool Initialize(SoundKey key, const base::StringPiece& data) override; + bool Play(SoundKey key) override; + base::TimeDelta GetDuration(SoundKey key) override; private: base::hash_map<SoundKey, linked_ptr<AudioStreamHandler> > handlers_; diff --git a/media/audio/sounds/test_data.h b/media/audio/sounds/test_data.h index 6caf119..e5544d0 100644 --- a/media/audio/sounds/test_data.h +++ b/media/audio/sounds/test_data.h @@ -25,11 +25,11 @@ const char kTestAudioData[] = "RIFF\x26\x00\x00\x00WAVEfmt \x10\x00\x00\x00" class TestObserver : public AudioStreamHandler::TestObserver { public: TestObserver(const base::Closure& quit); - virtual ~TestObserver(); + ~TestObserver() override; // AudioStreamHandler::TestObserver implementation: - virtual void OnPlay() override; - virtual void OnStop(size_t cursor) override; + void OnPlay() override; + 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 c72a25f..e9555ab 100644 --- a/media/audio/test_audio_input_controller_factory.h +++ b/media/audio/test_audio_input_controller_factory.h @@ -64,17 +64,17 @@ class TestAudioInputController : public AudioInputController { EventHandler* event_handler() const { return event_handler_; } // Notifies the TestAudioControllerOpened() event to the delegate (if any). - virtual void Record() override; + void Record() override; // Ensure that the closure is run on the audio-manager thread. - virtual void Close(const base::Closure& closed_task) override; + void Close(const base::Closure& closed_task) override; const AudioParameters& audio_parameters() const { return audio_parameters_; } protected: - virtual ~TestAudioInputController(); + ~TestAudioInputController() override; private: AudioParameters audio_parameters_; @@ -94,10 +94,10 @@ typedef TestAudioInputController::Delegate TestAudioInputControllerDelegate; class TestAudioInputControllerFactory : public AudioInputController::Factory { public: TestAudioInputControllerFactory(); - virtual ~TestAudioInputControllerFactory(); + ~TestAudioInputControllerFactory() override; // AudioInputController::Factory methods. - virtual AudioInputController* Create( + AudioInputController* Create( AudioManager* audio_manager, AudioInputController::EventHandler* event_handler, AudioParameters params, diff --git a/media/audio/virtual_audio_input_stream.cc b/media/audio/virtual_audio_input_stream.cc index 6d1189e..a961b53 100644 --- a/media/audio/virtual_audio_input_stream.cc +++ b/media/audio/virtual_audio_input_stream.cc @@ -25,7 +25,7 @@ class LoopbackAudioConverter : public AudioConverter::InputCallback { const AudioParameters& output_params) : audio_converter_(input_params, output_params, false) {} - virtual ~LoopbackAudioConverter() {} + ~LoopbackAudioConverter() override {} void AddInput(AudioConverter::InputCallback* input) { audio_converter_.AddInput(input); @@ -36,8 +36,8 @@ class LoopbackAudioConverter : public AudioConverter::InputCallback { } private: - virtual double ProvideInput(AudioBus* audio_bus, - base::TimeDelta buffer_delay) override { + double ProvideInput(AudioBus* audio_bus, + 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 b33dadd..66d1a46 100644 --- a/media/audio/virtual_audio_input_stream.h +++ b/media/audio/virtual_audio_input_stream.h @@ -44,19 +44,19 @@ class MEDIA_EXPORT VirtualAudioInputStream : public AudioInputStream { const scoped_refptr<base::SingleThreadTaskRunner>& worker_task_runner, const AfterCloseCallback& after_close_cb); - virtual ~VirtualAudioInputStream(); + ~VirtualAudioInputStream() override; // 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 IsMuted() override; + bool Open() override; + void Start(AudioInputCallback* callback) override; + void Stop() override; + void Close() override; + double GetMaxVolume() override; + void SetVolume(double volume) override; + double GetVolume() override; + void SetAutomaticGainControl(bool enabled) override; + bool GetAutomaticGainControl() override; + bool IsMuted() 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 9256f41..3ff07b8f 100644 --- a/media/audio/virtual_audio_input_stream_unittest.cc +++ b/media/audio/virtual_audio_input_stream_unittest.cc @@ -64,10 +64,9 @@ class TestAudioSource : public SineWaveAudioSource { kParams.channel_layout(), 200.0, kParams.sample_rate()), data_pulled_(false, false) {} - virtual ~TestAudioSource() {} + ~TestAudioSource() override {} - virtual int OnMoreData(AudioBus* audio_bus, - uint32 total_bytes_delay) override { + int OnMoreData(AudioBus* audio_bus, 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 c753975..ef9863e 100644 --- a/media/audio/virtual_audio_output_stream.h +++ b/media/audio/virtual_audio_output_stream.h @@ -34,20 +34,20 @@ class MEDIA_EXPORT VirtualAudioOutputStream VirtualAudioInputStream* target, const AfterCloseCallback& after_close_cb); - virtual ~VirtualAudioOutputStream(); + ~VirtualAudioOutputStream() override; // 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; + bool Open() override; + void Start(AudioSourceCallback* callback) override; + void Stop() override; + void SetVolume(double volume) override; + void GetVolume(double* volume) override; + void Close() override; private: // AudioConverter::InputCallback: - virtual double ProvideInput(AudioBus* audio_bus, - base::TimeDelta buffer_delay) override; + double ProvideInput(AudioBus* audio_bus, + base::TimeDelta buffer_delay) override; const AudioParameters params_; // Pointer to the VirtualAudioInputStream to attach to when Start() is called. diff --git a/media/base/audio_buffer_converter.h b/media/base/audio_buffer_converter.h index 23db743..d2c4f6d 100644 --- a/media/base/audio_buffer_converter.h +++ b/media/base/audio_buffer_converter.h @@ -25,7 +25,7 @@ class AudioBus; class MEDIA_EXPORT AudioBufferConverter : public AudioConverter::InputCallback { public: explicit AudioBufferConverter(const AudioParameters& output_params); - virtual ~AudioBufferConverter(); + ~AudioBufferConverter() override; void AddInput(const scoped_refptr<AudioBuffer>& buffer); @@ -51,8 +51,8 @@ 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; + double ProvideInput(AudioBus* audio_bus, + 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_bus.h b/media/base/audio_bus.h index c78486e..25e2839 100644 --- a/media/base/audio_bus.h +++ b/media/base/audio_bus.h @@ -147,7 +147,7 @@ class MEDIA_EXPORT AudioBusRefCounted friend class base::RefCountedThreadSafe<AudioBusRefCounted>; AudioBusRefCounted(int channels, int frames); - virtual ~AudioBusRefCounted(); + ~AudioBusRefCounted() override; DISALLOW_COPY_AND_ASSIGN(AudioBusRefCounted); }; diff --git a/media/base/audio_converter_perftest.cc b/media/base/audio_converter_perftest.cc index f5137e6..c6a4758 100644 --- a/media/base/audio_converter_perftest.cc +++ b/media/base/audio_converter_perftest.cc @@ -16,10 +16,10 @@ static const int kBenchmarkIterations = 200000; class NullInputProvider : public AudioConverter::InputCallback { public: NullInputProvider() {} - virtual ~NullInputProvider() {} + ~NullInputProvider() override {} - virtual double ProvideInput(AudioBus* audio_bus, - base::TimeDelta buffer_delay) override { + double ProvideInput(AudioBus* audio_bus, + 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 00197c2..35ed484 100644 --- a/media/base/audio_renderer_mixer.h +++ b/media/base/audio_renderer_mixer.h @@ -23,7 +23,7 @@ class MEDIA_EXPORT AudioRendererMixer AudioRendererMixer(const AudioParameters& input_params, const AudioParameters& output_params, const scoped_refptr<AudioRendererSink>& sink); - virtual ~AudioRendererMixer(); + ~AudioRendererMixer() override; // Add or remove a mixer input from mixing; called by AudioRendererMixerInput. void AddMixerInput(AudioConverter::InputCallback* input); @@ -41,9 +41,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 Render(AudioBus* audio_bus, int audio_delay_milliseconds) override; + 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 6ae0290..d097aa8 100644 --- a/media/base/audio_renderer_mixer_input.h +++ b/media/base/audio_renderer_mixer_input.h @@ -27,19 +27,19 @@ 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 Initialize(const AudioParameters& params, - AudioRendererSink::RenderCallback* renderer) override; + void Start() override; + void Stop() override; + void Play() override; + void Pause() override; + bool SetVolume(double volume) override; + void Initialize(const AudioParameters& params, + AudioRendererSink::RenderCallback* renderer) override; // Called by AudioRendererMixer when an error occurs. void OnRenderError(); protected: - virtual ~AudioRendererMixerInput(); + ~AudioRendererMixerInput() override; private: friend class AudioRendererMixerInputTest; @@ -49,8 +49,8 @@ class MEDIA_EXPORT AudioRendererMixerInput double volume_; // AudioConverter::InputCallback implementation. - virtual double ProvideInput(AudioBus* audio_bus, - base::TimeDelta buffer_delay) override; + double ProvideInput(AudioBus* audio_bus, + 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 25eea84..fda8541 100644 --- a/media/base/bit_reader.h +++ b/media/base/bit_reader.h @@ -19,7 +19,7 @@ class MEDIA_EXPORT BitReader // Initialize the reader to start reading at |data|, |size| being size // of |data| in bytes. BitReader(const uint8* data, int size); - virtual ~BitReader(); + ~BitReader() override; template<typename T> bool ReadBits(int num_bits, T* out) { return bit_reader_core_.ReadBits(num_bits, out); @@ -43,7 +43,7 @@ class MEDIA_EXPORT BitReader private: // BitReaderCore::ByteStreamProvider implementation. - virtual int GetBytes(int max_n, const uint8** out) override; + 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.h b/media/base/demuxer.h index fb27bc9..4658107 100644 --- a/media/base/demuxer.h +++ b/media/base/demuxer.h @@ -52,7 +52,7 @@ class MEDIA_EXPORT Demuxer : public DemuxerStreamProvider { const std::vector<uint8>& init_data)> NeedKeyCB; Demuxer(); - virtual ~Demuxer(); + ~Demuxer() override; // Completes initialization of the demuxer. // diff --git a/media/base/demuxer_perftest.cc b/media/base/demuxer_perftest.cc index 2504c8e..339cfe1 100644 --- a/media/base/demuxer_perftest.cc +++ b/media/base/demuxer_perftest.cc @@ -22,16 +22,16 @@ static const int kBenchmarkIterations = 100; class DemuxerHostImpl : public media::DemuxerHost { public: DemuxerHostImpl() {} - virtual ~DemuxerHostImpl() {} + ~DemuxerHostImpl() override {} // 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 {} - virtual void AddTextStream(media::DemuxerStream* text_stream, - const media::TextTrackConfig& config) override {} - virtual void RemoveTextStream(media::DemuxerStream* text_stream) override {} + void AddBufferedTimeRange(base::TimeDelta start, + base::TimeDelta end) override {} + void SetDuration(base::TimeDelta duration) override {} + void OnDemuxerError(media::PipelineStatus error) override {} + void AddTextStream(media::DemuxerStream* text_stream, + const media::TextTrackConfig& config) override {} + void RemoveTextStream(media::DemuxerStream* text_stream) override {} private: DISALLOW_COPY_AND_ASSIGN(DemuxerHostImpl); diff --git a/media/base/fake_audio_renderer_sink.h b/media/base/fake_audio_renderer_sink.h index 92a370e..c3c313a 100644 --- a/media/base/fake_audio_renderer_sink.h +++ b/media/base/fake_audio_renderer_sink.h @@ -23,13 +23,13 @@ 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; + void Initialize(const AudioParameters& params, + RenderCallback* callback) override; + void Start() override; + void Stop() override; + void Pause() override; + void Play() override; + bool SetVolume(double volume) override; // Attempts to call Render() on the callback provided to // Initialize() with |dest| and |audio_delay_milliseconds|. @@ -45,7 +45,7 @@ class FakeAudioRendererSink : public AudioRendererSink { State state() const { return state_; } protected: - virtual ~FakeAudioRendererSink(); + ~FakeAudioRendererSink() override; private: void ChangeState(State new_state); diff --git a/media/base/pipeline.h b/media/base/pipeline.h index 1ce4a4c..71c16e1 100644 --- a/media/base/pipeline.h +++ b/media/base/pipeline.h @@ -79,7 +79,7 @@ class MEDIA_EXPORT Pipeline : public DemuxerHost { // Constructs a media pipeline that will execute on |task_runner|. Pipeline(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, MediaLog* media_log); - virtual ~Pipeline(); + ~Pipeline() override; // Build a pipeline to using the given |demuxer| and |renderer| to construct // a filter chain, executing |seek_cb| when the initial seek has completed. @@ -203,13 +203,13 @@ class MEDIA_EXPORT Pipeline : public DemuxerHost { void FinishSeek(); // 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; - virtual void AddTextStream(DemuxerStream* text_stream, - const TextTrackConfig& config) override; - virtual void RemoveTextStream(DemuxerStream* text_stream) override; + void AddBufferedTimeRange(base::TimeDelta start, + base::TimeDelta end) override; + void SetDuration(base::TimeDelta duration) override; + void OnDemuxerError(PipelineStatus error) override; + void AddTextStream(DemuxerStream* text_stream, + const TextTrackConfig& config) override; + 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 a008d62..cf6bc47 100644 --- a/media/base/run_all_perftests.cc +++ b/media/base/run_all_perftests.cc @@ -17,9 +17,10 @@ class TestSuiteNoAtExit : public base::TestSuite { public: TestSuiteNoAtExit(int argc, char** argv) : TestSuite(argc, argv) {} - virtual ~TestSuiteNoAtExit() {} + ~TestSuiteNoAtExit() override {} + protected: - virtual void Initialize() override; + void Initialize() override; }; void TestSuiteNoAtExit::Initialize() { diff --git a/media/base/run_all_unittests.cc b/media/base/run_all_unittests.cc index 927e92b..0f741c3 100644 --- a/media/base/run_all_unittests.cc +++ b/media/base/run_all_unittests.cc @@ -19,9 +19,10 @@ class TestSuiteNoAtExit : public base::TestSuite { public: TestSuiteNoAtExit(int argc, char** argv) : TestSuite(argc, argv) {} - virtual ~TestSuiteNoAtExit() {} + ~TestSuiteNoAtExit() override {} + protected: - virtual void Initialize() override; + void Initialize() override; }; void TestSuiteNoAtExit::Initialize() { diff --git a/media/base/stream_parser_buffer.h b/media/base/stream_parser_buffer.h index 6897de5..1651dce 100644 --- a/media/base/stream_parser_buffer.h +++ b/media/base/stream_parser_buffer.h @@ -169,14 +169,14 @@ class MEDIA_EXPORT StreamParserBuffer : public DecoderBuffer { return preroll_buffer_; } - virtual void set_timestamp(base::TimeDelta timestamp) override; + void set_timestamp(base::TimeDelta timestamp) override; private: StreamParserBuffer(const uint8* data, int data_size, const uint8* side_data, int side_data_size, bool is_keyframe, Type type, TrackId track_id); - virtual ~StreamParserBuffer(); + ~StreamParserBuffer() override; bool is_keyframe_; DecodeTimestamp decode_timestamp_; diff --git a/media/base/user_input_monitor_mac.cc b/media/base/user_input_monitor_mac.cc index c157ed4..e469cbd 100644 --- a/media/base/user_input_monitor_mac.cc +++ b/media/base/user_input_monitor_mac.cc @@ -12,15 +12,15 @@ namespace { class UserInputMonitorMac : public UserInputMonitor { public: UserInputMonitorMac(); - virtual ~UserInputMonitorMac(); + ~UserInputMonitorMac() override; - virtual size_t GetKeyPressCount() const override; + size_t GetKeyPressCount() const override; private: - virtual void StartKeyboardMonitoring() override; - virtual void StopKeyboardMonitoring() override; - virtual void StartMouseMonitoring() override; - virtual void StopMouseMonitoring() override; + void StartKeyboardMonitoring() override; + void StopKeyboardMonitoring() override; + void StartMouseMonitoring() override; + void StopMouseMonitoring() override; DISALLOW_COPY_AND_ASSIGN(UserInputMonitorMac); }; diff --git a/media/base/video_frame_unittest.cc b/media/base/video_frame_unittest.cc index 08d02bf..38485c2 100644 --- a/media/base/video_frame_unittest.cc +++ b/media/base/video_frame_unittest.cc @@ -271,9 +271,9 @@ namespace { 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 {} + ~SyncPointClientImpl() override {} + uint32 InsertSyncPoint() override { return sync_point_; } + 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 5215907..c1aca3f 100644 --- a/media/base/wall_clock_time_source.h +++ b/media/base/wall_clock_time_source.h @@ -20,15 +20,15 @@ namespace media { class MEDIA_EXPORT WallClockTimeSource : public TimeSource { public: WallClockTimeSource(); - virtual ~WallClockTimeSource(); + ~WallClockTimeSource() override; // 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; + void StartTicking() override; + void StopTicking() override; + void SetPlaybackRate(float playback_rate) override; + void SetMediaTime(base::TimeDelta time) override; + base::TimeDelta CurrentMediaTime() override; + 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 5d2cd66..a3eabe85 100644 --- a/media/blink/buffered_data_source.h +++ b/media/blink/buffered_data_source.h @@ -70,7 +70,7 @@ class MEDIA_EXPORT BufferedDataSource : public DataSource { MediaLog* media_log, BufferedDataSourceHost* host, const DownloadingCB& downloading_cb); - virtual ~BufferedDataSource(); + ~BufferedDataSource() override; // Executes |init_cb| with the result of initialization when it has completed. // @@ -108,13 +108,15 @@ class MEDIA_EXPORT BufferedDataSource : public DataSource { // DataSource implementation. // Called from demuxer thread. - 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; + void Stop() override; + + void Read(int64 position, + int size, + uint8* data, + const DataSource::ReadCB& read_cb) override; + bool GetSize(int64* size_out) override; + bool IsStreaming() override; + 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 0af4943..8dd2ab7 100644 --- a/media/blink/buffered_data_source_host_impl.h +++ b/media/blink/buffered_data_source_host_impl.h @@ -18,11 +18,11 @@ class MEDIA_EXPORT BufferedDataSourceHostImpl : public BufferedDataSourceHost { public: BufferedDataSourceHostImpl(); - virtual ~BufferedDataSourceHostImpl(); + ~BufferedDataSourceHostImpl() override; // BufferedDataSourceHost implementation. - virtual void SetTotalBytes(int64 total_bytes) override; - virtual void AddBufferedByteRange(int64 start, int64 end) override; + void SetTotalBytes(int64 total_bytes) override; + 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/new_session_cdm_result_promise.h b/media/blink/new_session_cdm_result_promise.h index 79956cc..7ed6ec1 100644 --- a/media/blink/new_session_cdm_result_promise.h +++ b/media/blink/new_session_cdm_result_promise.h @@ -29,13 +29,13 @@ class MEDIA_EXPORT NewSessionCdmResultPromise const blink::WebContentDecryptionModuleResult& result, const std::string& uma_name, const SessionInitializedCB& new_session_created_cb); - virtual ~NewSessionCdmResultPromise(); + ~NewSessionCdmResultPromise() override; // CdmPromiseTemplate<T> implementation. - virtual void resolve(const std::string& web_session_id) override; - virtual void reject(MediaKeys::Exception exception_code, - uint32 system_code, - const std::string& error_message) override; + void resolve(const std::string& web_session_id) override; + void reject(MediaKeys::Exception exception_code, + uint32 system_code, + const std::string& error_message) override; private: blink::WebContentDecryptionModuleResult web_cdm_result_; diff --git a/media/blink/null_encrypted_media_player_support.h b/media/blink/null_encrypted_media_player_support.h index 2fe5387..3b53ad2 100644 --- a/media/blink/null_encrypted_media_player_support.h +++ b/media/blink/null_encrypted_media_player_support.h @@ -19,16 +19,16 @@ class MEDIA_EXPORT NullEncryptedMediaPlayerSupport static scoped_ptr<EncryptedMediaPlayerSupport> Create( blink::WebMediaPlayerClient* client); - virtual ~NullEncryptedMediaPlayerSupport(); + ~NullEncryptedMediaPlayerSupport() override; // Prefixed API methods. - virtual blink::WebMediaPlayer::MediaKeyException GenerateKeyRequest( + blink::WebMediaPlayer::MediaKeyException GenerateKeyRequest( blink::WebLocalFrame* frame, const blink::WebString& key_system, const unsigned char* init_data, unsigned init_data_length) override; - virtual blink::WebMediaPlayer::MediaKeyException AddKey( + blink::WebMediaPlayer::MediaKeyException AddKey( const blink::WebString& key_system, const unsigned char* key, unsigned key_length, @@ -36,36 +36,34 @@ class MEDIA_EXPORT NullEncryptedMediaPlayerSupport unsigned init_data_length, const blink::WebString& session_id) override; - virtual blink::WebMediaPlayer::MediaKeyException CancelKeyRequest( + blink::WebMediaPlayer::MediaKeyException CancelKeyRequest( const blink::WebString& key_system, const blink::WebString& session_id) override; - // Unprefixed API methods. - virtual void SetInitialContentDecryptionModule( + void SetInitialContentDecryptionModule( blink::WebContentDecryptionModule* initial_cdm) override; - virtual void SetContentDecryptionModule( + void SetContentDecryptionModule( blink::WebContentDecryptionModule* cdm) override; - virtual void SetContentDecryptionModule( + void SetContentDecryptionModule( blink::WebContentDecryptionModule* cdm, blink::WebContentDecryptionModuleResult result) override; - // Callback factory and notification methods used by WebMediaPlayerImpl. // 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; + 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; + SetDecryptorReadyCB CreateSetDecryptorReadyCB() override; // Called to inform this object that the media pipeline encountered // and handled a decryption error. - virtual void OnPipelineDecryptError() override; + void OnPipelineDecryptError() override; private: NullEncryptedMediaPlayerSupport(); diff --git a/media/blink/texttrack_impl.h b/media/blink/texttrack_impl.h index 104b9c9..70c6a22 100644 --- a/media/blink/texttrack_impl.h +++ b/media/blink/texttrack_impl.h @@ -31,13 +31,13 @@ class TextTrackImpl : public TextTrack { blink::WebMediaPlayerClient* client, scoped_ptr<WebInbandTextTrackImpl> text_track); - virtual ~TextTrackImpl(); + ~TextTrackImpl() override; - virtual void addWebVTTCue(const base::TimeDelta& start, - const base::TimeDelta& end, - const std::string& id, - const std::string& content, - const std::string& settings) override; + void addWebVTTCue(const base::TimeDelta& start, + const base::TimeDelta& end, + const std::string& id, + const std::string& content, + 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 a76c122..f8bdd1e 100644 --- a/media/blink/video_frame_compositor.h +++ b/media/blink/video_frame_compositor.h @@ -40,14 +40,13 @@ class MEDIA_EXPORT VideoFrameCompositor VideoFrameCompositor( const base::Callback<void(gfx::Size)>& natural_size_changed_cb, const base::Callback<void(bool)>& opacity_changed_cb); - virtual ~VideoFrameCompositor(); + ~VideoFrameCompositor() override; // cc::VideoFrameProvider implementation. - virtual void SetVideoFrameProviderClient( + void SetVideoFrameProviderClient( cc::VideoFrameProvider::Client* client) override; - virtual scoped_refptr<VideoFrame> GetCurrentFrame() override; - virtual void PutCurrentFrame( - const scoped_refptr<VideoFrame>& frame) override; + scoped_refptr<VideoFrame> GetCurrentFrame() override; + void PutCurrentFrame(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/webaudiosourceprovider_impl.h b/media/blink/webaudiosourceprovider_impl.h index 943a500..77204b2 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 Initialize(const AudioParameters& params, - RenderCallback* renderer) override; + void Start() override; + void Stop() override; + void Play() override; + void Pause() override; + bool SetVolume(double volume) override; + void Initialize(const AudioParameters& params, + RenderCallback* renderer) override; protected: virtual ~WebAudioSourceProviderImpl(); diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc index 24538c1..a4e829d 100644 --- a/media/blink/webmediaplayer_impl.cc +++ b/media/blink/webmediaplayer_impl.cc @@ -93,11 +93,11 @@ class SyncPointClientImpl : public media::VideoFrame::SyncPointClient { explicit SyncPointClientImpl( blink::WebGraphicsContext3D* web_graphics_context) : web_graphics_context_(web_graphics_context) {} - virtual ~SyncPointClientImpl() {} - virtual uint32 InsertSyncPoint() override { + ~SyncPointClientImpl() override {} + uint32 InsertSyncPoint() override { return web_graphics_context_->insertSyncPoint(); } - virtual void WaitSyncPoint(uint32 sync_point) override { + 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 5c70dbd..571e92e 100644 --- a/media/cast/cast_sender_impl.cc +++ b/media/cast/cast_sender_impl.cc @@ -21,9 +21,8 @@ class LocalVideoFrameInput : public VideoFrameInput { base::WeakPtr<VideoSender> video_sender) : cast_environment_(cast_environment), video_sender_(video_sender) {} - virtual void InsertRawVideoFrame( - const scoped_refptr<media::VideoFrame>& video_frame, - const base::TimeTicks& capture_time) override { + void InsertRawVideoFrame(const scoped_refptr<media::VideoFrame>& video_frame, + const base::TimeTicks& capture_time) override { cast_environment_->PostTask(CastEnvironment::MAIN, FROM_HERE, base::Bind(&VideoSender::InsertRawVideoFrame, @@ -33,7 +32,7 @@ class LocalVideoFrameInput : public VideoFrameInput { } protected: - virtual ~LocalVideoFrameInput() {} + ~LocalVideoFrameInput() override {} private: friend class base::RefCountedThreadSafe<LocalVideoFrameInput>; @@ -52,8 +51,8 @@ class LocalAudioFrameInput : public AudioFrameInput { base::WeakPtr<AudioSender> audio_sender) : cast_environment_(cast_environment), audio_sender_(audio_sender) {} - virtual void InsertAudio(scoped_ptr<AudioBus> audio_bus, - const base::TimeTicks& recorded_time) override { + void InsertAudio(scoped_ptr<AudioBus> audio_bus, + const base::TimeTicks& recorded_time) override { cast_environment_->PostTask(CastEnvironment::MAIN, FROM_HERE, base::Bind(&AudioSender::InsertAudio, @@ -63,7 +62,7 @@ class LocalAudioFrameInput : public AudioFrameInput { } protected: - virtual ~LocalAudioFrameInput() {} + ~LocalAudioFrameInput() override {} private: friend class base::RefCountedThreadSafe<LocalAudioFrameInput>; diff --git a/media/cast/cast_sender_impl.h b/media/cast/cast_sender_impl.h index 4abbf8e..b76603e 100644 --- a/media/cast/cast_sender_impl.h +++ b/media/cast/cast_sender_impl.h @@ -27,23 +27,22 @@ class CastSenderImpl : public CastSender { CastSenderImpl(scoped_refptr<CastEnvironment> cast_environment, CastTransportSender* const transport_sender); - virtual void InitializeAudio( + void InitializeAudio( const AudioSenderConfig& audio_config, const CastInitializationCallback& cast_initialization_cb) override; - virtual void InitializeVideo( + void InitializeVideo( const VideoSenderConfig& video_config, const CastInitializationCallback& cast_initialization_cb, const CreateVideoEncodeAcceleratorCallback& create_vea_cb, const CreateVideoEncodeMemoryCallback& create_video_encode_mem_cb) override; - virtual void SetTargetPlayoutDelay( - base::TimeDelta new_target_playout_delay) override; + void SetTargetPlayoutDelay(base::TimeDelta new_target_playout_delay) override; - virtual ~CastSenderImpl(); + ~CastSenderImpl() override; - virtual scoped_refptr<AudioFrameInput> audio_frame_input() override; - virtual scoped_refptr<VideoFrameInput> video_frame_input() override; + scoped_refptr<AudioFrameInput> audio_frame_input() override; + 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 58dccbb..a67e5bc 100644 --- a/media/cast/logging/encoding_event_subscriber.h +++ b/media/cast/logging/encoding_event_subscriber.h @@ -49,11 +49,11 @@ class EncodingEventSubscriber : public RawEventSubscriber { // timestamp). EncodingEventSubscriber(EventMediaType event_media_type, size_t max_frames); - virtual ~EncodingEventSubscriber(); + ~EncodingEventSubscriber() override; // RawReventSubscriber implementations. - virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) override; - virtual void OnReceivePacketEvent(const PacketEvent& packet_event) override; + void OnReceiveFrameEvent(const FrameEvent& frame_event) override; + 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.h b/media/cast/logging/receiver_time_offset_estimator.h index 5880a8d..6fb5f67 100644 --- a/media/cast/logging/receiver_time_offset_estimator.h +++ b/media/cast/logging/receiver_time_offset_estimator.h @@ -24,7 +24,7 @@ namespace cast { // timestamp. class ReceiverTimeOffsetEstimator : public RawEventSubscriber { public: - virtual ~ReceiverTimeOffsetEstimator() {} + ~ReceiverTimeOffsetEstimator() override {} // If bounds are known, assigns |lower_bound| and |upper_bound| with the // lower bound and upper bound for the offset value, respectively. diff --git a/media/cast/logging/receiver_time_offset_estimator_impl.h b/media/cast/logging/receiver_time_offset_estimator_impl.h index f39cfa2..bc5348b 100644 --- a/media/cast/logging/receiver_time_offset_estimator_impl.h +++ b/media/cast/logging/receiver_time_offset_estimator_impl.h @@ -36,15 +36,15 @@ class ReceiverTimeOffsetEstimatorImpl : public ReceiverTimeOffsetEstimator { public: ReceiverTimeOffsetEstimatorImpl(); - virtual ~ReceiverTimeOffsetEstimatorImpl(); + ~ReceiverTimeOffsetEstimatorImpl() override; // RawEventSubscriber implementations. - virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) override; - virtual void OnReceivePacketEvent(const PacketEvent& packet_event) override; + void OnReceiveFrameEvent(const FrameEvent& frame_event) override; + void OnReceivePacketEvent(const PacketEvent& packet_event) override; // ReceiverTimeOffsetEstimator implementation. - virtual bool GetReceiverOffsetBounds(base::TimeDelta* lower_bound, - base::TimeDelta* upper_bound) override; + bool GetReceiverOffsetBounds(base::TimeDelta* lower_bound, + 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 3f816e0..176ab8c 100644 --- a/media/cast/logging/simple_event_subscriber.h +++ b/media/cast/logging/simple_event_subscriber.h @@ -22,11 +22,11 @@ class SimpleEventSubscriber : public RawEventSubscriber { public: SimpleEventSubscriber(); - virtual ~SimpleEventSubscriber(); + ~SimpleEventSubscriber() override; // RawEventSubscriber implementations. - virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) override; - virtual void OnReceivePacketEvent(const PacketEvent& packet_event) override; + void OnReceiveFrameEvent(const FrameEvent& frame_event) override; + 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 d376313..2039402 100644 --- a/media/cast/logging/stats_event_subscriber.h +++ b/media/cast/logging/stats_event_subscriber.h @@ -32,11 +32,11 @@ class StatsEventSubscriber : public RawEventSubscriber { base::TickClock* clock, ReceiverTimeOffsetEstimator* offset_estimator); - virtual ~StatsEventSubscriber(); + ~StatsEventSubscriber() override; // RawReventSubscriber implementations. - virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) override; - virtual void OnReceivePacketEvent(const PacketEvent& packet_event) override; + void OnReceiveFrameEvent(const FrameEvent& frame_event) override; + 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 ac3c34e..f5c07c9 100644 --- a/media/cast/net/cast_transport_sender_impl.h +++ b/media/cast/net/cast_transport_sender_impl.h @@ -77,28 +77,26 @@ class CastTransportSenderImpl : public CastTransportSender { const scoped_refptr<base::SingleThreadTaskRunner>& transport_task_runner, PacketSender* external_transport); - virtual ~CastTransportSenderImpl(); + ~CastTransportSenderImpl() override; - virtual void InitializeAudio(const CastTransportRtpConfig& config, - const RtcpCastMessageCallback& cast_message_cb, - 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; + void InitializeAudio(const CastTransportRtpConfig& config, + const RtcpCastMessageCallback& cast_message_cb, + const RtcpRttCallback& rtt_cb) override; + void InitializeVideo(const CastTransportRtpConfig& config, + const RtcpCastMessageCallback& cast_message_cb, + const RtcpRttCallback& rtt_cb) override; + void InsertFrame(uint32 ssrc, const EncodedFrame& frame) override; - virtual void SendSenderReport( - uint32 ssrc, - base::TimeTicks current_time, - uint32 current_time_as_rtp_timestamp) override; + void SendSenderReport(uint32 ssrc, + base::TimeTicks current_time, + uint32 current_time_as_rtp_timestamp) override; - virtual void CancelSendingFrames( - uint32 ssrc, - const std::vector<uint32>& frame_ids) override; + void CancelSendingFrames(uint32 ssrc, + const std::vector<uint32>& frame_ids) override; - virtual void ResendFrameForKickstart(uint32 ssrc, uint32 frame_id) override; + void ResendFrameForKickstart(uint32 ssrc, uint32 frame_id) override; - virtual PacketReceiverCallback PacketReceiverForTesting() override; + 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 3df4b60..8330627 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 { + bool SendPacket(PacketRef packet, const base::Closure& cb) override { if (paused_) { stored_packet_ = packet; callback_ = cb; @@ -42,9 +42,7 @@ class FakePacketSender : public PacketSender { return true; } - virtual int64 GetBytesSent() override { - return bytes_sent_; - } + int64 GetBytesSent() override { return bytes_sent_; } void SetPaused(bool paused) { paused_ = paused; diff --git a/media/cast/net/pacing/paced_sender.h b/media/cast/net/pacing/paced_sender.h index ca38517..71349c0 100644 --- a/media/cast/net/pacing/paced_sender.h +++ b/media/cast/net/pacing/paced_sender.h @@ -89,7 +89,7 @@ class PacedSender : public PacedPacketSender, PacketSender* external_transport, const scoped_refptr<base::SingleThreadTaskRunner>& transport_task_runner); - virtual ~PacedSender(); + ~PacedSender() override; // These must be called before non-RTCP packets are sent. void RegisterAudioSsrc(uint32 audio_ssrc); @@ -111,11 +111,11 @@ class PacedSender : public PacedPacketSender, int64 GetLastByteSentForSsrc(uint32 ssrc); // PacedPacketSender implementation. - 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; + bool SendPackets(const SendPacketVector& packets) override; + bool ResendPackets(const SendPacketVector& packets, + const DedupInfo& dedup_info) override; + bool SendRtcpPacket(uint32 ssrc, PacketRef packet) override; + 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 8e3fa16..4a8810d 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 { + 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,9 +41,7 @@ class TestPacketSender : public PacketSender { return true; } - virtual int64 GetBytesSent() override { - return bytes_sent_; - } + int64 GetBytesSent() override { return bytes_sent_; } void AddExpectedSize(int expected_packet_size, int repeat_count) { for (int i = 0; i < repeat_count; ++i) { diff --git a/media/cast/net/rtcp/receiver_rtcp_event_subscriber.h b/media/cast/net/rtcp/receiver_rtcp_event_subscriber.h index 5a9acb79..c08733c 100644 --- a/media/cast/net/rtcp/receiver_rtcp_event_subscriber.h +++ b/media/cast/net/rtcp/receiver_rtcp_event_subscriber.h @@ -37,11 +37,11 @@ class ReceiverRtcpEventSubscriber : public RawEventSubscriber { ReceiverRtcpEventSubscriber(const size_t max_size_to_retain, EventMediaType type); - virtual ~ReceiverRtcpEventSubscriber(); + ~ReceiverRtcpEventSubscriber() override; // RawEventSubscriber implementation. - virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) override; - virtual void OnReceivePacketEvent(const PacketEvent& packet_event) override; + void OnReceiveFrameEvent(const FrameEvent& frame_event) override; + 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/rtcp_unittest.cc b/media/cast/net/rtcp/rtcp_unittest.cc index f0e5602..9363f70 100644 --- a/media/cast/net/rtcp/rtcp_unittest.cc +++ b/media/cast/net/rtcp/rtcp_unittest.cc @@ -32,23 +32,20 @@ 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 { + 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 { - return false; - } + bool SendPackets(const SendPacketVector& packets) override { return false; } - virtual bool ResendPackets( - const SendPacketVector& packets, const DedupInfo& dedup_info) override { + bool ResendPackets(const SendPacketVector& packets, + const DedupInfo& dedup_info) override { return false; } - virtual void CancelSendingPacket(const PacketKey& packet_key) override { - } + void CancelSendingPacket(const PacketKey& packet_key) override {} private: base::SimpleTestTickClock* const clock_; @@ -61,12 +58,12 @@ class FakeRtcpTransport : public PacedPacketSender { class FakeReceiverStats : public RtpReceiverStatistics { public: FakeReceiverStats() {} - virtual ~FakeReceiverStats() {} + ~FakeReceiverStats() override {} - virtual void GetStatistics(uint8* fraction_lost, - uint32* cumulative_lost, - uint32* extended_high_sequence_number, - uint32* jitter) override { + void GetStatistics(uint8* fraction_lost, + uint32* cumulative_lost, + uint32* extended_high_sequence_number, + 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 f28cc0a..7080900 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 { + 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 806d351..d428403 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; + ~ReceiverStats() override; - virtual void GetStatistics(uint8* fraction_lost, - uint32* cumulative_lost, // 24 bits valid. - uint32* extended_high_sequence_number, - uint32* jitter) override; + void GetStatistics(uint8* fraction_lost, + uint32* cumulative_lost, // 24 bits valid. + uint32* extended_high_sequence_number, + 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 4a3ea84..aa1b4c5 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 { + bool SendPacket(PacketRef packet, const base::Closure& cb) override { ++packets_sent_; RtpHeaderParser parser(&packet->data[0], packet->data.size()); RtpCastTestHeader rtp_header; @@ -72,9 +72,7 @@ class TestRtpPacketTransport : public PacketSender { return true; } - virtual int64 GetBytesSent() override { - return 0; - } + int64 GetBytesSent() override { return 0; } size_t number_of_packets_received() const { return packets_sent_; } diff --git a/media/cast/net/udp_transport.h b/media/cast/net/udp_transport.h index 0db113f..0ee6346 100644 --- a/media/cast/net/udp_transport.h +++ b/media/cast/net/udp_transport.h @@ -43,7 +43,7 @@ class UdpTransport : public PacketSender { const net::IPEndPoint& remote_end_point, int32 send_buffer_size, const CastTransportStatusCallback& status_callback); - virtual ~UdpTransport(); + ~UdpTransport() override; // Start receiving packets. Packets are submitted to |packet_receiver|. void StartReceiving(const PacketReceiverCallback& packet_receiver); @@ -53,9 +53,8 @@ class UdpTransport : public PacketSender { void SetDscp(net::DiffServCodePoint dscp); // PacketSender implementations. - virtual bool SendPacket(PacketRef packet, - const base::Closure& cb) override; - virtual int64 GetBytesSent() override; + bool SendPacket(PacketRef packet, const base::Closure& cb) override; + 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 402ff3b..5f4720e 100644 --- a/media/cast/receiver/audio_decoder.cc +++ b/media/cast/receiver/audio_decoder.cc @@ -116,9 +116,9 @@ class AudioDecoder::OpusImpl : public AudioDecoder::ImplBase { } private: - virtual ~OpusImpl() {} + ~OpusImpl() override {} - virtual void RecoverBecauseFramesWereDropped() override { + 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 { + 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); @@ -175,9 +175,9 @@ class AudioDecoder::Pcm16Impl : public AudioDecoder::ImplBase { } private: - virtual ~Pcm16Impl() {} + ~Pcm16Impl() override {} - virtual scoped_ptr<AudioBus> Decode(uint8* data, int len) override { + 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/cast_receiver_impl.h b/media/cast/receiver/cast_receiver_impl.h index 23e6a9c..5431393 100644 --- a/media/cast/receiver/cast_receiver_impl.h +++ b/media/cast/receiver/cast_receiver_impl.h @@ -29,17 +29,17 @@ class CastReceiverImpl : public CastReceiver { const FrameReceiverConfig& video_config, PacketSender* const packet_sender); - virtual ~CastReceiverImpl(); + ~CastReceiverImpl() override; // CastReceiver implementation. - virtual PacketReceiverCallback packet_receiver() override; - virtual void RequestDecodedAudioFrame( + PacketReceiverCallback packet_receiver() override; + void RequestDecodedAudioFrame( const AudioFrameDecodedCallback& callback) override; - virtual void RequestEncodedAudioFrame( + void RequestEncodedAudioFrame( const ReceiveEncodedFrameCallback& callback) override; - virtual void RequestDecodedVideoFrame( + void RequestDecodedVideoFrame( const VideoFrameDecodedCallback& callback) override; - virtual void RequestEncodedVideoFrame( + void RequestEncodedVideoFrame( const ReceiveEncodedFrameCallback& callback) override; private: diff --git a/media/cast/receiver/frame_receiver.h b/media/cast/receiver/frame_receiver.h index 396aada..4d673f3 100644 --- a/media/cast/receiver/frame_receiver.h +++ b/media/cast/receiver/frame_receiver.h @@ -52,7 +52,7 @@ class FrameReceiver : public RtpPayloadFeedback, EventMediaType event_media_type, PacedPacketSender* const packet_sender); - virtual ~FrameReceiver(); + ~FrameReceiver() override; // Request an encoded frame. // @@ -76,7 +76,7 @@ class FrameReceiver : public RtpPayloadFeedback, size_t payload_size); // RtpPayloadFeedback implementation. - virtual void CastFeedback(const RtcpCastMessage& cast_message) override; + 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 1eaa6f3..e536c3e 100644 --- a/media/cast/receiver/video_decoder.cc +++ b/media/cast/receiver/video_decoder.cc @@ -114,12 +114,12 @@ class VideoDecoder::Vp8Impl : public VideoDecoder::ImplBase { } private: - virtual ~Vp8Impl() { + ~Vp8Impl() override { if (ImplBase::cast_initialization_status_ == STATUS_VIDEO_INITIALIZED) CHECK_EQ(VPX_CODEC_OK, vpx_codec_destroy(&context_)); } - virtual scoped_refptr<VideoFrame> Decode(uint8* data, int len) override { + scoped_refptr<VideoFrame> Decode(uint8* data, int len) override { if (len <= 0 || vpx_codec_decode(&context_, data, static_cast<unsigned int>(len), @@ -181,9 +181,9 @@ class VideoDecoder::FakeImpl : public VideoDecoder::ImplBase { } private: - virtual ~FakeImpl() {} + ~FakeImpl() override {} - virtual scoped_refptr<VideoFrame> Decode(uint8* data, int len) override { + 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/sender/audio_encoder.cc b/media/cast/sender/audio_encoder.cc index 28238a7..bf1d3ac 100644 --- a/media/cast/sender/audio_encoder.cc +++ b/media/cast/sender/audio_encoder.cc @@ -237,12 +237,12 @@ class AudioEncoder::OpusImpl : public AudioEncoder::ImplBase { } private: - virtual ~OpusImpl() {} + ~OpusImpl() override {} - virtual void TransferSamplesIntoBuffer(const AudioBus* audio_bus, - int source_offset, - int buffer_fill_offset, - int num_samples) override { + void TransferSamplesIntoBuffer(const AudioBus* audio_bus, + int source_offset, + int buffer_fill_offset, + 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 { + bool EncodeFromFilledBuffer(std::string* out) override { out->resize(kOpusMaxPayloadSize); const opus_int32 result = opus_encode_float(opus_encoder_, @@ -307,12 +307,12 @@ class AudioEncoder::Pcm16Impl : public AudioEncoder::ImplBase { } private: - virtual ~Pcm16Impl() {} + ~Pcm16Impl() override {} - virtual void TransferSamplesIntoBuffer(const AudioBus* audio_bus, - int source_offset, - int buffer_fill_offset, - int num_samples) override { + void TransferSamplesIntoBuffer(const AudioBus* audio_bus, + int source_offset, + int buffer_fill_offset, + 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 { + 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 07646ab..d7f8c69 100644 --- a/media/cast/sender/audio_sender.h +++ b/media/cast/sender/audio_sender.h @@ -35,7 +35,7 @@ class AudioSender : public FrameSender, const AudioSenderConfig& audio_config, CastTransportSender* const transport_sender); - virtual ~AudioSender(); + ~AudioSender() override; CastInitializationStatus InitializationResult() const { return cast_initialization_status_; @@ -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; + int GetNumberOfFramesInEncoder() const override; + base::TimeDelta GetInFlightMediaDuration() const override; + 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 b401bae..af8ac3f3 100644 --- a/media/cast/sender/audio_sender_unittest.cc +++ b/media/cast/sender/audio_sender_unittest.cc @@ -25,8 +25,7 @@ class TestPacketSender : public PacketSender { public: TestPacketSender() : number_of_rtp_packets_(0), number_of_rtcp_packets_(0) {} - virtual bool SendPacket(PacketRef packet, - const base::Closure& cb) override { + bool SendPacket(PacketRef packet, const base::Closure& cb) override { if (Rtcp::IsRtcpPacket(&packet->data[0], packet->data.size())) { ++number_of_rtcp_packets_; } else { @@ -41,9 +40,7 @@ class TestPacketSender : public PacketSender { return true; } - virtual int64 GetBytesSent() override { - return 0; - } + int64 GetBytesSent() override { return 0; } int number_of_rtp_packets() const { return number_of_rtp_packets_; } diff --git a/media/cast/sender/congestion_control.cc b/media/cast/sender/congestion_control.cc index a3ebcf1..d14f9b0 100644 --- a/media/cast/sender/congestion_control.cc +++ b/media/cast/sender/congestion_control.cc @@ -29,23 +29,23 @@ class AdaptiveCongestionControl : public CongestionControl { uint32 min_bitrate_configured, double max_frame_rate); - virtual ~AdaptiveCongestionControl() override; + ~AdaptiveCongestionControl() override; - virtual void UpdateRtt(base::TimeDelta rtt) override; + void UpdateRtt(base::TimeDelta rtt) override; - virtual void UpdateTargetPlayoutDelay(base::TimeDelta delay) override; + void UpdateTargetPlayoutDelay(base::TimeDelta delay) 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; + void SendFrameToTransport(uint32 frame_id, + size_t frame_size, + base::TimeTicks when) override; // Called when we receive an ACK for a frame. - virtual void AckFrame(uint32 frame_id, base::TimeTicks when) override; + 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; + uint32 GetBitrate(base::TimeTicks playout_time, + base::TimeDelta playout_delay) override; private: struct FrameStats { @@ -96,27 +96,23 @@ class AdaptiveCongestionControl : public CongestionControl { class FixedCongestionControl : public CongestionControl { public: FixedCongestionControl(uint32 bitrate) : bitrate_(bitrate) {} - virtual ~FixedCongestionControl() override {} + ~FixedCongestionControl() override {} - virtual void UpdateRtt(base::TimeDelta rtt) override { - } + void UpdateRtt(base::TimeDelta rtt) override {} - virtual void UpdateTargetPlayoutDelay(base::TimeDelta delay) override { - } + void UpdateTargetPlayoutDelay(base::TimeDelta delay) 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 { - } + void SendFrameToTransport(uint32 frame_id, + size_t frame_size, + base::TimeTicks when) override {} // Called when we receive an ACK for a frame. - virtual void AckFrame(uint32 frame_id, base::TimeTicks when) override { - } + 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 { + uint32 GetBitrate(base::TimeTicks playout_time, + 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 a856ed3..6dec102 100644 --- a/media/cast/sender/external_video_encoder.cc +++ b/media/cast/sender/external_video_encoder.cc @@ -173,7 +173,7 @@ class LocalVideoEncodeAcceleratorClient } protected: - virtual void NotifyError(VideoEncodeAccelerator::Error error) override { + void NotifyError(VideoEncodeAccelerator::Error error) override { DCHECK(encoder_task_runner_.get()); DCHECK(encoder_task_runner_->RunsTasksOnCurrentThread()); VLOG(1) << "ExternalVideoEncoder NotifyError: " << error; @@ -185,9 +185,9 @@ 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 { + void RequireBitstreamBuffers(unsigned int input_count, + const gfx::Size& input_coded_size, + size_t output_buffer_size) override { DCHECK(encoder_task_runner_.get()); DCHECK(encoder_task_runner_->RunsTasksOnCurrentThread()); DCHECK(video_encode_accelerator_); @@ -202,9 +202,9 @@ class LocalVideoEncodeAcceleratorClient // Encoder has encoded a frame and it's available in one of out output // buffers. - virtual void BitstreamBufferReady(int32 bitstream_buffer_id, - size_t payload_size, - bool key_frame) override { + void BitstreamBufferReady(int32 bitstream_buffer_id, + size_t payload_size, + bool key_frame) override { DCHECK(encoder_task_runner_.get()); DCHECK(encoder_task_runner_->RunsTasksOnCurrentThread()); if (bitstream_buffer_id < 0 || @@ -361,7 +361,7 @@ class LocalVideoEncodeAcceleratorClient friend class base::RefCountedThreadSafe<LocalVideoEncodeAcceleratorClient>; - virtual ~LocalVideoEncodeAcceleratorClient() { + ~LocalVideoEncodeAcceleratorClient() override { Destroy(); DCHECK(!video_encode_accelerator_); } diff --git a/media/cast/sender/external_video_encoder.h b/media/cast/sender/external_video_encoder.h index 85d9ffd..9012555 100644 --- a/media/cast/sender/external_video_encoder.h +++ b/media/cast/sender/external_video_encoder.h @@ -32,16 +32,16 @@ class ExternalVideoEncoder : public VideoEncoder { const CreateVideoEncodeAcceleratorCallback& create_vea_cb, const CreateVideoEncodeMemoryCallback& create_video_encode_mem_cb); - virtual ~ExternalVideoEncoder(); + ~ExternalVideoEncoder() override; // VideoEncoder implementation. - virtual bool EncodeVideoFrame( + bool EncodeVideoFrame( const scoped_refptr<media::VideoFrame>& video_frame, const base::TimeTicks& reference_time, const FrameEncodedCallback& frame_encoded_callback) override; - virtual void SetBitRate(int new_bit_rate) override; - virtual void GenerateKeyFrame() override; - virtual void LatestFrameIdToReference(uint32 frame_id) override; + void SetBitRate(int new_bit_rate) override; + void GenerateKeyFrame() override; + 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 ced126d..cf5769c 100644 --- a/media/cast/sender/fake_software_video_encoder.h +++ b/media/cast/sender/fake_software_video_encoder.h @@ -14,16 +14,16 @@ namespace cast { class FakeSoftwareVideoEncoder : public SoftwareVideoEncoder { public: FakeSoftwareVideoEncoder(const VideoSenderConfig& video_config); - virtual ~FakeSoftwareVideoEncoder(); + ~FakeSoftwareVideoEncoder() override; // SoftwareVideoEncoder implementations. - virtual void Initialize() override; - virtual void Encode(const scoped_refptr<media::VideoFrame>& video_frame, - const base::TimeTicks& reference_time, - EncodedFrame* encoded_frame) override; - virtual void UpdateRates(uint32 new_bitrate) override; - virtual void GenerateKeyFrame() override; - virtual void LatestFrameIdToReference(uint32 frame_id) override; + void Initialize() override; + void Encode(const scoped_refptr<media::VideoFrame>& video_frame, + const base::TimeTicks& reference_time, + EncodedFrame* encoded_frame) override; + void UpdateRates(uint32 new_bitrate) override; + void GenerateKeyFrame() override; + 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 47401ea..58a6769 100644 --- a/media/cast/sender/video_encoder_impl.h +++ b/media/cast/sender/video_encoder_impl.h @@ -32,16 +32,16 @@ class VideoEncoderImpl : public VideoEncoder { VideoEncoderImpl(scoped_refptr<CastEnvironment> cast_environment, const VideoSenderConfig& video_config); - virtual ~VideoEncoderImpl(); + ~VideoEncoderImpl() override; // VideoEncoder implementation. - virtual bool EncodeVideoFrame( + bool EncodeVideoFrame( const scoped_refptr<media::VideoFrame>& video_frame, const base::TimeTicks& reference_time, const FrameEncodedCallback& frame_encoded_callback) override; - virtual void SetBitRate(int new_bit_rate) override; - virtual void GenerateKeyFrame() override; - virtual void LatestFrameIdToReference(uint32 frame_id) override; + void SetBitRate(int new_bit_rate) override; + void GenerateKeyFrame() override; + void LatestFrameIdToReference(uint32 frame_id) override; private: scoped_refptr<CastEnvironment> cast_environment_; diff --git a/media/cast/sender/video_sender.h b/media/cast/sender/video_sender.h index 6c0bad7..826099e 100644 --- a/media/cast/sender/video_sender.h +++ b/media/cast/sender/video_sender.h @@ -45,7 +45,7 @@ class VideoSender : public FrameSender, CastTransportSender* const transport_sender, const PlayoutDelayChangeCB& playout_delay_change_cb); - virtual ~VideoSender(); + ~VideoSender() override; // Note: It is not guaranteed that |video_frame| will actually be encoded and // sent, if VideoSender detects too many frames in flight. Therefore, clients @@ -57,9 +57,9 @@ class VideoSender : public FrameSender, const base::TimeTicks& reference_time); protected: - virtual int GetNumberOfFramesInEncoder() const override; - virtual base::TimeDelta GetInFlightMediaDuration() const override; - virtual void OnAck(uint32 frame_id) override; + int GetNumberOfFramesInEncoder() const override; + base::TimeDelta GetInFlightMediaDuration() const override; + 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 29cbfb4..2276e33 100644 --- a/media/cast/sender/video_sender_unittest.cc +++ b/media/cast/sender/video_sender_unittest.cc @@ -64,8 +64,7 @@ class TestPacketSender : public PacketSender { paused_(false) {} // A singular packet implies a RTCP packet. - virtual bool SendPacket(PacketRef packet, - const base::Closure& cb) override { + bool SendPacket(PacketRef packet, const base::Closure& cb) override { if (paused_) { stored_packet_ = packet; callback_ = cb; @@ -85,9 +84,7 @@ class TestPacketSender : public PacketSender { return true; } - virtual int64 GetBytesSent() override { - return 0; - } + int64 GetBytesSent() override { return 0; } int number_of_rtp_packets() const { return number_of_rtp_packets_; } diff --git a/media/cast/sender/vp8_encoder.h b/media/cast/sender/vp8_encoder.h index c9b6705..bf678bc 100644 --- a/media/cast/sender/vp8_encoder.h +++ b/media/cast/sender/vp8_encoder.h @@ -23,16 +23,16 @@ class Vp8Encoder : public SoftwareVideoEncoder { public: explicit Vp8Encoder(const VideoSenderConfig& video_config); - virtual ~Vp8Encoder(); + ~Vp8Encoder() override; // SoftwareVideoEncoder implementations. - virtual void Initialize() override; - virtual void Encode(const scoped_refptr<media::VideoFrame>& video_frame, - const base::TimeTicks& reference_time, - EncodedFrame* encoded_frame) override; - virtual void UpdateRates(uint32 new_bitrate) override; - virtual void GenerateKeyFrame() override; - virtual void LatestFrameIdToReference(uint32 frame_id) override; + void Initialize() override; + void Encode(const scoped_refptr<media::VideoFrame>& video_frame, + const base::TimeTicks& reference_time, + EncodedFrame* encoded_frame) override; + void UpdateRates(uint32 new_bitrate) override; + void GenerateKeyFrame() override; + void LatestFrameIdToReference(uint32 frame_id) override; private: enum { kNumberOfVp8VideoBuffers = 3 }; diff --git a/media/cast/test/cast_benchmarks.cc b/media/cast/test/cast_benchmarks.cc index 6e1f8f1..bfa1270 100644 --- a/media/cast/test/cast_benchmarks.cc +++ b/media/cast/test/cast_benchmarks.cc @@ -108,24 +108,21 @@ class CastTransportSenderWrapper : public CastTransportSender { encoded_audio_bytes_ = encoded_audio_bytes; } - virtual void InitializeAudio( - const CastTransportRtpConfig& config, - const RtcpCastMessageCallback& cast_message_cb, - const RtcpRttCallback& rtt_cb) override { + void InitializeAudio(const CastTransportRtpConfig& config, + const RtcpCastMessageCallback& cast_message_cb, + const RtcpRttCallback& rtt_cb) override { audio_ssrc_ = config.ssrc; transport_->InitializeAudio(config, cast_message_cb, rtt_cb); } - virtual void InitializeVideo( - const CastTransportRtpConfig& config, - const RtcpCastMessageCallback& cast_message_cb, - const RtcpRttCallback& rtt_cb) override { + void InitializeVideo(const CastTransportRtpConfig& config, + const RtcpCastMessageCallback& cast_message_cb, + 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 { + void InsertFrame(uint32 ssrc, const EncodedFrame& frame) override { if (ssrc == audio_ssrc_) { *encoded_audio_bytes_ += frame.data.size(); } else if (ssrc == video_ssrc_) { @@ -134,27 +131,24 @@ class CastTransportSenderWrapper : public CastTransportSender { transport_->InsertFrame(ssrc, frame); } - virtual void SendSenderReport( - uint32 ssrc, - base::TimeTicks current_time, - uint32 current_time_as_rtp_timestamp) override { + void SendSenderReport(uint32 ssrc, + base::TimeTicks current_time, + uint32 current_time_as_rtp_timestamp) override { transport_->SendSenderReport(ssrc, current_time, current_time_as_rtp_timestamp); } - virtual void CancelSendingFrames( - uint32 ssrc, - const std::vector<uint32>& frame_ids) override { + void CancelSendingFrames(uint32 ssrc, + const std::vector<uint32>& frame_ids) override { transport_->CancelSendingFrames(ssrc, frame_ids); } - virtual void ResendFrameForKickstart(uint32 ssrc, - uint32 frame_id) override { + void ResendFrameForKickstart(uint32 ssrc, uint32 frame_id) override { transport_->ResendFrameForKickstart(ssrc, frame_id); } - virtual PacketReceiverCallback PacketReceiverForTesting() override { + PacketReceiverCallback PacketReceiverForTesting() override { return transport_->PacketReceiverForTesting(); } diff --git a/media/cast/test/end2end_unittest.cc b/media/cast/test/end2end_unittest.cc index 7845ca9..7489927 100644 --- a/media/cast/test/end2end_unittest.cc +++ b/media/cast/test/end2end_unittest.cc @@ -171,10 +171,10 @@ class LoopBackPacketPipe : public test::PacketPipe { LoopBackPacketPipe(const PacketReceiverCallback& packet_receiver) : packet_receiver_(packet_receiver) {} - virtual ~LoopBackPacketPipe() {} + ~LoopBackPacketPipe() override {} // PacketPipe implementations. - virtual void Send(scoped_ptr<Packet> packet) override { + void Send(scoped_ptr<Packet> packet) override { packet_receiver_.Run(packet.Pass()); } @@ -206,8 +206,7 @@ class LoopBackTransport : public PacketSender { packet_pipe_->InitOnIOThread(task_runner, clock); } - virtual bool SendPacket(PacketRef packet, - const base::Closure& cb) override { + bool SendPacket(PacketRef packet, const base::Closure& cb) override { DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN)); if (!send_packets_) return true; @@ -224,9 +223,7 @@ class LoopBackTransport : public PacketSender { return true; } - virtual int64 GetBytesSent() override { - return bytes_sent_; - } + int64 GetBytesSent() override { return bytes_sent_; } void SetSendPackets(bool send_packets) { send_packets_ = send_packets; } diff --git a/media/cast/test/fake_receiver_time_offset_estimator.h b/media/cast/test/fake_receiver_time_offset_estimator.h index 2b78c06..fc3a901 100644 --- a/media/cast/test/fake_receiver_time_offset_estimator.h +++ b/media/cast/test/fake_receiver_time_offset_estimator.h @@ -20,15 +20,15 @@ class FakeReceiverTimeOffsetEstimator : public ReceiverTimeOffsetEstimator { public: FakeReceiverTimeOffsetEstimator(base::TimeDelta offset); - virtual ~FakeReceiverTimeOffsetEstimator(); + ~FakeReceiverTimeOffsetEstimator() override; // RawReventSubscriber implementations. - virtual void OnReceiveFrameEvent(const FrameEvent& frame_event) override; - virtual void OnReceivePacketEvent(const PacketEvent& packet_event) override; + void OnReceiveFrameEvent(const FrameEvent& frame_event) override; + void OnReceivePacketEvent(const PacketEvent& packet_event) override; // ReceiverTimeOffsetEstimator - virtual bool GetReceiverOffsetBounds(base::TimeDelta* lower_bound, - base::TimeDelta* upper_bound) override; + bool GetReceiverOffsetBounds(base::TimeDelta* lower_bound, + 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 8392e4a..60aaae4 100644 --- a/media/cast/test/fake_single_thread_task_runner.h +++ b/media/cast/test/fake_single_thread_task_runner.h @@ -28,20 +28,19 @@ class FakeSingleThreadTaskRunner : public base::SingleThreadTaskRunner { void Sleep(base::TimeDelta t); // base::SingleThreadTaskRunner implementation. - virtual bool PostDelayedTask(const tracked_objects::Location& from_here, - const base::Closure& task, - base::TimeDelta delay) override; + bool PostDelayedTask(const tracked_objects::Location& from_here, + const base::Closure& task, + base::TimeDelta delay) override; - virtual bool RunsTasksOnCurrentThread() const override; + 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; + bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here, + const base::Closure& task, + base::TimeDelta delay) override; protected: - virtual ~FakeSingleThreadTaskRunner(); + ~FakeSingleThreadTaskRunner() override; private: base::SimpleTestTickClock* const clock_; diff --git a/media/cast/test/fake_video_encode_accelerator.h b/media/cast/test/fake_video_encode_accelerator.h index 01f3441..65cc36c 100644 --- a/media/cast/test/fake_video_encode_accelerator.h +++ b/media/cast/test/fake_video_encode_accelerator.h @@ -26,25 +26,25 @@ class FakeVideoEncodeAccelerator : public VideoEncodeAccelerator { explicit FakeVideoEncodeAccelerator( const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, std::vector<uint32>* stored_bitrates); - virtual ~FakeVideoEncodeAccelerator(); + ~FakeVideoEncodeAccelerator() override; - virtual std::vector<VideoEncodeAccelerator::SupportedProfile> - 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; + std::vector<VideoEncodeAccelerator::SupportedProfile> GetSupportedProfiles() + override; + bool Initialize(media::VideoFrame::Format input_format, + const gfx::Size& input_visible_size, + VideoCodecProfile output_profile, + uint32 initial_bitrate, + Client* client) override; - virtual void Encode(const scoped_refptr<VideoFrame>& frame, - bool force_keyframe) override; + void Encode(const scoped_refptr<VideoFrame>& frame, + bool force_keyframe) override; - virtual void UseOutputBitstreamBuffer(const BitstreamBuffer& buffer) override; + void UseOutputBitstreamBuffer(const BitstreamBuffer& buffer) override; - virtual void RequestEncodingParametersChange(uint32 bitrate, - uint32 framerate) override; + void RequestEncodingParametersChange(uint32 bitrate, + uint32 framerate) override; - virtual void Destroy() override; + 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 f3fbd64..2b32fe33 100644 --- a/media/cast/test/loopback_transport.cc +++ b/media/cast/test/loopback_transport.cc @@ -20,10 +20,10 @@ class LoopBackPacketPipe : public test::PacketPipe { const PacketReceiverCallback& packet_receiver) : packet_receiver_(packet_receiver) {} - virtual ~LoopBackPacketPipe() {} + ~LoopBackPacketPipe() override {} // PacketPipe implementations. - virtual void Send(scoped_ptr<Packet> packet) override { + 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 64d99e6..2aca2f3 100644 --- a/media/cast/test/loopback_transport.h +++ b/media/cast/test/loopback_transport.h @@ -27,12 +27,11 @@ class LoopBackTransport : public PacketSender { public: explicit LoopBackTransport( scoped_refptr<CastEnvironment> cast_environment); - virtual ~LoopBackTransport(); + ~LoopBackTransport() override; - virtual bool SendPacket(PacketRef packet, - const base::Closure& cb) override; + bool SendPacket(PacketRef packet, const base::Closure& cb) override; - virtual int64 GetBytesSent() override; + 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 b83733a..d608669 100644 --- a/media/cast/test/receiver.cc +++ b/media/cast/test/receiver.cc @@ -202,9 +202,9 @@ class NaivePlayer : public InProcessReceiver, num_audio_frames_processed_(0), currently_playing_audio_frame_start_(-1) {} - virtual ~NaivePlayer() {} + ~NaivePlayer() override {} - virtual void Start() override { + 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 { + void Stop() override { // First, stop audio output to the Chromium audio stack. base::WaitableEvent done(false, false); DCHECK(!AudioManager::Get()->GetTaskRunner()->BelongsToCurrentThread()); @@ -265,9 +265,9 @@ class NaivePlayer : public InProcessReceiver, //////////////////////////////////////////////////////////////////// // InProcessReceiver overrides. - virtual void OnVideoFrame(const scoped_refptr<VideoFrame>& video_frame, - const base::TimeTicks& playout_time, - bool is_continuous) override { + void OnVideoFrame(const scoped_refptr<VideoFrame>& video_frame, + const base::TimeTicks& playout_time, + bool is_continuous) override { DCHECK(cast_env()->CurrentlyOn(CastEnvironment::MAIN)); LOG_IF(WARNING, !is_continuous) << "Video: Discontinuity in received frames."; @@ -282,9 +282,9 @@ class NaivePlayer : public InProcessReceiver, } } - virtual void OnAudioFrame(scoped_ptr<AudioBus> audio_frame, - const base::TimeTicks& playout_time, - bool is_continuous) override { + void OnAudioFrame(scoped_ptr<AudioBus> audio_frame, + const base::TimeTicks& playout_time, + bool is_continuous) override { DCHECK(cast_env()->CurrentlyOn(CastEnvironment::MAIN)); LOG_IF(WARNING, !is_continuous) << "Audio: Discontinuity in received frames."; @@ -316,8 +316,7 @@ class NaivePlayer : public InProcessReceiver, //////////////////////////////////////////////////////////////////// // AudioSourceCallback implementation. - virtual int OnMoreData(AudioBus* dest, uint32 total_bytes_delay) - override { + int OnMoreData(AudioBus* dest, uint32 total_bytes_delay) override { // Note: This method is being invoked by a separate thread unknown to us // (i.e., outside of CastEnvironment). @@ -377,7 +376,7 @@ class NaivePlayer : public InProcessReceiver, return dest->frames(); } - virtual void OnError(AudioOutputStream* stream) override { + 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 93fc6aa..1a4d0ab 100644 --- a/media/cast/test/skewed_single_thread_task_runner.h +++ b/media/cast/test/skewed_single_thread_task_runner.h @@ -29,20 +29,19 @@ class SkewedSingleThreadTaskRunner : public base::SingleThreadTaskRunner { void SetSkew(double skew); // base::SingleThreadTaskRunner implementation. - virtual bool PostDelayedTask(const tracked_objects::Location& from_here, - const base::Closure& task, - base::TimeDelta delay) override; + bool PostDelayedTask(const tracked_objects::Location& from_here, + const base::Closure& task, + base::TimeDelta delay) override; - virtual bool RunsTasksOnCurrentThread() const override; + 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; + bool PostNonNestableDelayedTask(const tracked_objects::Location& from_here, + const base::Closure& task, + base::TimeDelta delay) override; protected: - virtual ~SkewedSingleThreadTaskRunner(); + ~SkewedSingleThreadTaskRunner() override; private: double skew_; diff --git a/media/cast/test/skewed_tick_clock.h b/media/cast/test/skewed_tick_clock.h index 3d5580f..a5539a3 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; + base::TimeTicks NowTicks() override; private: base::TimeTicks SkewTicks(base::TimeTicks now); diff --git a/media/cast/test/utility/standalone_cast_environment.h b/media/cast/test/utility/standalone_cast_environment.h index 91240e1..206de21 100644 --- a/media/cast/test/utility/standalone_cast_environment.h +++ b/media/cast/test/utility/standalone_cast_environment.h @@ -28,7 +28,7 @@ class StandaloneCastEnvironment : public CastEnvironment, void Shutdown(); protected: - virtual ~StandaloneCastEnvironment(); + ~StandaloneCastEnvironment() override; base::Thread main_thread_; base::Thread audio_thread_; diff --git a/media/cast/test/utility/udp_proxy.cc b/media/cast/test/utility/udp_proxy.cc index a770834..237c1e7 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 { + 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 { + void Send(scoped_ptr<Packet> packet) override { if (rand() > drop_fraction_) { pipe_->Send(packet.Pass()); } @@ -133,9 +133,9 @@ scoped_ptr<PacketPipe> NewRandomDrop(double drop_fraction) { class SimpleDelayBase : public PacketPipe { public: SimpleDelayBase() : weak_factory_(this) {} - virtual ~SimpleDelayBase() {} + ~SimpleDelayBase() override {} - virtual void Send(scoped_ptr<Packet> packet) override { + void Send(scoped_ptr<Packet> packet) override { double seconds = GetDelay(); task_runner_->PostDelayedTask( FROM_HERE, @@ -158,9 +158,7 @@ class SimpleDelayBase : public PacketPipe { class ConstantDelay : public SimpleDelayBase { public: ConstantDelay(double delay_seconds) : delay_seconds_(delay_seconds) {} - virtual double GetDelay() override { - return delay_seconds_; - } + double GetDelay() override { return delay_seconds_; } private: double delay_seconds_; @@ -174,9 +172,7 @@ class RandomUnsortedDelay : public SimpleDelayBase { public: RandomUnsortedDelay(double random_delay) : random_delay_(random_delay) {} - virtual double GetDelay() override { - return random_delay_ * base::RandDouble(); - } + double GetDelay() override { return random_delay_ * base::RandDouble(); } private: double random_delay_; @@ -193,11 +189,11 @@ class DuplicateAndDelay : public RandomUnsortedDelay { RandomUnsortedDelay(random_delay), delay_min_(delay_min) { } - virtual void Send(scoped_ptr<Packet> packet) override { + void Send(scoped_ptr<Packet> packet) override { pipe_->Send(scoped_ptr<Packet>(new Packet(*packet.get()))); RandomUnsortedDelay::Send(packet.Pass()); } - virtual double GetDelay() override { + double GetDelay() override { return RandomUnsortedDelay::GetDelay() + delay_min_; } private: @@ -220,7 +216,7 @@ class RandomSortedDelay : public PacketPipe { seconds_between_extra_delay_(seconds_between_extra_delay), weak_factory_(this) {} - virtual void Send(scoped_ptr<Packet> packet) override { + void Send(scoped_ptr<Packet> packet) override { buffer_.push_back(linked_ptr<Packet>(packet.release())); if (buffer_.size() == 1) { next_send_ = std::max( @@ -230,7 +226,7 @@ class RandomSortedDelay : public PacketPipe { ProcessBuffer(); } } - virtual void InitOnIOThread( + void InitOnIOThread( const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, base::TickClock* clock) override { PacketPipe::InitOnIOThread(task_runner, clock); @@ -309,14 +305,14 @@ class NetworkGlitchPipe : public PacketPipe { max_outage_time_(average_outage_time * 2), weak_factory_(this) {} - virtual void InitOnIOThread( + void InitOnIOThread( const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, base::TickClock* clock) override { PacketPipe::InitOnIOThread(task_runner, clock); Flip(); } - virtual void Send(scoped_ptr<Packet> packet) override { + void Send(scoped_ptr<Packet> packet) override { if (works_) { pipe_->Send(packet.Pass()); } @@ -360,7 +356,7 @@ class InterruptedPoissonProcess::InternalBuffer : public PacketPipe { weak_factory_(this) { } - virtual void Send(scoped_ptr<Packet> packet) override { + void Send(scoped_ptr<Packet> packet) override { // Drop if buffer is full. if (stored_size_ >= stored_limit_) return; @@ -370,7 +366,7 @@ class InterruptedPoissonProcess::InternalBuffer : public PacketPipe { DCHECK(buffer_.size() == buffer_time_.size()); } - virtual void InitOnIOThread( + void InitOnIOThread( const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, base::TickClock* clock) override { clock_ = clock; @@ -552,10 +548,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 { - NOTREACHED(); - } + void Send(scoped_ptr<Packet> packet) override; + void AppendToPipe(scoped_ptr<PacketPipe> pipe) override { NOTREACHED(); } private: UDPProxyImpl* udp_proxy_; @@ -662,7 +656,7 @@ class UDPProxyImpl : public UDPProxy { start_event.Wait(); } - virtual ~UDPProxyImpl() { + ~UDPProxyImpl() override { base::WaitableEvent stop_event(false, false); proxy_thread_.message_loop_proxy()->PostTask( FROM_HERE, diff --git a/media/cast/test/utility/udp_proxy_main.cc b/media/cast/test/utility/udp_proxy_main.cc index 425d2e3..212b597 100644 --- a/media/cast/test/utility/udp_proxy_main.cc +++ b/media/cast/test/utility/udp_proxy_main.cc @@ -68,8 +68,7 @@ ByteCounter out_pipe_output_counter; class ByteCounterPipe : public media::cast::test::PacketPipe { public: ByteCounterPipe(ByteCounter* counter) : counter_(counter) {} - virtual void Send(scoped_ptr<media::cast::Packet> packet) - override { + void Send(scoped_ptr<media::cast::Packet> packet) override { counter_->Increment(packet->size()); pipe_->Send(packet.Pass()); } diff --git a/media/cdm/aes_decryptor.h b/media/cdm/aes_decryptor.h index 1275dd5..edae707 100644 --- a/media/cdm/aes_decryptor.h +++ b/media/cdm/aes_decryptor.h @@ -30,54 +30,51 @@ class MEDIA_EXPORT AesDecryptor : public MediaKeys, public Decryptor { AesDecryptor(const SessionMessageCB& session_message_cb, const SessionClosedCB& session_closed_cb, const SessionKeysChangeCB& session_keys_change_cb); - virtual ~AesDecryptor(); + ~AesDecryptor() override; // MediaKeys implementation. - virtual void SetServerCertificate( - const uint8* certificate_data, - int certificate_data_length, - 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; - virtual void LoadSession(const std::string& web_session_id, - 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; - virtual void CloseSession(const std::string& web_session_id, + void SetServerCertificate(const uint8* certificate_data, + int certificate_data_length, scoped_ptr<SimpleCdmPromise> promise) override; - virtual void RemoveSession(const std::string& web_session_id, - scoped_ptr<SimpleCdmPromise> promise) override; - virtual void GetUsableKeyIds(const std::string& web_session_id, - scoped_ptr<KeyIdsPromise> promise) override; - virtual Decryptor* GetDecryptor() override; + void CreateSession(const std::string& init_data_type, + const uint8* init_data, + int init_data_length, + SessionType session_type, + scoped_ptr<NewSessionCdmPromise> promise) override; + void LoadSession(const std::string& web_session_id, + scoped_ptr<NewSessionCdmPromise> promise) override; + void UpdateSession(const std::string& web_session_id, + const uint8* response, + int response_length, + scoped_ptr<SimpleCdmPromise> promise) override; + void CloseSession(const std::string& web_session_id, + scoped_ptr<SimpleCdmPromise> promise) override; + void RemoveSession(const std::string& web_session_id, + scoped_ptr<SimpleCdmPromise> promise) override; + void GetUsableKeyIds(const std::string& web_session_id, + scoped_ptr<KeyIdsPromise> promise) override; + Decryptor* GetDecryptor() override; #if defined(ENABLE_BROWSER_CDMS) virtual int GetCdmId() const override; #endif // defined(ENABLE_BROWSER_CDMS) // Decryptor implementation. - virtual void RegisterNewKeyCB(StreamType stream_type, - 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; - virtual void InitializeAudioDecoder(const AudioDecoderConfig& config, - const DecoderInitCB& init_cb) override; - virtual void InitializeVideoDecoder(const VideoDecoderConfig& config, - const DecoderInitCB& init_cb) override; - virtual void DecryptAndDecodeAudio( - const scoped_refptr<DecoderBuffer>& encrypted, - 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; + void RegisterNewKeyCB(StreamType stream_type, + const NewKeyCB& key_added_cb) override; + void Decrypt(StreamType stream_type, + const scoped_refptr<DecoderBuffer>& encrypted, + const DecryptCB& decrypt_cb) override; + void CancelDecrypt(StreamType stream_type) override; + void InitializeAudioDecoder(const AudioDecoderConfig& config, + const DecoderInitCB& init_cb) override; + void InitializeVideoDecoder(const VideoDecoderConfig& config, + const DecoderInitCB& init_cb) override; + void DecryptAndDecodeAudio(const scoped_refptr<DecoderBuffer>& encrypted, + const AudioDecodeCB& audio_decode_cb) override; + void DecryptAndDecodeVideo(const scoped_refptr<DecoderBuffer>& encrypted, + const VideoDecodeCB& video_decode_cb) override; + void ResetDecoder(StreamType stream_type) override; + 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 768f5a6..6d4cee3 100644 --- a/media/cdm/player_tracker_impl.h +++ b/media/cdm/player_tracker_impl.h @@ -21,12 +21,12 @@ namespace media { class MEDIA_EXPORT PlayerTrackerImpl : public PlayerTracker { public: PlayerTrackerImpl(); - virtual ~PlayerTrackerImpl(); + ~PlayerTrackerImpl() override; // 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; + int RegisterPlayer(const base::Closure& new_key_cb, + const base::Closure& cdm_unset_cb) override; + void UnregisterPlayer(int registration_id) override; // Helpers methods to fire registered callbacks. void NotifyNewKey(); diff --git a/media/filters/audio_renderer_impl.h b/media/filters/audio_renderer_impl.h index 96c848e..8065b26 100644 --- a/media/filters/audio_renderer_impl.h +++ b/media/filters/audio_renderer_impl.h @@ -67,27 +67,27 @@ class MEDIA_EXPORT AudioRendererImpl const SetDecryptorReadyCB& set_decryptor_ready_cb, const AudioHardwareConfig& hardware_params, const scoped_refptr<MediaLog>& media_log); - virtual ~AudioRendererImpl(); + ~AudioRendererImpl() override; // 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; + void StartTicking() override; + void StopTicking() override; + void SetPlaybackRate(float rate) override; + void SetMediaTime(base::TimeDelta time) override; + base::TimeDelta CurrentMediaTime() override; + base::TimeDelta CurrentMediaTimeForSyncingVideo() override; // AudioRenderer implementation. - virtual void Initialize(DemuxerStream* stream, - const PipelineStatusCB& init_cb, - 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; + void Initialize(DemuxerStream* stream, + const PipelineStatusCB& init_cb, + const StatisticsCB& statistics_cb, + const BufferingStateCB& buffering_state_cb, + const base::Closure& ended_cb, + const PipelineStatusCB& error_cb) override; + TimeSource* GetTimeSource() override; + void Flush(const base::Closure& callback) override; + void StartPlaying() override; + void SetVolume(float volume) override; private: friend class AudioRendererImplTest; @@ -151,9 +151,8 @@ class MEDIA_EXPORT AudioRendererImpl // timestamp in the pipeline will be ahead of the actual audio playback. In // 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 Render(AudioBus* audio_bus, int audio_delay_milliseconds) override; + 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 bfb40b7..dbeeef9 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; + int Read(int size, uint8* data) override; + bool GetPosition(int64* position_out) override; + bool SetPosition(int64 position) override; + bool GetSize(int64* size_out) override; + 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 a617d3d..3c0520f 100644 --- a/media/filters/chunk_demuxer.h +++ b/media/filters/chunk_demuxer.h @@ -28,7 +28,7 @@ class MEDIA_EXPORT ChunkDemuxerStream : public DemuxerStream { typedef std::deque<scoped_refptr<StreamParserBuffer> > BufferQueue; explicit ChunkDemuxerStream(Type type, bool splice_frames_enabled); - virtual ~ChunkDemuxerStream(); + ~ChunkDemuxerStream() override; // ChunkDemuxerStream control methods. void StartReturningData(); @@ -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; + void Read(const ReadCB& read_cb) override; + Type type() override; + AudioDecoderConfig audio_decoder_config() override; + VideoDecoderConfig video_decoder_config() override; + bool SupportsConfigChanges() override; + VideoRotation video_rotation() override; // Returns the text track configuration. It is an error to call this method // if type() != TEXT. @@ -154,18 +154,18 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer { const NeedKeyCB& need_key_cb, const LogCB& log_cb, bool splice_frames_enabled); - virtual ~ChunkDemuxer(); + ~ChunkDemuxer() override; // 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; + void Initialize(DemuxerHost* host, + const PipelineStatusCB& cb, + bool enable_text_tracks) override; + void Stop() override; + void Seek(base::TimeDelta time, const PipelineStatusCB& cb) override; + base::Time GetTimelineOffset() const override; + DemuxerStream* GetStream(DemuxerStream::Type type) override; + base::TimeDelta GetStartTime() const override; + 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 0ead91a..b13ffc2 100644 --- a/media/filters/clockless_video_frame_scheduler.h +++ b/media/filters/clockless_video_frame_scheduler.h @@ -15,13 +15,13 @@ class ClocklessVideoFrameScheduler : public VideoFrameScheduler { typedef base::Callback<void(const scoped_refptr<VideoFrame>&)> DisplayCB; explicit ClocklessVideoFrameScheduler(const DisplayCB& display_cb); - virtual ~ClocklessVideoFrameScheduler(); + ~ClocklessVideoFrameScheduler() override; // VideoFrameScheduler implementation. - virtual void ScheduleVideoFrame(const scoped_refptr<VideoFrame>& frame, - base::TimeTicks wall_ticks, - const DoneCB& done_cb) override; - virtual void Reset() override; + void ScheduleVideoFrame(const scoped_refptr<VideoFrame>& frame, + base::TimeTicks wall_ticks, + const DoneCB& done_cb) override; + void Reset() override; private: DisplayCB display_cb_; diff --git a/media/filters/decrypting_audio_decoder.h b/media/filters/decrypting_audio_decoder.h index 544dc55..5fdb6f8 100644 --- a/media/filters/decrypting_audio_decoder.h +++ b/media/filters/decrypting_audio_decoder.h @@ -40,16 +40,16 @@ class MEDIA_EXPORT DecryptingAudioDecoder : public AudioDecoder { DecryptingAudioDecoder( const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, const SetDecryptorReadyCB& set_decryptor_ready_cb); - virtual ~DecryptingAudioDecoder(); + ~DecryptingAudioDecoder() override; // AudioDecoder implementation. - virtual std::string GetDisplayName() const override; - virtual void Initialize(const AudioDecoderConfig& config, - const PipelineStatusCB& status_cb, - 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; + std::string GetDisplayName() const override; + void Initialize(const AudioDecoderConfig& config, + const PipelineStatusCB& status_cb, + const OutputCB& output_cb) override; + void Decode(const scoped_refptr<DecoderBuffer>& buffer, + const DecodeCB& decode_cb) override; + 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 bad4fad..09bf97a 100644 --- a/media/filters/decrypting_demuxer_stream.h +++ b/media/filters/decrypting_demuxer_stream.h @@ -33,7 +33,7 @@ class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream { const SetDecryptorReadyCB& set_decryptor_ready_cb); // Cancels all pending operations immediately and fires all pending callbacks. - virtual ~DecryptingDemuxerStream(); + ~DecryptingDemuxerStream() override; void Initialize(DemuxerStream* stream, const PipelineStatusCB& status_cb); @@ -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; + void Read(const ReadCB& read_cb) override; + AudioDecoderConfig audio_decoder_config() override; + VideoDecoderConfig video_decoder_config() override; + Type type() override; + void EnableBitstreamConverter() override; + bool SupportsConfigChanges() override; + 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 892c429..1911c79 100644 --- a/media/filters/decrypting_video_decoder.h +++ b/media/filters/decrypting_video_decoder.h @@ -29,17 +29,17 @@ class MEDIA_EXPORT DecryptingVideoDecoder : public VideoDecoder { DecryptingVideoDecoder( const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, const SetDecryptorReadyCB& set_decryptor_ready_cb); - virtual ~DecryptingVideoDecoder(); + ~DecryptingVideoDecoder() override; // VideoDecoder implementation. - virtual std::string GetDisplayName() const override; - virtual void Initialize(const VideoDecoderConfig& config, - bool low_delay, - const PipelineStatusCB& status_cb, - 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; + std::string GetDisplayName() const override; + void Initialize(const VideoDecoderConfig& config, + bool low_delay, + const PipelineStatusCB& status_cb, + const OutputCB& output_cb) override; + void Decode(const scoped_refptr<DecoderBuffer>& buffer, + const DecodeCB& decode_cb) override; + 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 fbb6151..fd651dc 100644 --- a/media/filters/fake_demuxer_stream.h +++ b/media/filters/fake_demuxer_stream.h @@ -25,15 +25,15 @@ class FakeDemuxerStream : public DemuxerStream { FakeDemuxerStream(int num_configs, int num_buffers_in_one_config, bool is_encrypted); - virtual ~FakeDemuxerStream(); + ~FakeDemuxerStream() override; // 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; + void Read(const ReadCB& read_cb) override; + AudioDecoderConfig audio_decoder_config() override; + VideoDecoderConfig video_decoder_config() override; + Type type() override; + bool SupportsConfigChanges() override; + VideoRotation video_rotation() override; void Initialize(); diff --git a/media/filters/fake_video_decoder.h b/media/filters/fake_video_decoder.h index e36ce3c7..d7150b6 100644 --- a/media/filters/fake_video_decoder.h +++ b/media/filters/fake_video_decoder.h @@ -33,18 +33,18 @@ class FakeVideoDecoder : public VideoDecoder { // Constructs an object with a decoding delay of |decoding_delay| frames. FakeVideoDecoder(int decoding_delay, int max_parallel_decoding_requests); - virtual ~FakeVideoDecoder(); + ~FakeVideoDecoder() override; // VideoDecoder implementation. - virtual std::string GetDisplayName() const override; - virtual void Initialize(const VideoDecoderConfig& config, - bool low_delay, - const PipelineStatusCB& status_cb, - 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; + std::string GetDisplayName() const override; + void Initialize(const VideoDecoderConfig& config, + bool low_delay, + const PipelineStatusCB& status_cb, + const OutputCB& output_cb) override; + void Decode(const scoped_refptr<DecoderBuffer>& buffer, + const DecodeCB& decode_cb) override; + void Reset(const base::Closure& closure) override; + 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 bd0128c..c9429f9 100644 --- a/media/filters/ffmpeg_audio_decoder.h +++ b/media/filters/ffmpeg_audio_decoder.h @@ -33,16 +33,16 @@ class MEDIA_EXPORT FFmpegAudioDecoder : public AudioDecoder { FFmpegAudioDecoder( const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, const LogCB& log_cb); - virtual ~FFmpegAudioDecoder(); + ~FFmpegAudioDecoder() override; // AudioDecoder implementation. - virtual std::string GetDisplayName() const override; - virtual void Initialize(const AudioDecoderConfig& config, - const PipelineStatusCB& status_cb, - 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; + std::string GetDisplayName() const override; + void Initialize(const AudioDecoderConfig& config, + const PipelineStatusCB& status_cb, + const OutputCB& output_cb) override; + void Decode(const scoped_refptr<DecoderBuffer>& buffer, + const DecodeCB& decode_cb) override; + 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 6209a0f..8d4c915 100644 --- a/media/filters/ffmpeg_demuxer.h +++ b/media/filters/ffmpeg_demuxer.h @@ -59,7 +59,7 @@ class FFmpegDemuxerStream : public DemuxerStream { // Keeps a copy of |demuxer| and initializes itself using information inside // |stream|. Both parameters must outlive |this|. FFmpegDemuxerStream(FFmpegDemuxer* demuxer, AVStream* stream); - virtual ~FFmpegDemuxerStream(); + ~FFmpegDemuxerStream() override; // Enqueues the given AVPacket. It is invalid to queue a |packet| after // SetEndOfStream() has been called. @@ -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; + Type type() override; + void Read(const ReadCB& read_cb) override; + void EnableBitstreamConverter() override; + bool SupportsConfigChanges() override; + AudioDecoderConfig audio_decoder_config() override; + VideoDecoderConfig video_decoder_config() override; + VideoRotation video_rotation() override; // Returns the range of buffered data in this stream. Ranges<base::TimeDelta> GetBufferedRanges() const; @@ -158,18 +158,18 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer { DataSource* data_source, const NeedKeyCB& need_key_cb, const scoped_refptr<MediaLog>& media_log); - virtual ~FFmpegDemuxer(); + ~FFmpegDemuxer() override; // 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; + void Initialize(DemuxerHost* host, + const PipelineStatusCB& status_cb, + bool enable_text_tracks) override; + void Stop() override; + void Seek(base::TimeDelta time, const PipelineStatusCB& cb) override; + base::Time GetTimelineOffset() const override; + DemuxerStream* GetStream(DemuxerStream::Type type) override; + base::TimeDelta GetStartTime() const override; + 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 76b6af5..8acc4c8 100644 --- a/media/filters/ffmpeg_video_decoder.h +++ b/media/filters/ffmpeg_video_decoder.h @@ -29,21 +29,21 @@ class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder { public: explicit FFmpegVideoDecoder( const scoped_refptr<base::SingleThreadTaskRunner>& task_runner); - virtual ~FFmpegVideoDecoder(); + ~FFmpegVideoDecoder() override; // Allow decoding of individual NALU. Entire frames are required by default. // Disables low-latency mode. Must be called before Initialize(). void set_decode_nalus(bool decode_nalus) { decode_nalus_ = decode_nalus; } // VideoDecoder implementation. - virtual std::string GetDisplayName() const override; - virtual void Initialize(const VideoDecoderConfig& config, - bool low_delay, - const PipelineStatusCB& status_cb, - 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; + std::string GetDisplayName() const override; + void Initialize(const VideoDecoderConfig& config, + bool low_delay, + const PipelineStatusCB& status_cb, + const OutputCB& output_cb) override; + void Decode(const scoped_refptr<DecoderBuffer>& buffer, + const DecodeCB& decode_cb) override; + 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 b743e0f..ebffee5 100644 --- a/media/filters/file_data_source.h +++ b/media/filters/file_data_source.h @@ -20,17 +20,19 @@ class MEDIA_EXPORT FileDataSource : public DataSource { public: FileDataSource(); explicit FileDataSource(base::File file); - virtual ~FileDataSource(); + ~FileDataSource() override; bool Initialize(const base::FilePath& file_path); // Implementation of DataSource. - 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; + void Stop() override; + void Read(int64 position, + int size, + uint8* data, + const DataSource::ReadCB& read_cb) override; + bool GetSize(int64* size_out) override; + bool IsStreaming() override; + 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 132335c..2322d30 100644 --- a/media/filters/gpu_video_decoder.h +++ b/media/filters/gpu_video_decoder.h @@ -41,31 +41,31 @@ class MEDIA_EXPORT GpuVideoDecoder const scoped_refptr<GpuVideoAcceleratorFactories>& factories); // VideoDecoder implementation. - virtual std::string GetDisplayName() const override; - virtual void Initialize(const VideoDecoderConfig& config, - bool low_delay, - const PipelineStatusCB& status_cb, - 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; + std::string GetDisplayName() const override; + void Initialize(const VideoDecoderConfig& config, + bool low_delay, + const PipelineStatusCB& status_cb, + const OutputCB& output_cb) override; + void Decode(const scoped_refptr<DecoderBuffer>& buffer, + const DecodeCB& decode_cb) override; + void Reset(const base::Closure& closure) override; + bool NeedsBitstreamConversion() const override; + bool CanReadWithoutStalling() const override; + 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; + void ProvidePictureBuffers(uint32 count, + const gfx::Size& size, + uint32 texture_target) override; + void DismissPictureBuffer(int32 id) override; + void PictureReady(const media::Picture& picture) override; + void NotifyEndOfBitstreamBuffer(int32 id) override; + void NotifyFlushDone() override; + void NotifyResetDone() override; + void NotifyError(media::VideoDecodeAccelerator::Error error) override; protected: - virtual ~GpuVideoDecoder(); + ~GpuVideoDecoder() override; private: enum State { diff --git a/media/filters/in_memory_url_protocol.h b/media/filters/in_memory_url_protocol.h index 85aa1ed..02d09d4 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; + int Read(int size, uint8* data) override; + bool GetPosition(int64* position_out) override; + bool SetPosition(int64 position) override; + bool GetSize(int64* size_out) override; + bool IsStreaming() override; private: const uint8* data_; diff --git a/media/filters/opus_audio_decoder.h b/media/filters/opus_audio_decoder.h index f1955ab..b3fb188 100644 --- a/media/filters/opus_audio_decoder.h +++ b/media/filters/opus_audio_decoder.h @@ -28,16 +28,16 @@ class MEDIA_EXPORT OpusAudioDecoder : public AudioDecoder { public: explicit OpusAudioDecoder( const scoped_refptr<base::SingleThreadTaskRunner>& task_runner); - virtual ~OpusAudioDecoder(); + ~OpusAudioDecoder() override; // AudioDecoder implementation. - virtual std::string GetDisplayName() const override; - virtual void Initialize(const AudioDecoderConfig& config, - const PipelineStatusCB& status_cb, - 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; + std::string GetDisplayName() const override; + void Initialize(const AudioDecoderConfig& config, + const PipelineStatusCB& status_cb, + const OutputCB& output_cb) override; + void Decode(const scoped_refptr<DecoderBuffer>& buffer, + const DecodeCB& decode_cb) override; + 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 9bb5465..bd026da 100644 --- a/media/filters/pipeline_integration_test.cc +++ b/media/filters/pipeline_integration_test.cc @@ -231,27 +231,27 @@ class KeyProvidingApp : public FakeEncryptedMedia::AppBase { return promise.Pass(); } - virtual void OnSessionMessage(const std::string& web_session_id, - const std::vector<uint8>& message, - const GURL& destination_url) override { + void OnSessionMessage(const std::string& web_session_id, + const std::vector<uint8>& message, + 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 { + 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 { + void OnSessionKeysChange(const std::string& web_session_id, + 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 { + void NeedKey(const std::string& type, + const std::vector<uint8>& init_data, + AesDecryptor* decryptor) override { if (current_session_id_.empty()) { decryptor->CreateSession(type, kInitData, @@ -286,14 +286,14 @@ class KeyProvidingApp : public FakeEncryptedMedia::AppBase { class RotatingKeyProvidingApp : public KeyProvidingApp { public: RotatingKeyProvidingApp() : num_distint_need_key_calls_(0) {} - virtual ~RotatingKeyProvidingApp() { + ~RotatingKeyProvidingApp() override { // Expect that NeedKey is fired multiple times with different |init_data|. EXPECT_GT(num_distint_need_key_calls_, 1u); } - virtual void NeedKey(const std::string& type, - const std::vector<uint8>& init_data, - AesDecryptor* decryptor) override { + void NeedKey(const std::string& type, + const std::vector<uint8>& init_data, + AesDecryptor* decryptor) override { // Skip the request if the |init_data| has been seen. if (init_data == prev_init_data_) return; @@ -358,29 +358,28 @@ class RotatingKeyProvidingApp : public KeyProvidingApp { // Ignores needkey and does not perform a license request 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 { + void OnSessionMessage(const std::string& web_session_id, + const std::vector<uint8>& message, + 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 { + 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 { + void OnSessionKeysChange(const std::string& web_session_id, + 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 { - } + void NeedKey(const std::string& type, + const std::vector<uint8>& init_data, + AesDecryptor* decryptor) override {} }; // Helper class that emulates calls made on the ChunkDemuxer by the diff --git a/media/filters/pipeline_integration_test_base.h b/media/filters/pipeline_integration_test_base.h index 2f0d647..bee3d24 100644 --- a/media/filters/pipeline_integration_test_base.h +++ b/media/filters/pipeline_integration_test_base.h @@ -38,8 +38,9 @@ extern const char kNullAudioHash[]; class DummyTickClock : public base::TickClock { public: DummyTickClock() : now_() {} - virtual ~DummyTickClock() {} - virtual base::TimeTicks NowTicks() override; + ~DummyTickClock() override {} + base::TimeTicks NowTicks() override; + private: base::TimeTicks now_; }; diff --git a/media/filters/renderer_impl.h b/media/filters/renderer_impl.h index 8d2fbe8..67902d0 100644 --- a/media/filters/renderer_impl.h +++ b/media/filters/renderer_impl.h @@ -39,23 +39,23 @@ class MEDIA_EXPORT RendererImpl : public Renderer { scoped_ptr<AudioRenderer> audio_renderer, scoped_ptr<VideoRenderer> video_renderer); - virtual ~RendererImpl(); + ~RendererImpl() override; // Renderer implementation. - virtual void Initialize(DemuxerStreamProvider* demuxer_stream_provider, - const base::Closure& init_cb, - 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; + void Initialize(DemuxerStreamProvider* demuxer_stream_provider, + const base::Closure& init_cb, + const StatisticsCB& statistics_cb, + const base::Closure& ended_cb, + const PipelineStatusCB& error_cb, + const BufferingStateCB& buffering_state_cb) override; + void Flush(const base::Closure& flush_cb) override; + void StartPlayingFrom(base::TimeDelta time) override; + void SetPlaybackRate(float playback_rate) override; + void SetVolume(float volume) override; + base::TimeDelta GetMediaTime() override; + bool HasAudio() override; + bool HasVideo() override; + 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 9dcf67a..4675cca 100644 --- a/media/filters/skcanvas_video_renderer.cc +++ b/media/filters/skcanvas_video_renderer.cc @@ -211,12 +211,12 @@ class VideoImageGenerator : public SkImageGenerator { VideoImageGenerator(const scoped_refptr<VideoFrame>& frame) : frame_(frame) { DCHECK(frame_.get()); } - virtual ~VideoImageGenerator() {} + ~VideoImageGenerator() override {} void set_frame(const scoped_refptr<VideoFrame>& frame) { frame_ = frame; } protected: - virtual bool onGetInfo(SkImageInfo* info) override { + bool onGetInfo(SkImageInfo* info) override { info->fWidth = frame_->visible_rect().width(); info->fHeight = frame_->visible_rect().height(); info->fColorType = kN32_SkColorType; @@ -224,11 +224,11 @@ class VideoImageGenerator : public SkImageGenerator { return true; } - virtual bool onGetPixels(const SkImageInfo& info, - void* pixels, - size_t row_bytes, - SkPMColor ctable[], - int* ctable_count) override { + bool onGetPixels(const SkImageInfo& info, + void* pixels, + size_t row_bytes, + SkPMColor ctable[], + int* ctable_count) override { if (!frame_.get()) return false; if (!pixels) @@ -238,10 +238,10 @@ class VideoImageGenerator : public SkImageGenerator { return true; } - virtual bool onGetYUV8Planes(SkISize sizes[3], - void* planes[3], - size_t row_bytes[3], - SkYUVColorSpace* color_space) override { + bool onGetYUV8Planes(SkISize sizes[3], + void* planes[3], + size_t row_bytes[3], + 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 bfe9771..9ed082e 100644 --- a/media/filters/test_video_frame_scheduler.h +++ b/media/filters/test_video_frame_scheduler.h @@ -26,13 +26,13 @@ class TestVideoFrameScheduler : public VideoFrameScheduler { }; TestVideoFrameScheduler(); - virtual ~TestVideoFrameScheduler(); + ~TestVideoFrameScheduler() override; // VideoFrameScheduler implementation. - virtual void ScheduleVideoFrame(const scoped_refptr<VideoFrame>& frame, - base::TimeTicks wall_ticks, - const DoneCB& done_cb) override; - virtual void Reset() override; + void ScheduleVideoFrame(const scoped_refptr<VideoFrame>& frame, + base::TimeTicks wall_ticks, + const DoneCB& done_cb) override; + 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 e2c0a9d..6398969 100644 --- a/media/filters/video_frame_scheduler_impl.h +++ b/media/filters/video_frame_scheduler_impl.h @@ -31,13 +31,13 @@ class MEDIA_EXPORT VideoFrameSchedulerImpl : public VideoFrameScheduler { VideoFrameSchedulerImpl( const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, const DisplayCB& display_cb); - virtual ~VideoFrameSchedulerImpl(); + ~VideoFrameSchedulerImpl() override; // VideoFrameScheduler implementation. - virtual void ScheduleVideoFrame(const scoped_refptr<VideoFrame>& frame, - base::TimeTicks wall_ticks, - const DoneCB& done_cb) override; - virtual void Reset() override; + void ScheduleVideoFrame(const scoped_refptr<VideoFrame>& frame, + base::TimeTicks wall_ticks, + const DoneCB& done_cb) override; + 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 315bf28..1c25ff8 100644 --- a/media/filters/video_frame_scheduler_proxy.h +++ b/media/filters/video_frame_scheduler_proxy.h @@ -27,13 +27,13 @@ class MEDIA_EXPORT VideoFrameSchedulerProxy : public VideoFrameScheduler { const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, const scoped_refptr<base::SingleThreadTaskRunner>& scheduler_runner, scoped_ptr<VideoFrameScheduler> scheduler); - virtual ~VideoFrameSchedulerProxy(); + ~VideoFrameSchedulerProxy() override; // VideoFrameScheduler implementation. - virtual void ScheduleVideoFrame(const scoped_refptr<VideoFrame>& frame, - base::TimeTicks wall_ticks, - const DoneCB& done_cb) override; - virtual void Reset() override; + void ScheduleVideoFrame(const scoped_refptr<VideoFrame>& frame, + base::TimeTicks wall_ticks, + const DoneCB& done_cb) override; + 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 3cda321..557a884 100644 --- a/media/filters/video_renderer_impl.h +++ b/media/filters/video_renderer_impl.h @@ -56,22 +56,22 @@ class MEDIA_EXPORT VideoRendererImpl const PaintCB& paint_cb, bool drop_frames, const scoped_refptr<MediaLog>& media_log); - virtual ~VideoRendererImpl(); + ~VideoRendererImpl() override; // VideoRenderer implementation. - virtual void Initialize(DemuxerStream* stream, - bool low_delay, - const PipelineStatusCB& init_cb, - const StatisticsCB& statistics_cb, - 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; + void Initialize(DemuxerStream* stream, + bool low_delay, + const PipelineStatusCB& init_cb, + const StatisticsCB& statistics_cb, + const BufferingStateCB& buffering_state_cb, + const base::Closure& ended_cb, + const PipelineStatusCB& error_cb, + const TimeDeltaCB& get_time_cb) override; + void Flush(const base::Closure& callback) override; + void StartPlayingFrom(base::TimeDelta timestamp) override; // PlatformThread::Delegate implementation. - virtual void ThreadMain() override; + 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 37ceb2f..72d7a2c 100644 --- a/media/filters/vpx_video_decoder.h +++ b/media/filters/vpx_video_decoder.h @@ -29,17 +29,17 @@ class MEDIA_EXPORT VpxVideoDecoder : public VideoDecoder { public: explicit VpxVideoDecoder( const scoped_refptr<base::SingleThreadTaskRunner>& task_runner); - virtual ~VpxVideoDecoder(); + ~VpxVideoDecoder() override; // VideoDecoder implementation. - virtual std::string GetDisplayName() const override; - virtual void Initialize(const VideoDecoderConfig& config, - bool low_delay, - const PipelineStatusCB& status_cb, - 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; + std::string GetDisplayName() const override; + void Initialize(const VideoDecoderConfig& config, + bool low_delay, + const PipelineStatusCB& status_cb, + const OutputCB& output_cb) override; + void Decode(const scoped_refptr<DecoderBuffer>& buffer, + const DecodeCB& decode_cb) override; + void Reset(const base::Closure& closure) override; private: enum DecoderState { diff --git a/media/formats/mpeg/adts_stream_parser.h b/media/formats/mpeg/adts_stream_parser.h index 30354dc..d08351b 100644 --- a/media/formats/mpeg/adts_stream_parser.h +++ b/media/formats/mpeg/adts_stream_parser.h @@ -14,17 +14,17 @@ namespace media { class MEDIA_EXPORT ADTSStreamParser : public MPEGAudioStreamParserBase { public: ADTSStreamParser(); - virtual ~ADTSStreamParser(); + ~ADTSStreamParser() override; private: // MPEGAudioStreamParserBase overrides. - virtual int ParseFrameHeader(const uint8* data, - int size, - int* frame_size, - int* sample_rate, - ChannelLayout* channel_layout, - int* sample_count, - bool* metadata_frame) const override; + int ParseFrameHeader(const uint8* data, + int size, + int* frame_size, + int* sample_rate, + ChannelLayout* channel_layout, + int* sample_count, + 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 0f33f50..b2e5086 100644 --- a/media/formats/mpeg/mpeg1_audio_stream_parser.h +++ b/media/formats/mpeg/mpeg1_audio_stream_parser.h @@ -68,17 +68,17 @@ class MEDIA_EXPORT MPEG1AudioStreamParser : public MPEGAudioStreamParserBase { Header* header); MPEG1AudioStreamParser(); - virtual ~MPEG1AudioStreamParser(); + ~MPEG1AudioStreamParser() override; private: // MPEGAudioStreamParserBase overrides. - virtual int ParseFrameHeader(const uint8* data, - int size, - int* frame_size, - int* sample_rate, - ChannelLayout* channel_layout, - int* sample_count, - bool* metadata_frame) const override; + int ParseFrameHeader(const uint8* data, + int size, + int* frame_size, + int* sample_rate, + ChannelLayout* channel_layout, + int* sample_count, + 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 fde850a..fc736c2 100644 --- a/media/formats/mpeg/mpeg_audio_stream_parser_base.h +++ b/media/formats/mpeg/mpeg_audio_stream_parser_base.h @@ -28,19 +28,19 @@ class MEDIA_EXPORT MPEGAudioStreamParserBase : public StreamParser { MPEGAudioStreamParserBase(uint32 start_code_mask, AudioCodec audio_codec, int codec_delay); - virtual ~MPEGAudioStreamParserBase(); + ~MPEGAudioStreamParserBase() override; // StreamParser implementation. - virtual void Init(const InitCB& init_cb, - const NewConfigCB& config_cb, - const NewBuffersCB& new_buffers_cb, - bool ignore_text_tracks, - 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; + void Init(const InitCB& init_cb, + const NewConfigCB& config_cb, + const NewBuffersCB& new_buffers_cb, + bool ignore_text_tracks, + const NeedKeyCB& need_key_cb, + const NewMediaSegmentCB& new_segment_cb, + const base::Closure& end_of_segment_cb, + const LogCB& log_cb) override; + void Flush() override; + 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 df274f1..2e23c13 100644 --- a/media/formats/webm/webm_audio_client.h +++ b/media/formats/webm/webm_audio_client.h @@ -18,7 +18,7 @@ class AudioDecoderConfig; class WebMAudioClient : public WebMParserClient { public: explicit WebMAudioClient(const LogCB& log_cb); - virtual ~WebMAudioClient(); + ~WebMAudioClient() override; // Reset this object's state so it can process a new audio track element. void Reset(); @@ -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; + bool OnUInt(int id, int64 val) override; + 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 d7d78cb..3b341e6 100644 --- a/media/formats/webm/webm_cluster_parser.h +++ b/media/formats/webm/webm_cluster_parser.h @@ -144,7 +144,7 @@ class MEDIA_EXPORT WebMClusterParser : public WebMParserClient { const std::string& audio_encryption_key_id, const std::string& video_encryption_key_id, const LogCB& log_cb); - virtual ~WebMClusterParser(); + ~WebMClusterParser() override; // Resets the parser state so it can accept a new cluster. void Reset(); @@ -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; + WebMParserClient* OnListStart(int id) override; + bool OnListEnd(int id) override; + bool OnUInt(int id, int64 val) override; + 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 5421bbc..4b1bfe0 100644 --- a/media/formats/webm/webm_content_encodings_client.h +++ b/media/formats/webm/webm_content_encodings_client.h @@ -23,15 +23,15 @@ typedef std::vector<ContentEncoding*> ContentEncodings; class MEDIA_EXPORT WebMContentEncodingsClient : public WebMParserClient { public: explicit WebMContentEncodingsClient(const LogCB& log_cb); - virtual ~WebMContentEncodingsClient(); + ~WebMContentEncodingsClient() override; 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; + WebMParserClient* OnListStart(int id) override; + bool OnListEnd(int id) override; + bool OnUInt(int id, int64 val) override; + 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 f129f4e1..44ef6b2 100644 --- a/media/formats/webm/webm_info_parser.h +++ b/media/formats/webm/webm_info_parser.h @@ -16,7 +16,7 @@ namespace media { class MEDIA_EXPORT WebMInfoParser : public WebMParserClient { public: WebMInfoParser(); - virtual ~WebMInfoParser(); + ~WebMInfoParser() override; // Parses a WebM Info element in |buf|. // @@ -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; + WebMParserClient* OnListStart(int id) override; + bool OnListEnd(int id) override; + bool OnUInt(int id, int64 val) override; + bool OnFloat(int id, double val) override; + bool OnBinary(int id, const uint8* data, int size) override; + 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 7a99f3a..deefa73 100644 --- a/media/formats/webm/webm_stream_parser.h +++ b/media/formats/webm/webm_stream_parser.h @@ -20,18 +20,19 @@ class WebMClusterParser; class WebMStreamParser : public StreamParser { public: WebMStreamParser(); - virtual ~WebMStreamParser(); + ~WebMStreamParser() override; // StreamParser implementation. - virtual void Init(const InitCB& init_cb, const NewConfigCB& config_cb, - const NewBuffersCB& new_buffers_cb, - bool ignore_text_tracks, - 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; + void Init(const InitCB& init_cb, + const NewConfigCB& config_cb, + const NewBuffersCB& new_buffers_cb, + bool ignore_text_tracks, + const NeedKeyCB& need_key_cb, + const NewMediaSegmentCB& new_segment_cb, + const base::Closure& end_of_segment_cb, + const LogCB& log_cb) override; + void Flush() override; + 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 2b9d350..2801a3e 100644 --- a/media/formats/webm/webm_tracks_parser.h +++ b/media/formats/webm/webm_tracks_parser.h @@ -28,7 +28,7 @@ namespace media { class MEDIA_EXPORT WebMTracksParser : public WebMParserClient { public: explicit WebMTracksParser(const LogCB& log_cb, bool ignore_text_tracks); - virtual ~WebMTracksParser(); + ~WebMTracksParser() override; // Parses a WebM Tracks element in |buf|. // @@ -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; + WebMParserClient* OnListStart(int id) override; + bool OnListEnd(int id) override; + bool OnUInt(int id, int64 val) override; + bool OnFloat(int id, double val) override; + bool OnBinary(int id, const uint8* data, int size) override; + 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 73e3955..8e246d9 100644 --- a/media/formats/webm/webm_video_client.h +++ b/media/formats/webm/webm_video_client.h @@ -18,7 +18,7 @@ class VideoDecoderConfig; class WebMVideoClient : public WebMParserClient { public: explicit WebMVideoClient(const LogCB& log_cb); - virtual ~WebMVideoClient(); + ~WebMVideoClient() override; // Reset this object's state so it can process a new video track element. void Reset(); @@ -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; + bool OnUInt(int id, int64 val) override; + bool OnBinary(int id, const uint8* data, int size) override; + bool OnFloat(int id, double val) override; LogCB log_cb_; int64 pixel_width_; diff --git a/media/midi/midi_manager_mac.h b/media/midi/midi_manager_mac.h index fbc594b..f7179ec 100644 --- a/media/midi/midi_manager_mac.h +++ b/media/midi/midi_manager_mac.h @@ -22,14 +22,14 @@ namespace media { class MEDIA_EXPORT MidiManagerMac : public MidiManager { public: MidiManagerMac(); - virtual ~MidiManagerMac(); + ~MidiManagerMac() override; // MidiManager implementation. - virtual void StartInitialization() override; - virtual void DispatchSendMidiData(MidiManagerClient* client, - uint32 port_index, - const std::vector<uint8>& data, - double timestamp) override; + void StartInitialization() override; + void DispatchSendMidiData(MidiManagerClient* client, + uint32 port_index, + const std::vector<uint8>& data, + double timestamp) override; private: // Runs a closure on |client_thread_|. It starts the thread if it isn't diff --git a/media/midi/midi_manager_unittest.cc b/media/midi/midi_manager_unittest.cc index cd81770..846e1bc 100644 --- a/media/midi/midi_manager_unittest.cc +++ b/media/midi/midi_manager_unittest.cc @@ -21,17 +21,17 @@ namespace { class FakeMidiManager : public MidiManager { public: FakeMidiManager() : start_initialization_is_called_(false) {} - virtual ~FakeMidiManager() {} + ~FakeMidiManager() override {} // MidiManager implementation. - virtual void StartInitialization() override { + void StartInitialization() override { start_initialization_is_called_ = true; } - virtual void DispatchSendMidiData(MidiManagerClient* client, - uint32 port_index, - const std::vector<uint8>& data, - double timestamp) override {} + void DispatchSendMidiData(MidiManagerClient* client, + uint32 port_index, + const std::vector<uint8>& data, + double timestamp) override {} // Utility functions for testing. void CallCompleteInitialization(MidiResult result) { @@ -58,19 +58,21 @@ class FakeMidiManagerClient : public MidiManagerClient { : client_id_(client_id), result_(MIDI_NOT_SUPPORTED), wait_for_result_(true) {} - virtual ~FakeMidiManagerClient() {} + ~FakeMidiManagerClient() override {} // MidiManagerClient implementation. - virtual void CompleteStartSession(int client_id, MidiResult result) override { + void CompleteStartSession(int client_id, MidiResult result) override { EXPECT_TRUE(wait_for_result_); CHECK_EQ(client_id_, client_id); result_ = result; wait_for_result_ = false; } - virtual void ReceiveMidiData(uint32 port_index, const uint8* data, - size_t size, double timestamp) override {} - virtual void AccumulateMidiBytesSent(size_t size) override {} + void ReceiveMidiData(uint32 port_index, + const uint8* data, + size_t size, + double timestamp) override {} + 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 ccc0222..d15a828 100644 --- a/media/midi/midi_manager_usb.h +++ b/media/midi/midi_manager_usb.h @@ -29,27 +29,27 @@ class MEDIA_EXPORT MidiManagerUsb : public MidiManager, public UsbMidiInputStream::Delegate { public: explicit MidiManagerUsb(scoped_ptr<UsbMidiDevice::Factory> device_factory); - virtual ~MidiManagerUsb(); + ~MidiManagerUsb() override; // MidiManager implementation. - virtual void StartInitialization() override; - virtual void DispatchSendMidiData(MidiManagerClient* client, - uint32 port_index, - const std::vector<uint8>& data, - double timestamp) override; + void StartInitialization() override; + void DispatchSendMidiData(MidiManagerClient* client, + uint32 port_index, + const std::vector<uint8>& data, + double timestamp) override; // UsbMidiDeviceDelegate implementation. - virtual void ReceiveUsbMidiData(UsbMidiDevice* device, - int endpoint_number, - const uint8* data, - size_t size, - base::TimeTicks time) override; + void ReceiveUsbMidiData(UsbMidiDevice* device, + int endpoint_number, + const uint8* data, + size_t size, + base::TimeTicks time) override; // UsbMidiInputStream::Delegate implementation. - virtual void OnReceivedData(size_t jack_index, - const uint8* data, - size_t size, - base::TimeTicks time) override; + void OnReceivedData(size_t jack_index, + const uint8* data, + size_t size, + 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 b162eed..b4f939f 100644 --- a/media/midi/midi_manager_usb_unittest.cc +++ b/media/midi/midi_manager_usb_unittest.cc @@ -43,15 +43,14 @@ class Logger { class FakeUsbMidiDevice : public UsbMidiDevice { public: explicit FakeUsbMidiDevice(Logger* logger) : logger_(logger) {} - virtual ~FakeUsbMidiDevice() {} + ~FakeUsbMidiDevice() override {} - virtual std::vector<uint8> GetDescriptor() override { + std::vector<uint8> GetDescriptor() override { logger_->AddLog("UsbMidiDevice::GetDescriptor\n"); return descriptor_; } - virtual void Send(int endpoint_number, - const std::vector<uint8>& data) override { + void Send(int endpoint_number, const std::vector<uint8>& data) override { logger_->AddLog("UsbMidiDevice::Send "); logger_->AddLog(base::StringPrintf("endpoint = %d data =", endpoint_number)); @@ -77,17 +76,17 @@ class FakeMidiManagerClient : public MidiManagerClient { : complete_start_session_(false), result_(MIDI_NOT_SUPPORTED), logger_(logger) {} - virtual ~FakeMidiManagerClient() {} + ~FakeMidiManagerClient() override {} - virtual void CompleteStartSession(int client_id, MidiResult result) override { + void CompleteStartSession(int client_id, MidiResult result) override { complete_start_session_ = true; result_ = result; } - virtual void ReceiveMidiData(uint32 port_index, - const uint8* data, - size_t size, - double timestamp) override { + void ReceiveMidiData(uint32 port_index, + const uint8* data, + size_t size, + 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 +94,7 @@ class FakeMidiManagerClient : public MidiManagerClient { logger_->AddLog("\n"); } - virtual void AccumulateMidiBytesSent(size_t size) override { + void AccumulateMidiBytesSent(size_t size) override { logger_->AddLog("MidiManagerClient::AccumulateMidiBytesSent "); // Windows has no "%zu". logger_->AddLog(base::StringPrintf("size = %u\n", @@ -114,9 +113,9 @@ class FakeMidiManagerClient : public MidiManagerClient { class TestUsbMidiDeviceFactory : public UsbMidiDevice::Factory { public: TestUsbMidiDeviceFactory() {} - virtual ~TestUsbMidiDeviceFactory() {} - virtual void EnumerateDevices(UsbMidiDeviceDelegate* device, - Callback callback) override { + ~TestUsbMidiDeviceFactory() override {} + void EnumerateDevices(UsbMidiDeviceDelegate* device, + Callback callback) override { callback_ = callback; } @@ -131,7 +130,7 @@ class MidiManagerUsbForTesting : public MidiManagerUsb { explicit MidiManagerUsbForTesting( scoped_ptr<UsbMidiDevice::Factory> device_factory) : MidiManagerUsb(device_factory.Pass()) {} - virtual ~MidiManagerUsbForTesting() {} + ~MidiManagerUsbForTesting() override {} void CallCompleteInitialization(MidiResult result) { CompleteInitialization(result); diff --git a/media/midi/usb_midi_input_stream_unittest.cc b/media/midi/usb_midi_input_stream_unittest.cc index 9846cfa..835d6727 100644 --- a/media/midi/usb_midi_input_stream_unittest.cc +++ b/media/midi/usb_midi_input_stream_unittest.cc @@ -22,12 +22,9 @@ namespace { class TestUsbMidiDevice : public UsbMidiDevice { public: TestUsbMidiDevice() {} - virtual ~TestUsbMidiDevice() {} - virtual std::vector<uint8> GetDescriptor() override { - return std::vector<uint8>(); - } - virtual void Send(int endpoint_number, - const std::vector<uint8>& data) override {} + ~TestUsbMidiDevice() override {} + std::vector<uint8> GetDescriptor() override { return std::vector<uint8>(); } + void Send(int endpoint_number, const std::vector<uint8>& data) override {} private: DISALLOW_COPY_AND_ASSIGN(TestUsbMidiDevice); @@ -36,11 +33,11 @@ class TestUsbMidiDevice : public UsbMidiDevice { class MockDelegate : public UsbMidiInputStream::Delegate { public: MockDelegate() {} - virtual ~MockDelegate() {} - virtual void OnReceivedData(size_t jack_index, - const uint8* data, - size_t size, - base::TimeTicks time) override { + ~MockDelegate() override {} + void OnReceivedData(size_t jack_index, + const uint8* data, + size_t size, + 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 a8b4735..f682f42 100644 --- a/media/midi/usb_midi_output_stream_unittest.cc +++ b/media/midi/usb_midi_output_stream_unittest.cc @@ -24,14 +24,11 @@ std::vector<T> ToVector(const T((&array)[N])) { class MockUsbMidiDevice : public UsbMidiDevice { public: MockUsbMidiDevice() {} - virtual ~MockUsbMidiDevice() {} + ~MockUsbMidiDevice() override {} - virtual std::vector<uint8> GetDescriptor() override { - return std::vector<uint8>(); - } + std::vector<uint8> GetDescriptor() override { return std::vector<uint8>(); } - virtual void Send(int endpoint_number, const std::vector<uint8>& data) - override { + void Send(int endpoint_number, const std::vector<uint8>& data) 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 89ecfb5..60b4a38 100644 --- a/media/mojo/services/mojo_demuxer_stream_adapter.h +++ b/media/mojo/services/mojo_demuxer_stream_adapter.h @@ -29,21 +29,20 @@ class MojoDemuxerStreamAdapter : public media::DemuxerStream, // NOTE: Illegal to call any methods until |stream_ready_cb| is invoked. MojoDemuxerStreamAdapter(mojo::DemuxerStreamPtr demuxer_stream, const base::Closure& stream_ready_cb); - virtual ~MojoDemuxerStreamAdapter(); + ~MojoDemuxerStreamAdapter() override; // 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; + void Read(const ReadCB& read_cb) override; + AudioDecoderConfig audio_decoder_config() override; + VideoDecoderConfig video_decoder_config() override; + Type type() override; + void EnableBitstreamConverter() override; + bool SupportsConfigChanges() override; + VideoRotation video_rotation() override; // mojo::DemuxerStreamClient implementation. - virtual void OnStreamReady(mojo::ScopedDataPipeConsumerHandle pipe) override; - virtual void OnAudioDecoderConfigChanged( - mojo::AudioDecoderConfigPtr config) override; + void OnStreamReady(mojo::ScopedDataPipeConsumerHandle pipe) override; + void OnAudioDecoderConfigChanged(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 85b0c17..46333e4 100644 --- a/media/mojo/services/mojo_demuxer_stream_impl.h +++ b/media/mojo/services/mojo_demuxer_stream_impl.h @@ -21,15 +21,15 @@ class MojoDemuxerStreamImpl : public mojo::InterfaceImpl<mojo::DemuxerStream> { // |stream| is the underlying DemuxerStream we are proxying for. // Note: |this| does not take ownership of |stream|. explicit MojoDemuxerStreamImpl(media::DemuxerStream* stream); - virtual ~MojoDemuxerStreamImpl(); + ~MojoDemuxerStreamImpl() override; // mojo::DemuxerStream implementation. - virtual void Read(const mojo::Callback< - void(mojo::DemuxerStream::Status, mojo::MediaDecoderBufferPtr)>& callback) + void Read(const mojo::Callback<void(mojo::DemuxerStream::Status, + mojo::MediaDecoderBufferPtr)>& callback) override; // mojo::InterfaceImpl overrides. - virtual void OnConnectionEstablished() override; + void OnConnectionEstablished() override; private: // |callback| is the callback that was passed to the initiating Read() diff --git a/media/mojo/services/mojo_renderer_impl.h b/media/mojo/services/mojo_renderer_impl.h index 87d7b95..f70bb99 100644 --- a/media/mojo/services/mojo_renderer_impl.h +++ b/media/mojo/services/mojo_renderer_impl.h @@ -37,30 +37,29 @@ class MojoRendererImpl : public Renderer, public mojo::MediaRendererClient { MojoRendererImpl( const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, mojo::ServiceProvider* audio_renderer_provider); - virtual ~MojoRendererImpl(); + ~MojoRendererImpl() override; // Renderer implementation. - virtual void Initialize(DemuxerStreamProvider* demuxer_stream_provider, - const base::Closure& init_cb, - 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; + void Initialize(DemuxerStreamProvider* demuxer_stream_provider, + const base::Closure& init_cb, + const StatisticsCB& statistics_cb, + const base::Closure& ended_cb, + const PipelineStatusCB& error_cb, + const BufferingStateCB& buffering_state_cb) override; + void Flush(const base::Closure& flush_cb) override; + void StartPlayingFrom(base::TimeDelta time) override; + void SetPlaybackRate(float playback_rate) override; + void SetVolume(float volume) override; + base::TimeDelta GetMediaTime() override; + bool HasAudio() override; + bool HasVideo() override; + void SetCdm(MediaKeys* cdm) override; // mojo::MediaRendererClient implementation. - virtual void OnTimeUpdate(int64_t time_usec, - int64_t max_time_usec) override; - virtual void OnBufferingStateChange(mojo::BufferingState state) override; - virtual void OnEnded() override; - virtual void OnError() override; + void OnTimeUpdate(int64_t time_usec, int64_t max_time_usec) override; + void OnBufferingStateChange(mojo::BufferingState state) override; + void OnEnded() override; + void OnError() override; private: // Called when |remote_audio_renderer_| has finished initializing. diff --git a/media/mojo/services/mojo_renderer_service.cc b/media/mojo/services/mojo_renderer_service.cc index b4557b8..2f1625c 100644 --- a/media/mojo/services/mojo_renderer_service.cc +++ b/media/mojo/services/mojo_renderer_service.cc @@ -27,16 +27,15 @@ class MojoRendererApplication public mojo::InterfaceFactory<mojo::MediaRenderer> { public: // mojo::ApplicationDelegate implementation. - virtual bool ConfigureIncomingConnection( + bool ConfigureIncomingConnection( mojo::ApplicationConnection* connection) override { connection->AddService(this); return true; } // mojo::InterfaceFactory<mojo::MediaRenderer> implementation. - virtual void Create( - mojo::ApplicationConnection* connection, - mojo::InterfaceRequest<mojo::MediaRenderer> request) override { + void Create(mojo::ApplicationConnection* connection, + mojo::InterfaceRequest<mojo::MediaRenderer> request) override { mojo::BindToRequest(new MojoRendererService(connection), &request); } }; diff --git a/media/mojo/services/mojo_renderer_service.h b/media/mojo/services/mojo_renderer_service.h index e3f314e..75726b9 100644 --- a/media/mojo/services/mojo_renderer_service.h +++ b/media/mojo/services/mojo_renderer_service.h @@ -34,15 +34,15 @@ class MojoRendererService : public mojo::InterfaceImpl<mojo::MediaRenderer> { // allow |this| to connect to a sink that will receive decoded data ready // for playback. explicit MojoRendererService(mojo::ApplicationConnection* connection); - virtual ~MojoRendererService(); + ~MojoRendererService() override; // mojo::MediaRenderer implementation. - virtual void Initialize(mojo::DemuxerStreamPtr stream, - const mojo::Callback<void()>& callback) override; - virtual void Flush(const mojo::Callback<void()>& callback) override; - virtual void StartPlayingFrom(int64_t time_delta_usec) override; - virtual void SetPlaybackRate(float playback_rate) override; - virtual void SetVolume(float volume) override; + void Initialize(mojo::DemuxerStreamPtr stream, + const mojo::Callback<void()>& callback) override; + void Flush(const mojo::Callback<void()>& callback) override; + void StartPlayingFrom(int64_t time_delta_usec) override; + void SetPlaybackRate(float playback_rate) override; + void SetVolume(float volume) override; private: // Called when the MojoDemuxerStreamAdapter is ready to go (has a config, diff --git a/media/mojo/services/renderer_unittest.cc b/media/mojo/services/renderer_unittest.cc index 830592d..72f74b2 100644 --- a/media/mojo/services/renderer_unittest.cc +++ b/media/mojo/services/renderer_unittest.cc @@ -25,10 +25,10 @@ namespace { class MojoRendererTestHelper : public mojo::ApplicationDelegate { public: MojoRendererTestHelper() : application_impl_(NULL) {} - virtual ~MojoRendererTestHelper() {} + ~MojoRendererTestHelper() override {} // ApplicationDelegate implementation. - virtual void Initialize(mojo::ApplicationImpl* app) override { + void Initialize(mojo::ApplicationImpl* app) override { application_impl_ = app; } @@ -49,22 +49,21 @@ class FakeDemuxerStream : public media::DemuxerStreamProvider, public media::DemuxerStream { public: FakeDemuxerStream() {} - virtual ~FakeDemuxerStream() {} + ~FakeDemuxerStream() override {} // media::Demuxer implementation. - virtual media::DemuxerStream* GetStream( - media::DemuxerStream::Type type) override { + media::DemuxerStream* GetStream(media::DemuxerStream::Type type) override { DCHECK_EQ(media::DemuxerStream::AUDIO, type); return this; } - virtual media::DemuxerStreamProvider::Liveness GetLiveness() const override { + media::DemuxerStreamProvider::Liveness GetLiveness() const override { return media::DemuxerStreamProvider::LIVENESS_UNKNOWN; } // media::DemuxerStream implementation. - virtual void Read(const ReadCB& read_cb) override {} + void Read(const ReadCB& read_cb) override {} - virtual media::AudioDecoderConfig audio_decoder_config() override { + media::AudioDecoderConfig audio_decoder_config() override { media::AudioDecoderConfig config; config.Initialize(media::kCodecAAC, media::kSampleFormatU8, @@ -79,20 +78,20 @@ class FakeDemuxerStream : public media::DemuxerStreamProvider, return config; } - virtual media::VideoDecoderConfig video_decoder_config() override { + media::VideoDecoderConfig video_decoder_config() override { NOTREACHED(); return media::VideoDecoderConfig(); } - virtual media::DemuxerStream::Type type() override { + media::DemuxerStream::Type type() override { return media::DemuxerStream::AUDIO; } - virtual void EnableBitstreamConverter() override {} + void EnableBitstreamConverter() override {} - virtual bool SupportsConfigChanges() override { return true; } + bool SupportsConfigChanges() override { return true; } - virtual media::VideoRotation video_rotation() override { + media::VideoRotation video_rotation() override { NOTREACHED(); return media::VIDEO_ROTATION_0; } diff --git a/media/video/capture/fake_video_capture_device.h b/media/video/capture/fake_video_capture_device.h index c04ae24..30d1b33 100644 --- a/media/video/capture/fake_video_capture_device.h +++ b/media/video/capture/fake_video_capture_device.h @@ -23,13 +23,12 @@ class MEDIA_EXPORT FakeVideoCaptureDevice : public VideoCaptureDevice { static const int kFakeCaptureTimeoutMs = 50; FakeVideoCaptureDevice(); - virtual ~FakeVideoCaptureDevice(); + ~FakeVideoCaptureDevice() override; // VideoCaptureDevice implementation. - virtual void AllocateAndStart( - const VideoCaptureParams& params, - scoped_ptr<VideoCaptureDevice::Client> client) override; - virtual void StopAndDeAllocate() override; + void AllocateAndStart(const VideoCaptureParams& params, + scoped_ptr<VideoCaptureDevice::Client> client) override; + 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 a45dfa3..00cea5d 100644 --- a/media/video/capture/fake_video_capture_device_factory.h +++ b/media/video/capture/fake_video_capture_device_factory.h @@ -17,12 +17,12 @@ class MEDIA_EXPORT FakeVideoCaptureDeviceFactory : public VideoCaptureDeviceFactory { public: FakeVideoCaptureDeviceFactory(); - virtual ~FakeVideoCaptureDeviceFactory() {} + ~FakeVideoCaptureDeviceFactory() override {} - virtual scoped_ptr<VideoCaptureDevice> Create( + scoped_ptr<VideoCaptureDevice> Create( const VideoCaptureDevice::Name& device_name) override; - virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) override; - virtual void GetDeviceSupportedFormats( + void GetDeviceNames(VideoCaptureDevice::Names* device_names) override; + void GetDeviceSupportedFormats( const VideoCaptureDevice::Name& device, VideoCaptureFormats* supported_formats) override; diff --git a/media/video/capture/file_video_capture_device.h b/media/video/capture/file_video_capture_device.h index 85c63d9..7b6cd1d 100644 --- a/media/video/capture/file_video_capture_device.h +++ b/media/video/capture/file_video_capture_device.h @@ -35,11 +35,10 @@ class MEDIA_EXPORT FileVideoCaptureDevice : public VideoCaptureDevice { explicit FileVideoCaptureDevice(const base::FilePath& file_path); // VideoCaptureDevice implementation, class methods. - virtual ~FileVideoCaptureDevice(); - virtual void AllocateAndStart( - const VideoCaptureParams& params, - scoped_ptr<VideoCaptureDevice::Client> client) override; - virtual void StopAndDeAllocate() override; + ~FileVideoCaptureDevice() override; + void AllocateAndStart(const VideoCaptureParams& params, + scoped_ptr<VideoCaptureDevice::Client> client) override; + 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 a696abe..523cd71 100644 --- a/media/video/capture/file_video_capture_device_factory.h +++ b/media/video/capture/file_video_capture_device_factory.h @@ -16,12 +16,12 @@ class MEDIA_EXPORT FileVideoCaptureDeviceFactory : public VideoCaptureDeviceFactory { public: FileVideoCaptureDeviceFactory() {} - virtual ~FileVideoCaptureDeviceFactory() {} + ~FileVideoCaptureDeviceFactory() override {} - virtual scoped_ptr<VideoCaptureDevice> Create( + scoped_ptr<VideoCaptureDevice> Create( const VideoCaptureDevice::Name& device_name) override; - virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) override; - virtual void GetDeviceSupportedFormats( + void GetDeviceNames(VideoCaptureDevice::Names* device_names) override; + void GetDeviceSupportedFormats( const VideoCaptureDevice::Name& device, VideoCaptureFormats* supported_formats) override; }; 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 13cc9d8..45e697d 100644 --- a/media/video/capture/mac/video_capture_device_decklink_mac.h +++ b/media/video/capture/mac/video_capture_device_decklink_mac.h @@ -41,7 +41,7 @@ class MEDIA_EXPORT VideoCaptureDeviceDeckLinkMac : public VideoCaptureDevice { VideoCaptureFormats* supported_formats); explicit VideoCaptureDeviceDeckLinkMac(const Name& device_name); - virtual ~VideoCaptureDeviceDeckLinkMac(); + ~VideoCaptureDeviceDeckLinkMac() override; // Copy of VideoCaptureDevice::Client::OnIncomingCapturedData(). Used by // |decklink_capture_delegate_| to forward captured frames. @@ -59,10 +59,9 @@ class MEDIA_EXPORT VideoCaptureDeviceDeckLinkMac : public VideoCaptureDevice { private: // VideoCaptureDevice implementation. - virtual void AllocateAndStart( - const VideoCaptureParams& params, - scoped_ptr<VideoCaptureDevice::Client> client) override; - virtual void StopAndDeAllocate() override; + void AllocateAndStart(const VideoCaptureParams& params, + scoped_ptr<VideoCaptureDevice::Client> client) override; + 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 e51a3bd..b61d93a 100644 --- a/media/video/capture/mac/video_capture_device_decklink_mac.mm +++ b/media/video/capture/mac/video_capture_device_decklink_mac.mm @@ -57,18 +57,18 @@ class DeckLinkCaptureDelegate : private: // IDeckLinkInputCallback interface implementation. - virtual HRESULT VideoInputFormatChanged( + HRESULT VideoInputFormatChanged( BMDVideoInputFormatChangedEvents notification_events, - IDeckLinkDisplayMode *new_display_mode, + IDeckLinkDisplayMode* new_display_mode, BMDDetectedVideoInputFormatFlags detected_signal_flags) override; - virtual HRESULT VideoInputFrameArrived( + HRESULT VideoInputFrameArrived( IDeckLinkVideoInputFrame* video_frame, IDeckLinkAudioInputPacket* audio_packet) override; // IUnknown interface implementation. - virtual HRESULT QueryInterface(REFIID iid, void** ppv) override; - virtual ULONG AddRef() override; - virtual ULONG Release() override; + HRESULT QueryInterface(REFIID iid, void** ppv) override; + ULONG AddRef() override; + ULONG Release() override; // Forwarder to VideoCaptureDeviceDeckLinkMac::SendErrorString(). void SendErrorString(const std::string& reason); @@ -96,7 +96,7 @@ class DeckLinkCaptureDelegate : friend class scoped_refptr<DeckLinkCaptureDelegate>; friend class base::RefCountedThreadSafe<DeckLinkCaptureDelegate>; - virtual ~DeckLinkCaptureDelegate(); + ~DeckLinkCaptureDelegate() override; DISALLOW_COPY_AND_ASSIGN(DeckLinkCaptureDelegate); }; 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 9756c12..f3a180c 100644 --- a/media/video/capture/mac/video_capture_device_factory_mac.h +++ b/media/video/capture/mac/video_capture_device_factory_mac.h @@ -19,14 +19,14 @@ class MEDIA_EXPORT VideoCaptureDeviceFactoryMac : explicit VideoCaptureDeviceFactoryMac( scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner); - virtual ~VideoCaptureDeviceFactoryMac(); + ~VideoCaptureDeviceFactoryMac() override; - virtual scoped_ptr<VideoCaptureDevice> Create( + scoped_ptr<VideoCaptureDevice> Create( const VideoCaptureDevice::Name& device_name) override; - virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) override; - virtual void EnumerateDeviceNames(const base::Callback< + void GetDeviceNames(VideoCaptureDevice::Names* device_names) override; + void EnumerateDeviceNames(const base::Callback< void(scoped_ptr<media::VideoCaptureDevice::Names>)>& callback) override; - virtual void GetDeviceSupportedFormats( + void GetDeviceSupportedFormats( const VideoCaptureDevice::Name& device, VideoCaptureFormats* supported_formats) override; diff --git a/media/video/capture/mac/video_capture_device_mac.h b/media/video/capture/mac/video_capture_device_mac.h index ec902d3..a3fd1b1 100644 --- a/media/video/capture/mac/video_capture_device_mac.h +++ b/media/video/capture/mac/video_capture_device_mac.h @@ -56,13 +56,12 @@ enum { class VideoCaptureDeviceMac : public VideoCaptureDevice { public: explicit VideoCaptureDeviceMac(const Name& device_name); - virtual ~VideoCaptureDeviceMac(); + ~VideoCaptureDeviceMac() override; // VideoCaptureDevice implementation. - virtual void AllocateAndStart( - const VideoCaptureParams& params, - scoped_ptr<VideoCaptureDevice::Client> client) override; - virtual void StopAndDeAllocate() override; + void AllocateAndStart(const VideoCaptureParams& params, + scoped_ptr<VideoCaptureDevice::Client> client) override; + void StopAndDeAllocate() override; bool Init(VideoCaptureDevice::Name::CaptureApiType capture_api_type); |