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

Roll chromium_revision e144d30..6fdb142 (318658:318841) + remove OVERRIDE macro

Browse Source 
Clang version changed 223108:230914
Details: e144d30..6fdb142/tools/clang/scripts/update.sh

Removes the OVERRIDE macro defined in:
* webrtc/base/common.h
* webrtc/typedefs.h

The majority of the source changes were done by running this in src/:
perl -0pi -e "s/virtual\s([^({;]*(\([^({;]*\)[^({;]*))(OVERRIDE|override)/\1override/sg" `find {talk,webrtc} -name "*.h"  -o -name "*.cc*" -o -name "*.mm*"`

which converted all:
virtual Foo() OVERRIDE
functions to:
Foo() override

Then I manually edited:
* talk/media/webrtc/fakewebrtccommon.h
* webrtc/test/fake_common.h

Remaining uses of OVERRIDE was fixed by search+replace.

Manual edits were done to fix virtual destructors that were
overriding inherited ones.

Finally a build error related to the pure virtual definitions of
Read, Write and Rewind in common_types.h required a bit of
refactoring in:
* webrtc/common_types.cc
* webrtc/common_types.h
* webrtc/system_wrappers/interface/file_wrapper.h
* webrtc/system_wrappers/source/file_impl.cc

This roll should make it possible for us to finally re-enable deadlock
detection for TSan on the buildbots.

BUG=4106
R=pbos@webrtc.org, tommi@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#8596}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8596 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org
2015-03-04 12:58:35 +00:00
parent 792f1a14e2
commit 14665ff7d4
286 changed files with 3546 additions and 3920 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
webrtc/modules/bitrate_controller/bitrate_controller_impl.h
View File

@ -32,23 +32,23 @@ class BitrateControllerImpl : public BitrateController {
BitrateControllerImpl(Clock* clock, BitrateObserver* observer);
virtual ~BitrateControllerImpl();
virtual bool AvailableBandwidth(uint32_t* bandwidth) const override;
bool AvailableBandwidth(uint32_t* bandwidth) const override;
virtual RtcpBandwidthObserver* CreateRtcpBandwidthObserver() override;
RtcpBandwidthObserver* CreateRtcpBandwidthObserver() override;
virtual void SetStartBitrate(int start_bitrate_bps) override;
virtual void SetMinMaxBitrate(int min_bitrate_bps,
void SetStartBitrate(int start_bitrate_bps) override;
void SetMinMaxBitrate(int min_bitrate_bps,
int max_bitrate_bps) override;
virtual void SetReservedBitrate(uint32_t reserved_bitrate_bps) override;
void SetReservedBitrate(uint32_t reserved_bitrate_bps) override;
virtual int64_t TimeUntilNextProcess() override;
virtual int32_t Process() override;
int64_t TimeUntilNextProcess() override;
int32_t Process() override;
// Current bitrate actually being sent.
virtual void SetBitrateSent(uint32_t bitrate_sent_bps) override;
void SetBitrateSent(uint32_t bitrate_sent_bps) override;
virtual void SetCodecMode(webrtc::VideoCodecMode mode) override;
void SetCodecMode(webrtc::VideoCodecMode mode) override;
private:
class RtcpBandwidthObserverImpl;