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

80
webrtc/modules/rtp_rtcp/source/rtcp_packet.h
View File

@ -90,8 +90,9 @@ class Empty : public RtcpPacket {
virtual ~Empty() {}
protected:
virtual void Create(
uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE;
void Create(uint8_t* packet,
size_t* length,
size_t max_length) const override;
private:
DISALLOW_COPY_AND_ASSIGN(Empty);
@ -204,8 +205,9 @@ class SenderReport : public RtcpPacket {
void WithReportBlock(ReportBlock* block);
protected:
virtual void Create(
uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE;
void Create(uint8_t* packet,
size_t* length,
size_t max_length) const override;
private:
enum { kMaxNumberOfReportBlocks = 0x1f };
@ -250,8 +252,9 @@ class ReceiverReport : public RtcpPacket {
void WithReportBlock(ReportBlock* block);
protected:
virtual void Create(
uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE;
void Create(uint8_t* packet,
size_t* length,
size_t max_length) const override;
private:
enum { kMaxNumberOfReportBlocks = 0x1f };
@ -295,8 +298,9 @@ class Ij : public RtcpPacket {
void WithJitterItem(uint32_t jitter);
protected:
virtual void Create(
uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE;
void Create(uint8_t* packet,
size_t* length,
size_t max_length) const override;
private:
enum { kMaxNumberOfIjItems = 0x1f };
@ -351,8 +355,9 @@ class Sdes : public RtcpPacket {
};
protected:
virtual void Create(
uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE;
void Create(uint8_t* packet,
size_t* length,
size_t max_length) const override;
private:
enum { kMaxNumberOfChunks = 0x1f };
@ -392,8 +397,9 @@ class Bye : public RtcpPacket {
void WithCsrc(uint32_t csrc);
protected:
virtual void Create(
uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE;
void Create(uint8_t* packet,
size_t* length,
size_t max_length) const override;
private:
enum { kMaxNumberOfCsrcs = 0x1f - 1 };
@ -452,8 +458,9 @@ class App : public RtcpPacket {
}
protected:
virtual void Create(
uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE;
void Create(uint8_t* packet,
size_t* length,
size_t max_length) const override;
private:
size_t BlockLength() const {
@ -502,8 +509,9 @@ class Pli : public RtcpPacket {
}
protected:
virtual void Create(
uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE;
void Create(uint8_t* packet,
size_t* length,
size_t max_length) const override;
private:
size_t BlockLength() const {
@ -553,8 +561,9 @@ class Sli : public RtcpPacket {
}
protected:
virtual void Create(
uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE;
void Create(uint8_t* packet,
size_t* length,
size_t max_length) const override;
private:
size_t BlockLength() const {
@ -594,8 +603,9 @@ class Nack : public RtcpPacket {
void WithList(const uint16_t* nack_list, int length);
protected:
virtual void Create(
uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE;
void Create(uint8_t* packet,
size_t* length,
size_t max_length) const override;
private:
size_t BlockLength() const {
@ -644,8 +654,9 @@ class Rpsi : public RtcpPacket {
void WithPictureId(uint64_t picture_id);
protected:
virtual void Create(
uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE;
void Create(uint8_t* packet,
size_t* length,
size_t max_length) const override;
private:
size_t BlockLength() const {
@ -691,8 +702,9 @@ class Fir : public RtcpPacket {
}
protected:
virtual void Create(
uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE;
void Create(uint8_t* packet,
size_t* length,
size_t max_length) const override;
private:
size_t BlockLength() const {
@ -740,8 +752,9 @@ class Tmmbr : public RtcpPacket {
}
protected:
virtual void Create(
uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE;
void Create(uint8_t* packet,
size_t* length,
size_t max_length) const override;
private:
size_t BlockLength() const {
@ -781,8 +794,9 @@ class Tmmbn : public RtcpPacket {
void WithTmmbr(uint32_t ssrc, uint32_t bitrate_kbps, uint16_t overhead);
protected:
virtual void Create(
uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE;
void Create(uint8_t* packet,
size_t* length,
size_t max_length) const override;
private:
enum { kMaxNumberOfTmmbrs = 50 };
@ -836,8 +850,9 @@ class Remb : public RtcpPacket {
}
protected:
virtual void Create(
uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE;
void Create(uint8_t* packet,
size_t* length,
size_t max_length) const override;
private:
enum { kMaxNumberOfSsrcs = 0xff };
@ -883,8 +898,9 @@ class Xr : public RtcpPacket {
void WithVoipMetric(VoipMetric* voip_metric);
protected:
virtual void Create(
uint8_t* packet, size_t* length, size_t max_length) const OVERRIDE;
void Create(uint8_t* packet,
size_t* length,
size_t max_length) const override;
private:
enum { kMaxNumberOfRrtrBlocks = 50 };