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

40
webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.h
View File

@ -34,38 +34,36 @@ class RtpReceiverImpl : public RtpReceiver {
virtual ~RtpReceiverImpl();
virtual int32_t RegisterReceivePayload(
const char payload_name[RTP_PAYLOAD_NAME_SIZE],
const int8_t payload_type,
const uint32_t frequency,
const uint8_t channels,
const uint32_t rate) OVERRIDE;
int32_t RegisterReceivePayload(const char payload_name[RTP_PAYLOAD_NAME_SIZE],
const int8_t payload_type,
const uint32_t frequency,
const uint8_t channels,
const uint32_t rate) override;
virtual int32_t DeRegisterReceivePayload(const int8_t payload_type) OVERRIDE;
int32_t DeRegisterReceivePayload(const int8_t payload_type) override;
virtual bool IncomingRtpPacket(
const RTPHeader& rtp_header,
const uint8_t* payload,
size_t payload_length,
PayloadUnion payload_specific,
bool in_order) OVERRIDE;
bool IncomingRtpPacket(const RTPHeader& rtp_header,
const uint8_t* payload,
size_t payload_length,
PayloadUnion payload_specific,
bool in_order) override;
virtual NACKMethod NACK() const OVERRIDE;
NACKMethod NACK() const override;
// Turn negative acknowledgement requests on/off.
virtual void SetNACKStatus(const NACKMethod method) OVERRIDE;
void SetNACKStatus(const NACKMethod method) override;
// Returns the last received timestamp.
virtual bool Timestamp(uint32_t* timestamp) const OVERRIDE;
virtual bool LastReceivedTimeMs(int64_t* receive_time_ms) const OVERRIDE;
bool Timestamp(uint32_t* timestamp) const override;
bool LastReceivedTimeMs(int64_t* receive_time_ms) const override;
virtual uint32_t SSRC() const OVERRIDE;
uint32_t SSRC() const override;
virtual int32_t CSRCs(uint32_t array_of_csrc[kRtpCsrcSize]) const OVERRIDE;
int32_t CSRCs(uint32_t array_of_csrc[kRtpCsrcSize]) const override;
virtual int32_t Energy(uint8_t array_of_energy[kRtpCsrcSize]) const OVERRIDE;
int32_t Energy(uint8_t array_of_energy[kRtpCsrcSize]) const override;
virtual TelephoneEventHandler* GetTelephoneEventHandler() OVERRIDE;
TelephoneEventHandler* GetTelephoneEventHandler() override;
private:
bool HaveReceivedFrame() const;