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

Enable send-side BWE by default.

Browse Source 
BUG=webrtc:4173
R=mflodman@webrtc.org

Review URL: https://codereview.webrtc.org/2300003002 .

Cr-Commit-Position: refs/heads/master@{#14041}
This commit is contained in:
Stefan Holmer
2016-09-02 12:36:49 +02:00
parent 3d21e23df2
commit 06a5e1aa39
3 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/media/engine/webrtcvideoengine2.cc
View File

@ -580,11 +580,9 @@ RtpCapabilities WebRtcVideoEngine2::GetCapabilities() const {
capabilities.header_extensions.push_back( capabilities.header_extensions.push_back(
webrtc::RtpExtension(webrtc::RtpExtension::kVideoRotationUri, webrtc::RtpExtension(webrtc::RtpExtension::kVideoRotationUri,
webrtc::RtpExtension::kVideoRotationDefaultId)); webrtc::RtpExtension::kVideoRotationDefaultId));
if (webrtc::field_trial::FindFullName("WebRTC-SendSideBwe") == "Enabled") { capabilities.header_extensions.push_back(webrtc::RtpExtension(
capabilities.header_extensions.push_back(webrtc::RtpExtension( webrtc::RtpExtension::kTransportSequenceNumberUri,
webrtc::RtpExtension::kTransportSequenceNumberUri, webrtc::RtpExtension::kTransportSequenceNumberDefaultId));
webrtc::RtpExtension::kTransportSequenceNumberDefaultId));
}
capabilities.header_extensions.push_back( capabilities.header_extensions.push_back(
webrtc::RtpExtension(webrtc::RtpExtension::kPlayoutDelayUri, webrtc::RtpExtension(webrtc::RtpExtension::kPlayoutDelayUri,
webrtc::RtpExtension::kPlayoutDelayDefaultId)); webrtc::RtpExtension::kPlayoutDelayDefaultId));

21
webrtc/media/engine/webrtcvideoengine2_unittest.cc
View File

@ -200,14 +200,7 @@ TEST_F(WebRtcVideoEngine2Test, SupportsAbsoluteSenderTimeHeaderExtension) {
FAIL() << "Absolute Sender Time extension not in header-extension list."; FAIL() << "Absolute Sender Time extension not in header-extension list.";
} }
class WebRtcVideoEngine2WithSendSideBweTest : public WebRtcVideoEngine2Test { TEST_F(WebRtcVideoEngine2Test, SupportsTransportSequenceNumberHeaderExtension) {
public:
WebRtcVideoEngine2WithSendSideBweTest()
: WebRtcVideoEngine2Test("WebRTC-SendSideBwe/Enabled/") {}
};
TEST_F(WebRtcVideoEngine2WithSendSideBweTest,
SupportsTransportSequenceNumberHeaderExtension) {
RtpCapabilities capabilities = engine_.GetCapabilities(); RtpCapabilities capabilities = engine_.GetCapabilities();
ASSERT_FALSE(capabilities.header_extensions.empty()); ASSERT_FALSE(capabilities.header_extensions.empty());
for (const RtpExtension& extension : capabilities.header_extensions) { for (const RtpExtension& extension : capabilities.header_extensions) {
@ -1293,19 +1286,11 @@ TEST_F(WebRtcVideoChannel2Test, FiltersExtensionsPicksAbsSendTime) {
TestExtensionFilter(extensions, RtpExtension::kAbsSendTimeUri); TestExtensionFilter(extensions, RtpExtension::kAbsSendTimeUri);
} }
class WebRtcVideoChannel2WithSendSideBweTest : public WebRtcVideoChannel2Test {
public:
WebRtcVideoChannel2WithSendSideBweTest()
: WebRtcVideoChannel2Test("WebRTC-SendSideBwe/Enabled/") {}
};
// Test support for transport sequence number header extension. // Test support for transport sequence number header extension.
TEST_F(WebRtcVideoChannel2WithSendSideBweTest, TEST_F(WebRtcVideoChannel2Test, SendTransportSequenceNumberHeaderExtensions) {
SendTransportSequenceNumberHeaderExtensions) {
TestSetSendRtpHeaderExtensions(RtpExtension::kTransportSequenceNumberUri); TestSetSendRtpHeaderExtensions(RtpExtension::kTransportSequenceNumberUri);
} }
TEST_F(WebRtcVideoChannel2WithSendSideBweTest, TEST_F(WebRtcVideoChannel2Test, RecvTransportSequenceNumberHeaderExtensions) {
RecvTransportSequenceNumberHeaderExtensions) {
TestSetRecvRtpHeaderExtensions(RtpExtension::kTransportSequenceNumberUri); TestSetRecvRtpHeaderExtensions(RtpExtension::kTransportSequenceNumberUri);
} }

5
webrtc/sdk/objc/Framework/Classes/RTCFieldTrials.mm
View File

@ -16,15 +16,10 @@
#include "webrtc/system_wrappers/include/field_trial_default.h" #include "webrtc/system_wrappers/include/field_trial_default.h"
static NSString * const kRTCEnableSendSideBweString =
@"WebRTC-SendSideBwe/Enabled/";
static std::unique_ptr<char[]> gFieldTrialInitString; static std::unique_ptr<char[]> gFieldTrialInitString;
void RTCInitFieldTrials(RTCFieldTrialOptions options) { void RTCInitFieldTrials(RTCFieldTrialOptions options) {
NSMutableString *fieldTrialInitString = [NSMutableString string]; NSMutableString *fieldTrialInitString = [NSMutableString string];
if (options & RTCFieldTrialOptionsSendSideBwe) {
[fieldTrialInitString appendString:kRTCEnableSendSideBweString];
}
size_t len = fieldTrialInitString.length + 1; size_t len = fieldTrialInitString.length + 1;
gFieldTrialInitString.reset(new char[len]); gFieldTrialInitString.reset(new char[len]);
if (![fieldTrialInitString getCString:gFieldTrialInitString.get() if (![fieldTrialInitString getCString:gFieldTrialInitString.get()