summaryrefslogtreecommitdiffstats
path: root/remoting/codec
diff options
context:
space:
mode:
authormostynb <mostynb@opera.com>2014-10-08 09:58:09 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-08 16:59:03 +0000
commit11d989c52c6da43c5e8eb9d377ef0286a1cc8fba (patch)
treef2cb68b6b799bbfcdce2a51e72f69aa0164bb845 /remoting/codec
parentc9d7a691bb7a1c5cfeeddfc29f227215a9338045 (diff)
downloadchromium_src-11d989c52c6da43c5e8eb9d377ef0286a1cc8fba.zip
chromium_src-11d989c52c6da43c5e8eb9d377ef0286a1cc8fba.tar.gz
chromium_src-11d989c52c6da43c5e8eb9d377ef0286a1cc8fba.tar.bz2
replace OVERRIDE and FINAL with override and final in remoting/
BUG=417463 Review URL: https://codereview.chromium.org/628753002 Cr-Commit-Position: refs/heads/master@{#298734}
Diffstat (limited to 'remoting/codec')
-rw-r--r--remoting/codec/audio_decoder_opus.h2
-rw-r--r--remoting/codec/audio_decoder_verbatim.h2
-rw-r--r--remoting/codec/audio_encoder_opus.h2
-rw-r--r--remoting/codec/audio_encoder_verbatim.h2
-rw-r--r--remoting/codec/video_decoder_verbatim.h10
-rw-r--r--remoting/codec/video_decoder_vpx.h10
-rw-r--r--remoting/codec/video_encoder_verbatim.h2
-rw-r--r--remoting/codec/video_encoder_vpx.h6
8 files changed, 18 insertions, 18 deletions
diff --git a/remoting/codec/audio_decoder_opus.h b/remoting/codec/audio_decoder_opus.h
index 35989ea..2c3a527 100644
--- a/remoting/codec/audio_decoder_opus.h
+++ b/remoting/codec/audio_decoder_opus.h
@@ -22,7 +22,7 @@ class AudioDecoderOpus : public AudioDecoder {
// AudioDecoder interface.
virtual scoped_ptr<AudioPacket> Decode(
- scoped_ptr<AudioPacket> packet) OVERRIDE;
+ 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 b2d967e..aef5cd9 100644
--- a/remoting/codec/audio_decoder_verbatim.h
+++ b/remoting/codec/audio_decoder_verbatim.h
@@ -20,7 +20,7 @@ class AudioDecoderVerbatim : public AudioDecoder {
virtual ~AudioDecoderVerbatim();
virtual scoped_ptr<AudioPacket> Decode(
- scoped_ptr<AudioPacket> packet) OVERRIDE;
+ 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 6799836..16be750 100644
--- a/remoting/codec/audio_encoder_opus.h
+++ b/remoting/codec/audio_encoder_opus.h
@@ -27,7 +27,7 @@ class AudioEncoderOpus : public AudioEncoder {
// AudioEncoder interface.
virtual scoped_ptr<AudioPacket> Encode(
- scoped_ptr<AudioPacket> packet) OVERRIDE;
+ 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 d3bc9ca..25cd54e 100644
--- a/remoting/codec/audio_encoder_verbatim.h
+++ b/remoting/codec/audio_encoder_verbatim.h
@@ -18,7 +18,7 @@ class AudioEncoderVerbatim : public AudioEncoder {
// AudioEncoder implementation.
virtual scoped_ptr<AudioPacket> Encode(
- scoped_ptr<AudioPacket> packet) OVERRIDE;
+ 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 24203d9..a02b2708 100644
--- a/remoting/codec/video_decoder_verbatim.h
+++ b/remoting/codec/video_decoder_verbatim.h
@@ -23,16 +23,16 @@ class VideoDecoderVerbatim : public VideoDecoder {
VideoDecoderVerbatim();
// VideoDecoder implementation.
- virtual void Initialize(const webrtc::DesktopSize& screen_size) OVERRIDE;
- virtual bool DecodePacket(const VideoPacket& packet) OVERRIDE;
+ 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;
+ 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;
+ webrtc::DesktopRegion* output_region) override;
+ virtual 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 3f2fcfb..bbf731c 100644
--- a/remoting/codec/video_decoder_vpx.h
+++ b/remoting/codec/video_decoder_vpx.h
@@ -25,16 +25,16 @@ class VideoDecoderVpx : public VideoDecoder {
virtual ~VideoDecoderVpx();
// VideoDecoder interface.
- virtual void Initialize(const webrtc::DesktopSize& screen_size) OVERRIDE;
- virtual bool DecodePacket(const VideoPacket& packet) OVERRIDE;
+ 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;
+ 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;
+ webrtc::DesktopRegion* output_region) override;
+ virtual 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 0005a4a..e315c24 100644
--- a/remoting/codec/video_encoder_verbatim.h
+++ b/remoting/codec/video_encoder_verbatim.h
@@ -19,7 +19,7 @@ class VideoEncoderVerbatim : public VideoEncoder {
// VideoEncoder interface.
virtual scoped_ptr<VideoPacket> Encode(
- const webrtc::DesktopFrame& frame) OVERRIDE;
+ 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 80e69db0..db3ff98 100644
--- a/remoting/codec/video_encoder_vpx.h
+++ b/remoting/codec/video_encoder_vpx.h
@@ -29,10 +29,10 @@ class VideoEncoderVpx : public VideoEncoder {
virtual ~VideoEncoderVpx();
// VideoEncoder interface.
- virtual void SetLosslessEncode(bool want_lossless) OVERRIDE;
- virtual void SetLosslessColor(bool want_lossless) OVERRIDE;
+ virtual void SetLosslessEncode(bool want_lossless) override;
+ virtual void SetLosslessColor(bool want_lossless) override;
virtual scoped_ptr<VideoPacket> Encode(
- const webrtc::DesktopFrame& frame) OVERRIDE;
+ const webrtc::DesktopFrame& frame) override;
private:
explicit VideoEncoderVpx(bool use_vp9);