diff options
Diffstat (limited to 'media/video')
8 files changed, 36 insertions, 40 deletions
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); |