summaryrefslogtreecommitdiffstats
path: root/media/cast/receiver
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-21 05:23:27 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-21 12:24:04 +0000
commitc24565478f64d1aa4d07e83c69d00bad11fa2665 (patch)
treeec3572cc086984ca8dcdb2c2740c1b8e163dd0b0 /media/cast/receiver
parent3fc12db4bdf0829f206dafbb23d411ff502d7de6 (diff)
downloadchromium_src-c24565478f64d1aa4d07e83c69d00bad11fa2665.zip
chromium_src-c24565478f64d1aa4d07e83c69d00bad11fa2665.tar.gz
chromium_src-c24565478f64d1aa4d07e83c69d00bad11fa2665.tar.bz2
Standardize usage of virtual/override/final in media/
This patch was automatically generated by applying clang fixit hints generated by the plugin to the source tree. BUG=417463 TBR=ddorwin@chromium.org Review URL: https://codereview.chromium.org/655713003 Cr-Commit-Position: refs/heads/master@{#300471}
Diffstat (limited to 'media/cast/receiver')
-rw-r--r--media/cast/receiver/audio_decoder.cc10
-rw-r--r--media/cast/receiver/cast_receiver_impl.h12
-rw-r--r--media/cast/receiver/frame_receiver.h4
-rw-r--r--media/cast/receiver/video_decoder.cc8
4 files changed, 17 insertions, 17 deletions
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;