zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mark all virtual overrides in the hierarchy of Module as virtual and OVERRIDE.

Browse Source 
This will make a subsequent change I intend to do safer, where I'll change the
return type of one of the base Module functions, by breaking the compile if I
miss any overrides.

This also highlighted a number of unused functions (in many cases apparently
virtual "overrides" of no-longer-existent base functions).  I've removed some of
these.

This also highlighted several cases where "virtual" was used unnecessarily to
mark a function that was only defined in one class.  Removed "virtual" in those
cases.

BUG=none
TEST=none
R=andrew@webrtc.org, henrik.lundin@webrtc.org, mallinath@webrtc.org, mflodman@webrtc.org, stefan@webrtc.org, turaj@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/24419004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7146 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrik.lundin@webrtc.org
2014-09-11 06:20:28 +00:00
parent 4c876453c8
commit 1972ff8a6e
25 changed files with 344 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
webrtc/modules/video_coding/main/source/video_coding_impl.cc
View File

@ -131,8 +131,8 @@ class VideoCodingModuleImpl : public VideoCodingModule {
externalEncoder, payloadType, internalSource);
}
virtual int32_t CodecConfigParameters(uint8_t* buffer, int32_t size)
OVERRIDE {
virtual int32_t CodecConfigParameters(uint8_t* buffer,
int32_t size) OVERRIDE {
return sender_->CodecConfigParameters(buffer, size);
}
@ -150,8 +150,8 @@ class VideoCodingModuleImpl : public VideoCodingModule {
return sender_->SetChannelParameters(target_bitrate, lossRate, rtt);
}
virtual int32_t RegisterTransportCallback(VCMPacketizationCallback* transport)
OVERRIDE {
virtual int32_t RegisterTransportCallback(
VCMPacketizationCallback* transport) OVERRIDE {
return sender_->RegisterTransportCallback(transport);
}
@ -165,8 +165,8 @@ class VideoCodingModuleImpl : public VideoCodingModule {
return sender_->RegisterVideoQMCallback(videoQMSettings);
}
virtual int32_t RegisterProtectionCallback(VCMProtectionCallback* protection)
OVERRIDE {
virtual int32_t RegisterProtectionCallback(
VCMProtectionCallback* protection) OVERRIDE {
return sender_->RegisterProtectionCallback(protection);
}
@ -181,10 +181,10 @@ class VideoCodingModuleImpl : public VideoCodingModule {
return sender_return;
}
virtual int32_t AddVideoFrame(const I420VideoFrame& videoFrame,
const VideoContentMetrics* contentMetrics,
const CodecSpecificInfo* codecSpecificInfo)
OVERRIDE {
virtual int32_t AddVideoFrame(
const I420VideoFrame& videoFrame,
const VideoContentMetrics* contentMetrics,
const CodecSpecificInfo* codecSpecificInfo) OVERRIDE {
return sender_->AddVideoFrame(
videoFrame, contentMetrics, codecSpecificInfo);
}
@ -226,11 +226,11 @@ class VideoCodingModuleImpl : public VideoCodingModule {
return VCM_OK;
}
virtual void SuspendBelowMinBitrate() {
virtual void SuspendBelowMinBitrate() OVERRIDE {
return sender_->SuspendBelowMinBitrate();
}
virtual bool VideoSuspended() const {
virtual bool VideoSuspended() const OVERRIDE {
return sender_->VideoSuspended();
}
@ -252,8 +252,8 @@ class VideoCodingModuleImpl : public VideoCodingModule {
externalDecoder, payloadType, internalRenderTiming);
}
virtual int32_t RegisterReceiveCallback(VCMReceiveCallback* receiveCallback)
OVERRIDE {
virtual int32_t RegisterReceiveCallback(
VCMReceiveCallback* receiveCallback) OVERRIDE {
return receiver_->RegisterReceiveCallback(receiveCallback);
}
@ -292,7 +292,7 @@ class VideoCodingModuleImpl : public VideoCodingModule {
virtual int32_t ResetDecoder() OVERRIDE { return receiver_->ResetDecoder(); }
virtual int32_t ReceiveCodec(VideoCodec* currentReceiveCodec) const {
virtual int32_t ReceiveCodec(VideoCodec* currentReceiveCodec) const OVERRIDE {
return receiver_->ReceiveCodec(currentReceiveCodec);
}