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

Revert "Enable CVO by default through webrtc pipeline."

Browse Source 
This reverts commit 1b1c15cad16de57053bb6aa8a916079e0534bdae.

Due to failure on
http://build.chromium.org/p/client.webrtc/builders/Linux64%20Release%20%5Blarge%20tests%5D/builds/4092
and following builds (the test hangs and never finishes).
R=kjellander@webrtc.org
TBR=guoweis@chromium.org
TESTED=Local revert + execution of libjingle_peerconnection_java_unittest show that this is the culprit.

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

Cr-Commit-Position: refs/heads/master@{#8911}
This commit is contained in:
Minyue
2015-04-01 16:19:58 +02:00
parent d91cb5d5fb
commit 31331cfd2d
21 changed files with 83 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
webrtc/modules/rtp_rtcp/source/rtp_header_extension.h
View File

@ -29,16 +29,8 @@ const size_t kTransportSequenceNumberLength = 3;
struct HeaderExtension {
HeaderExtension(RTPExtensionType extension_type)
: type(extension_type), length(0), active(true) {
Init();
}
HeaderExtension(RTPExtensionType extension_type, bool active)
: type(extension_type), length(0), active(active) {
Init();
}
void Init() {
: type(extension_type),
length(0) {
// TODO(solenberg): Create handler classes for header extensions so we can
// get rid of switches like these as well as handling code spread out all
// over.
@ -65,7 +57,6 @@ struct HeaderExtension {
const RTPExtensionType type;
uint8_t length;
bool active;
};
class RtpHeaderExtensionMap {
@ -77,13 +68,6 @@ class RtpHeaderExtensionMap {
int32_t Register(const RTPExtensionType type, const uint8_t id);
// Active is a concept for a registered rtp header extension which doesn't
// take effect yet until being activated. Inactive RTP header extensions do
// not take effect and should not be included in size calculations until they
// are activated.
int32_t RegisterInactive(const RTPExtensionType type, const uint8_t id);
bool SetActive(const RTPExtensionType type, bool active);
int32_t Deregister(const RTPExtensionType type);
bool IsRegistered(RTPExtensionType type) const;
@ -92,10 +76,6 @@ class RtpHeaderExtensionMap {
int32_t GetId(const RTPExtensionType type, uint8_t* id) const;
//
// Methods below ignore any inactive rtp header extensions.
//
size_t GetTotalLengthInBytes() const;
int32_t GetLengthUntilBlockStartInBytes(const RTPExtensionType type) const;
@ -109,7 +89,6 @@ class RtpHeaderExtensionMap {
RTPExtensionType Next(RTPExtensionType type) const;
private:
int32_t Register(const RTPExtensionType type, const uint8_t id, bool active);
std::map<uint8_t, HeaderExtension*> extensionMap_;
};
}