generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Wire up DSCP support in WebRtcVideoEngine2.

Browse Source 
R=stefan@webrtc.org
BUG=1788

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7669 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2014-11-10 14:41:43 +00:00
parent 83d4804a50
commit d819803d45
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
talk/media/webrtc/webrtcvideoengine2.cc
View File

@ -747,6 +747,7 @@ WebRtcVideoChannel2::WebRtcVideoChannel2(
void WebRtcVideoChannel2::SetDefaultOptions() { void WebRtcVideoChannel2::SetDefaultOptions() {
options_.cpu_overuse_detection.Set(false); options_.cpu_overuse_detection.Set(false);
options_.dscp.Set(false);
options_.suspend_below_min_bitrate.Set(false); options_.suspend_below_min_bitrate.Set(false);
options_.use_payload_padding.Set(false); options_.use_payload_padding.Set(false);
options_.video_noise_reduction.Set(true); options_.video_noise_reduction.Set(true);
@ -1319,6 +1320,10 @@ bool WebRtcVideoChannel2::SetOptions(const VideoOptions& options) {
// No new options to set. // No new options to set.
return true; return true;
} }
rtc::DiffServCodePoint dscp = options_.dscp.GetWithDefaultIfUnset(false)
? rtc::DSCP_AF41
: rtc::DSCP_DEFAULT;
MediaChannel::SetDscp(dscp);
rtc::CritScope stream_lock(&stream_crit_); rtc::CritScope stream_lock(&stream_crit_);
for (std::map<uint32, WebRtcVideoSendStream*>::iterator it = for (std::map<uint32, WebRtcVideoSendStream*>::iterator it =
send_streams_.begin(); send_streams_.begin();

27
talk/media/webrtc/webrtcvideoengine2_unittest.cc
View File

@ -1698,10 +1698,6 @@ TEST_F(WebRtcVideoChannel2Test, SetSendCodecsAcceptAllValidPayloadTypes) {
} }
} }
TEST_F(WebRtcVideoChannel2Test, DISABLED_ResetVieSendCodecOnNewFrameSize) {
FAIL() << "Not implemented."; // TODO(pbos): Implement.
}
TEST_F(WebRtcVideoChannel2Test, SetRecvCodecsWithOnlyVp8) { TEST_F(WebRtcVideoChannel2Test, SetRecvCodecsWithOnlyVp8) {
std::vector<cricket::VideoCodec> codecs; std::vector<cricket::VideoCodec> codecs;
codecs.push_back(kVp8Codec); codecs.push_back(kVp8Codec);
@ -1850,12 +1846,23 @@ TEST_F(WebRtcVideoChannel2Test, SetSend) {
<< "Send stream created after SetSend(true) not sending initially."; << "Send stream created after SetSend(true) not sending initially.";
} }
TEST_F(WebRtcVideoChannel2Test, DISABLED_TestSetDscpOptions) { // This test verifies DSCP settings are properly applied on video media channel.
FAIL() << "Not implemented."; // TODO(pbos): Implement. TEST_F(WebRtcVideoChannel2Test, TestSetDscpOptions) {
} rtc::scoped_ptr<cricket::FakeNetworkInterface> network_interface(
new cricket::FakeNetworkInterface);
TEST_F(WebRtcVideoChannel2Test, DISABLED_SetOptionsWithMaxBitrate) { channel_->SetInterface(network_interface.get());
FAIL() << "Not implemented."; // TODO(pbos): Implement. cricket::VideoOptions options;
options.dscp.Set(true);
EXPECT_TRUE(channel_->SetOptions(options));
EXPECT_EQ(rtc::DSCP_AF41, network_interface->dscp());
// Verify previous value is not modified if dscp option is not set.
cricket::VideoOptions options1;
EXPECT_TRUE(channel_->SetOptions(options1));
EXPECT_EQ(rtc::DSCP_AF41, network_interface->dscp());
options.dscp.Set(false);
EXPECT_TRUE(channel_->SetOptions(options));
EXPECT_EQ(rtc::DSCP_DEFAULT, network_interface->dscp());
channel_->SetInterface(NULL);
} }
TEST_F(WebRtcVideoChannel2Test, OnReadyToSendSignalsNetworkState) { TEST_F(WebRtcVideoChannel2Test, OnReadyToSendSignalsNetworkState) {