summaryrefslogtreecommitdiffstats
path: root/remoting/codec
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-21 05:30:14 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-21 12:30:36 +0000
commit562aba59981ae3d648503827d699ae8cbbeb6111 (patch)
tree6c87081fe54abeb19222388174122272a7f4f549 /remoting/codec
parentc24565478f64d1aa4d07e83c69d00bad11fa2665 (diff)
downloadchromium_src-562aba59981ae3d648503827d699ae8cbbeb6111.zip
chromium_src-562aba59981ae3d648503827d699ae8cbbeb6111.tar.gz
chromium_src-562aba59981ae3d648503827d699ae8cbbeb6111.tar.bz2
Standardize usage of virtual/override/final in remoting/
This patch was automatically generated by applying clang fixit hints generated by the plugin to the source tree. BUG=417463 TBR=jamiewalch@chromium.org Review URL: https://codereview.chromium.org/667123002 Cr-Commit-Position: refs/heads/master@{#300472}
Diffstat (limited to 'remoting/codec')
-rw-r--r--remoting/codec/audio_decoder_opus.h5
-rw-r--r--remoting/codec/audio_decoder_verbatim.h5
-rw-r--r--remoting/codec/audio_encoder_opus.h5
-rw-r--r--remoting/codec/audio_encoder_verbatim.h5
-rw-r--r--remoting/codec/video_decoder_verbatim.h22
-rw-r--r--remoting/codec/video_decoder_vpx.h22
-rw-r--r--remoting/codec/video_encoder_verbatim.h5
-rw-r--r--remoting/codec/video_encoder_vpx.h9
8 files changed, 36 insertions, 42 deletions
diff --git a/remoting/codec/audio_decoder_opus.h b/remoting/codec/audio_decoder_opus.h
index 2c3a527..dcf8776 100644
--- a/remoting/codec/audio_decoder_opus.h
+++ b/remoting/codec/audio_decoder_opus.h
@@ -18,11 +18,10 @@ class AudioPacket;
class AudioDecoderOpus : public AudioDecoder {
public:
AudioDecoderOpus();
- virtual ~AudioDecoderOpus();
+ ~AudioDecoderOpus() override;
// AudioDecoder interface.
- virtual scoped_ptr<AudioPacket> Decode(
- scoped_ptr<AudioPacket> packet) override;
+ scoped_ptr<AudioPacket> Decode(scoped_ptr<AudioPacket> packet) override;
private:
void InitDecoder();
diff --git a/remoting/codec/audio_decoder_verbatim.h b/remoting/codec/audio_decoder_verbatim.h
index aef5cd9..e6d1172 100644
--- a/remoting/codec/audio_decoder_verbatim.h
+++ b/remoting/codec/audio_decoder_verbatim.h
@@ -17,10 +17,9 @@ class AudioPacket;
class AudioDecoderVerbatim : public AudioDecoder {
public:
AudioDecoderVerbatim();
- virtual ~AudioDecoderVerbatim();
+ ~AudioDecoderVerbatim() override;
- virtual scoped_ptr<AudioPacket> Decode(
- scoped_ptr<AudioPacket> packet) override;
+ scoped_ptr<AudioPacket> Decode(scoped_ptr<AudioPacket> packet) override;
private:
DISALLOW_COPY_AND_ASSIGN(AudioDecoderVerbatim);
diff --git a/remoting/codec/audio_encoder_opus.h b/remoting/codec/audio_encoder_opus.h
index 16be750..7f86785 100644
--- a/remoting/codec/audio_encoder_opus.h
+++ b/remoting/codec/audio_encoder_opus.h
@@ -23,11 +23,10 @@ class AudioPacket;
class AudioEncoderOpus : public AudioEncoder {
public:
AudioEncoderOpus();
- virtual ~AudioEncoderOpus();
+ ~AudioEncoderOpus() override;
// AudioEncoder interface.
- virtual scoped_ptr<AudioPacket> Encode(
- scoped_ptr<AudioPacket> packet) override;
+ scoped_ptr<AudioPacket> Encode(scoped_ptr<AudioPacket> packet) override;
private:
void InitEncoder();
diff --git a/remoting/codec/audio_encoder_verbatim.h b/remoting/codec/audio_encoder_verbatim.h
index 25cd54e..2605b6e 100644
--- a/remoting/codec/audio_encoder_verbatim.h
+++ b/remoting/codec/audio_encoder_verbatim.h
@@ -14,11 +14,10 @@ class AudioPacket;
class AudioEncoderVerbatim : public AudioEncoder {
public:
AudioEncoderVerbatim();
- virtual ~AudioEncoderVerbatim();
+ ~AudioEncoderVerbatim() override;
// AudioEncoder implementation.
- virtual scoped_ptr<AudioPacket> Encode(
- scoped_ptr<AudioPacket> packet) override;
+ scoped_ptr<AudioPacket> Encode(scoped_ptr<AudioPacket> packet) override;
private:
DISALLOW_COPY_AND_ASSIGN(AudioEncoderVerbatim);
diff --git a/remoting/codec/video_decoder_verbatim.h b/remoting/codec/video_decoder_verbatim.h
index a02b2708..6a9ba40 100644
--- a/remoting/codec/video_decoder_verbatim.h
+++ b/remoting/codec/video_decoder_verbatim.h
@@ -18,21 +18,21 @@ namespace remoting {
// video frames.
class VideoDecoderVerbatim : public VideoDecoder {
public:
- virtual ~VideoDecoderVerbatim();
+ ~VideoDecoderVerbatim() override;
VideoDecoderVerbatim();
// VideoDecoder implementation.
- virtual void Initialize(const webrtc::DesktopSize& screen_size) override;
- virtual bool DecodePacket(const VideoPacket& packet) override;
- virtual void Invalidate(const webrtc::DesktopSize& view_size,
- const webrtc::DesktopRegion& region) override;
- virtual void RenderFrame(const webrtc::DesktopSize& view_size,
- const webrtc::DesktopRect& clip_area,
- uint8* image_buffer,
- int image_stride,
- webrtc::DesktopRegion* output_region) override;
- virtual const webrtc::DesktopRegion* GetImageShape() override;
+ void Initialize(const webrtc::DesktopSize& screen_size) override;
+ bool DecodePacket(const VideoPacket& packet) override;
+ void Invalidate(const webrtc::DesktopSize& view_size,
+ const webrtc::DesktopRegion& region) override;
+ void RenderFrame(const webrtc::DesktopSize& view_size,
+ const webrtc::DesktopRect& clip_area,
+ uint8* image_buffer,
+ int image_stride,
+ webrtc::DesktopRegion* output_region) override;
+ const webrtc::DesktopRegion* GetImageShape() override;
private:
// The region updated that hasn't been copied to the screen yet.
diff --git a/remoting/codec/video_decoder_vpx.h b/remoting/codec/video_decoder_vpx.h
index bbf731c..9c96998 100644
--- a/remoting/codec/video_decoder_vpx.h
+++ b/remoting/codec/video_decoder_vpx.h
@@ -22,19 +22,19 @@ class VideoDecoderVpx : public VideoDecoder {
static scoped_ptr<VideoDecoderVpx> CreateForVP8();
static scoped_ptr<VideoDecoderVpx> CreateForVP9();
- virtual ~VideoDecoderVpx();
+ ~VideoDecoderVpx() override;
// VideoDecoder interface.
- virtual void Initialize(const webrtc::DesktopSize& screen_size) override;
- virtual bool DecodePacket(const VideoPacket& packet) override;
- virtual void Invalidate(const webrtc::DesktopSize& view_size,
- const webrtc::DesktopRegion& region) override;
- virtual void RenderFrame(const webrtc::DesktopSize& view_size,
- const webrtc::DesktopRect& clip_area,
- uint8* image_buffer,
- int image_stride,
- webrtc::DesktopRegion* output_region) override;
- virtual const webrtc::DesktopRegion* GetImageShape() override;
+ void Initialize(const webrtc::DesktopSize& screen_size) override;
+ bool DecodePacket(const VideoPacket& packet) override;
+ void Invalidate(const webrtc::DesktopSize& view_size,
+ const webrtc::DesktopRegion& region) override;
+ void RenderFrame(const webrtc::DesktopSize& view_size,
+ const webrtc::DesktopRect& clip_area,
+ uint8* image_buffer,
+ int image_stride,
+ webrtc::DesktopRegion* output_region) override;
+ const webrtc::DesktopRegion* GetImageShape() override;
private:
explicit VideoDecoderVpx(ScopedVpxCodec codec);
diff --git a/remoting/codec/video_encoder_verbatim.h b/remoting/codec/video_encoder_verbatim.h
index e315c24..1a348be 100644
--- a/remoting/codec/video_encoder_verbatim.h
+++ b/remoting/codec/video_encoder_verbatim.h
@@ -15,11 +15,10 @@ namespace remoting {
class VideoEncoderVerbatim : public VideoEncoder {
public:
VideoEncoderVerbatim();
- virtual ~VideoEncoderVerbatim();
+ ~VideoEncoderVerbatim() override;
// VideoEncoder interface.
- virtual scoped_ptr<VideoPacket> Encode(
- const webrtc::DesktopFrame& frame) override;
+ scoped_ptr<VideoPacket> Encode(const webrtc::DesktopFrame& frame) override;
private:
VideoEncoderHelper helper_;
diff --git a/remoting/codec/video_encoder_vpx.h b/remoting/codec/video_encoder_vpx.h
index db3ff98..fe5bd33 100644
--- a/remoting/codec/video_encoder_vpx.h
+++ b/remoting/codec/video_encoder_vpx.h
@@ -26,13 +26,12 @@ class VideoEncoderVpx : public VideoEncoder {
static scoped_ptr<VideoEncoderVpx> CreateForVP8();
static scoped_ptr<VideoEncoderVpx> CreateForVP9();
- virtual ~VideoEncoderVpx();
+ ~VideoEncoderVpx() override;
// VideoEncoder interface.
- virtual void SetLosslessEncode(bool want_lossless) override;
- virtual void SetLosslessColor(bool want_lossless) override;
- virtual scoped_ptr<VideoPacket> Encode(
- const webrtc::DesktopFrame& frame) override;
+ void SetLosslessEncode(bool want_lossless) override;
+ void SetLosslessColor(bool want_lossless) override;
+ scoped_ptr<VideoPacket> Encode(const webrtc::DesktopFrame& frame) override;
private:
explicit VideoEncoderVpx(bool use_vp9);