OLD | NEW |
---|---|
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2004 Google Inc. | 3 * Copyright 2004 Google Inc. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
(...skipping 2164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2175 EXPECT_TRUE(new_stream->IsSending()) | 2175 EXPECT_TRUE(new_stream->IsSending()) |
2176 << "Send stream created after SetSend(true) not sending initially."; | 2176 << "Send stream created after SetSend(true) not sending initially."; |
2177 } | 2177 } |
2178 | 2178 |
2179 // This test verifies DSCP settings are properly applied on video media channel. | 2179 // This test verifies DSCP settings are properly applied on video media channel. |
2180 TEST_F(WebRtcVideoChannel2Test, TestSetDscpOptions) { | 2180 TEST_F(WebRtcVideoChannel2Test, TestSetDscpOptions) { |
2181 rtc::scoped_ptr<cricket::FakeNetworkInterface> network_interface( | 2181 rtc::scoped_ptr<cricket::FakeNetworkInterface> network_interface( |
2182 new cricket::FakeNetworkInterface); | 2182 new cricket::FakeNetworkInterface); |
2183 channel_->SetInterface(network_interface.get()); | 2183 channel_->SetInterface(network_interface.get()); |
2184 cricket::VideoOptions options; | 2184 cricket::VideoOptions options; |
2185 EXPECT_TRUE(channel_->SetOptions(options)); | |
2186 EXPECT_EQ(rtc::DSCP_DEFAULT, network_interface->dscp()); | |
pbos-webrtc
2015/07/14 03:58:33
Keep this line, we should be doing DSCP_DEFAULT by
pthatcher1
2015/07/16 07:41:35
Arguably, DSCP_NO_CHANGE is correct. It means the
| |
2185 options.dscp.Set(true); | 2187 options.dscp.Set(true); |
2186 EXPECT_TRUE(channel_->SetOptions(options)); | 2188 EXPECT_TRUE(channel_->SetOptions(options)); |
2187 EXPECT_EQ(rtc::DSCP_AF41, network_interface->dscp()); | 2189 EXPECT_EQ(rtc::DSCP_AF41, network_interface->dscp()); |
2188 // Verify previous value is not modified if dscp option is not set. | 2190 // Verify previous value is not modified if dscp option is not set. |
2189 cricket::VideoOptions options1; | 2191 cricket::VideoOptions options1; |
2190 EXPECT_TRUE(channel_->SetOptions(options1)); | 2192 EXPECT_TRUE(channel_->SetOptions(options1)); |
2191 EXPECT_EQ(rtc::DSCP_AF41, network_interface->dscp()); | 2193 EXPECT_EQ(rtc::DSCP_AF41, network_interface->dscp()); |
2192 options.dscp.Set(false); | 2194 options.dscp.Set(false); |
2193 EXPECT_TRUE(channel_->SetOptions(options)); | 2195 EXPECT_TRUE(channel_->SetOptions(options)); |
2194 EXPECT_EQ(rtc::DSCP_DEFAULT, network_interface->dscp()); | 2196 EXPECT_EQ(rtc::DSCP_DEFAULT, network_interface->dscp()); |
(...skipping 887 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3082 // Ensures that the correct settings are applied to the codec when two temporal | 3084 // Ensures that the correct settings are applied to the codec when two temporal |
3083 // layer screencasting is enabled, and that the correct simulcast settings are | 3085 // layer screencasting is enabled, and that the correct simulcast settings are |
3084 // reapplied when disabling screencasting. | 3086 // reapplied when disabling screencasting. |
3085 TEST_F(WebRtcVideoChannel2SimulcastTest, | 3087 TEST_F(WebRtcVideoChannel2SimulcastTest, |
3086 DISABLED_TwoTemporalLayerScreencastSettings) { | 3088 DISABLED_TwoTemporalLayerScreencastSettings) { |
3087 // TODO(pbos): Implement. | 3089 // TODO(pbos): Implement. |
3088 FAIL() << "Not implemented."; | 3090 FAIL() << "Not implemented."; |
3089 } | 3091 } |
3090 | 3092 |
3091 } // namespace cricket | 3093 } // namespace cricket |
OLD | NEW |