OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 1649 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1660 EXPECT_TRUE(answer->Initialize(sdp, NULL)); | 1660 EXPECT_TRUE(answer->Initialize(sdp, NULL)); |
1661 cricket::ContentInfo* data_info = | 1661 cricket::ContentInfo* data_info = |
1662 answer->description()->GetContentByName("data"); | 1662 answer->description()->GetContentByName("data"); |
1663 data_info->rejected = true; | 1663 data_info->rejected = true; |
1664 | 1664 |
1665 DoSetRemoteDescription(answer); | 1665 DoSetRemoteDescription(answer); |
1666 EXPECT_EQ(DataChannelInterface::kClosed, offer_channel->state()); | 1666 EXPECT_EQ(DataChannelInterface::kClosed, offer_channel->state()); |
1667 } | 1667 } |
1668 | 1668 |
1669 // Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659 | 1669 // Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659 |
1670 #if defined(WIN) && defined(_DEBUG) | 1670 #if defined(WIN) && !defined(NDEBUG) |
1671 #define MAYBE_ReceiveFireFoxOffer DISABLED_ReceiveFireFoxOffer | 1671 #define MAYBE_ReceiveFireFoxOffer DISABLED_ReceiveFireFoxOffer |
1672 #else | 1672 #else |
1673 #define MAYBE_ReceiveFireFoxOffer ReceiveFireFoxOffer | 1673 #define MAYBE_ReceiveFireFoxOffer ReceiveFireFoxOffer |
1674 #endif | 1674 #endif |
1675 // Test that we can create a session description from an SDP string from | 1675 // Test that we can create a session description from an SDP string from |
1676 // FireFox, use it as a remote session description, generate an answer and use | 1676 // FireFox, use it as a remote session description, generate an answer and use |
1677 // the answer as a local description. | 1677 // the answer as a local description. |
1678 TEST_F(PeerConnectionInterfaceTest, MAYBE_ReceiveFireFoxOffer) { | 1678 TEST_F(PeerConnectionInterfaceTest, MAYBE_ReceiveFireFoxOffer) { |
1679 MAYBE_SKIP_TEST(rtc::SSLStreamAdapter::HaveDtlsSrtp); | 1679 MAYBE_SKIP_TEST(rtc::SSLStreamAdapter::HaveDtlsSrtp); |
1680 FakeConstraints constraints; | 1680 FakeConstraints constraints; |
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2033 | 2033 |
2034 std::string recvonly_offer = kSdpStringWithStream1; | 2034 std::string recvonly_offer = kSdpStringWithStream1; |
2035 rtc::replace_substrs(kSendrecv, strlen(kSendrecv), kRecvonly, | 2035 rtc::replace_substrs(kSendrecv, strlen(kSendrecv), kRecvonly, |
2036 strlen(kRecvonly), &recvonly_offer); | 2036 strlen(kRecvonly), &recvonly_offer); |
2037 CreateAndSetRemoteOffer(recvonly_offer); | 2037 CreateAndSetRemoteOffer(recvonly_offer); |
2038 | 2038 |
2039 EXPECT_EQ(0u, observer_.remote_streams()->count()); | 2039 EXPECT_EQ(0u, observer_.remote_streams()->count()); |
2040 } | 2040 } |
2041 | 2041 |
2042 // Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659 | 2042 // Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659 |
2043 #if defined(WIN) && defined(_DEBUG) | 2043 #if defined(WIN) && !defined(NDEBUG) |
2044 #define MAYBE_SdpWithoutMsidCreatesDefaultStream \ | 2044 #define MAYBE_SdpWithoutMsidCreatesDefaultStream \ |
2045 DISABLED_SdpWithoutMsidCreatesDefaultStream | 2045 DISABLED_SdpWithoutMsidCreatesDefaultStream |
2046 #else | 2046 #else |
2047 #define MAYBE_SdpWithoutMsidCreatesDefaultStream \ | 2047 #define MAYBE_SdpWithoutMsidCreatesDefaultStream \ |
2048 SdpWithoutMsidCreatesDefaultStream | 2048 SdpWithoutMsidCreatesDefaultStream |
2049 #endif | 2049 #endif |
2050 // This tests that a default MediaStream is created if a remote session | 2050 // This tests that a default MediaStream is created if a remote session |
2051 // description doesn't contain any streams and no MSID support. | 2051 // description doesn't contain any streams and no MSID support. |
2052 // It also tests that the default stream is updated if a video m-line is added | 2052 // It also tests that the default stream is updated if a video m-line is added |
2053 // in a subsequent session description. | 2053 // in a subsequent session description. |
2054 TEST_F(PeerConnectionInterfaceTest, SdpWithoutMsidCreatesDefaultStream) { | 2054 TEST_F(PeerConnectionInterfaceTest, MAYBE_SdpWithoutMsidCreatesDefaultStream) { |
2055 FakeConstraints constraints; | 2055 FakeConstraints constraints; |
2056 constraints.AddMandatory(webrtc::MediaConstraintsInterface::kEnableDtlsSrtp, | 2056 constraints.AddMandatory(webrtc::MediaConstraintsInterface::kEnableDtlsSrtp, |
2057 true); | 2057 true); |
2058 CreatePeerConnection(&constraints); | 2058 CreatePeerConnection(&constraints); |
2059 CreateAndSetRemoteOffer(kSdpStringWithoutStreamsAudioOnly); | 2059 CreateAndSetRemoteOffer(kSdpStringWithoutStreamsAudioOnly); |
2060 | 2060 |
2061 ASSERT_EQ(1u, observer_.remote_streams()->count()); | 2061 ASSERT_EQ(1u, observer_.remote_streams()->count()); |
2062 MediaStreamInterface* remote_stream = observer_.remote_streams()->at(0); | 2062 MediaStreamInterface* remote_stream = observer_.remote_streams()->at(0); |
2063 | 2063 |
2064 EXPECT_EQ(1u, remote_stream->GetAudioTracks().size()); | 2064 EXPECT_EQ(1u, remote_stream->GetAudioTracks().size()); |
2065 EXPECT_EQ(0u, remote_stream->GetVideoTracks().size()); | 2065 EXPECT_EQ(0u, remote_stream->GetVideoTracks().size()); |
2066 EXPECT_EQ("default", remote_stream->label()); | 2066 EXPECT_EQ("default", remote_stream->label()); |
2067 | 2067 |
2068 CreateAndSetRemoteOffer(kSdpStringWithoutStreams); | 2068 CreateAndSetRemoteOffer(kSdpStringWithoutStreams); |
2069 ASSERT_EQ(1u, observer_.remote_streams()->count()); | 2069 ASSERT_EQ(1u, observer_.remote_streams()->count()); |
2070 ASSERT_EQ(1u, remote_stream->GetAudioTracks().size()); | 2070 ASSERT_EQ(1u, remote_stream->GetAudioTracks().size()); |
2071 EXPECT_EQ("defaulta0", remote_stream->GetAudioTracks()[0]->id()); | 2071 EXPECT_EQ("defaulta0", remote_stream->GetAudioTracks()[0]->id()); |
2072 EXPECT_EQ(MediaStreamTrackInterface::kLive, | 2072 EXPECT_EQ(MediaStreamTrackInterface::kLive, |
2073 remote_stream->GetAudioTracks()[0]->state()); | 2073 remote_stream->GetAudioTracks()[0]->state()); |
2074 ASSERT_EQ(1u, remote_stream->GetVideoTracks().size()); | 2074 ASSERT_EQ(1u, remote_stream->GetVideoTracks().size()); |
2075 EXPECT_EQ("defaultv0", remote_stream->GetVideoTracks()[0]->id()); | 2075 EXPECT_EQ("defaultv0", remote_stream->GetVideoTracks()[0]->id()); |
2076 EXPECT_EQ(MediaStreamTrackInterface::kLive, | 2076 EXPECT_EQ(MediaStreamTrackInterface::kLive, |
2077 remote_stream->GetVideoTracks()[0]->state()); | 2077 remote_stream->GetVideoTracks()[0]->state()); |
2078 } | 2078 } |
2079 | 2079 |
2080 // Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659 | 2080 // Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659 |
2081 #if defined(WIN) && defined(_DEBUG) | 2081 #if defined(WIN) && !defined(NDEBUG) |
2082 #define MAYBE_SendOnlySdpWithoutMsidCreatesDefaultStream \ | 2082 #define MAYBE_SendOnlySdpWithoutMsidCreatesDefaultStream \ |
2083 DISABLED_SendOnlySdpWithoutMsidCreatesDefaultStream | 2083 DISABLED_SendOnlySdpWithoutMsidCreatesDefaultStream |
2084 #else | 2084 #else |
2085 #define MAYBE_SendOnlySdpWithoutMsidCreatesDefaultStream \ | 2085 #define MAYBE_SendOnlySdpWithoutMsidCreatesDefaultStream \ |
2086 SendOnlySdpWithoutMsidCreatesDefaultStream | 2086 SendOnlySdpWithoutMsidCreatesDefaultStream |
2087 #endif | 2087 #endif |
2088 // This tests that a default MediaStream is created if a remote session | 2088 // This tests that a default MediaStream is created if a remote session |
2089 // description doesn't contain any streams and media direction is send only. | 2089 // description doesn't contain any streams and media direction is send only. |
2090 TEST_F(PeerConnectionInterfaceTest, | 2090 TEST_F(PeerConnectionInterfaceTest, |
2091 MAYBE_SendOnlySdpWithoutMsidCreatesDefaultStream) { | 2091 MAYBE_SendOnlySdpWithoutMsidCreatesDefaultStream) { |
(...skipping 22 matching lines...) Expand all Loading... |
2114 MediaStreamInterface* remote_stream = observer_.remote_streams()->at(0); | 2114 MediaStreamInterface* remote_stream = observer_.remote_streams()->at(0); |
2115 remote_stream->RemoveTrack(remote_stream->GetAudioTracks()[0]); | 2115 remote_stream->RemoveTrack(remote_stream->GetAudioTracks()[0]); |
2116 remote_stream->RemoveTrack(remote_stream->GetVideoTracks()[0]); | 2116 remote_stream->RemoveTrack(remote_stream->GetVideoTracks()[0]); |
2117 | 2117 |
2118 CreateAndSetRemoteOffer(kSdpStringWithoutStreams); | 2118 CreateAndSetRemoteOffer(kSdpStringWithoutStreams); |
2119 | 2119 |
2120 // No crash is a pass. | 2120 // No crash is a pass. |
2121 } | 2121 } |
2122 | 2122 |
2123 // Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659 | 2123 // Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659 |
2124 #if defined(WIN) && defined(_DEBUG) | 2124 #if defined(WIN) && !defined(NDEBUG) |
2125 #define MAYBE_SdpWithoutMsidAndStreamsCreatesDefaultStream \ | 2125 #define MAYBE_SdpWithoutMsidAndStreamsCreatesDefaultStream \ |
2126 DISABLED_SdpWithoutMsidAndStreamsCreatesDefaultStream | 2126 DISABLED_SdpWithoutMsidAndStreamsCreatesDefaultStream |
2127 #else | 2127 #else |
2128 #define MAYBE_SdpWithoutMsidAndStreamsCreatesDefaultStream \ | 2128 #define MAYBE_SdpWithoutMsidAndStreamsCreatesDefaultStream \ |
2129 SdpWithoutMsidAndStreamsCreatesDefaultStream | 2129 SdpWithoutMsidAndStreamsCreatesDefaultStream |
2130 #endif | 2130 #endif |
2131 // This tests that a default MediaStream is created if the remote session | 2131 // This tests that a default MediaStream is created if the remote session |
2132 // description doesn't contain any streams and don't contain an indication if | 2132 // description doesn't contain any streams and don't contain an indication if |
2133 // MSID is supported. | 2133 // MSID is supported. |
2134 TEST_F(PeerConnectionInterfaceTest, | 2134 TEST_F(PeerConnectionInterfaceTest, |
2135 MAYBE_SdpWithoutMsidAndStreamsCreatesDefaultStream) { | 2135 MAYBE_SdpWithoutMsidAndStreamsCreatesDefaultStream) { |
2136 FakeConstraints constraints; | 2136 FakeConstraints constraints; |
2137 constraints.AddMandatory(webrtc::MediaConstraintsInterface::kEnableDtlsSrtp, | 2137 constraints.AddMandatory(webrtc::MediaConstraintsInterface::kEnableDtlsSrtp, |
2138 true); | 2138 true); |
2139 CreatePeerConnection(&constraints); | 2139 CreatePeerConnection(&constraints); |
2140 CreateAndSetRemoteOffer(kSdpStringWithoutStreams); | 2140 CreateAndSetRemoteOffer(kSdpStringWithoutStreams); |
2141 | 2141 |
2142 ASSERT_EQ(1u, observer_.remote_streams()->count()); | 2142 ASSERT_EQ(1u, observer_.remote_streams()->count()); |
2143 MediaStreamInterface* remote_stream = observer_.remote_streams()->at(0); | 2143 MediaStreamInterface* remote_stream = observer_.remote_streams()->at(0); |
2144 EXPECT_EQ(1u, remote_stream->GetAudioTracks().size()); | 2144 EXPECT_EQ(1u, remote_stream->GetAudioTracks().size()); |
2145 EXPECT_EQ(1u, remote_stream->GetVideoTracks().size()); | 2145 EXPECT_EQ(1u, remote_stream->GetVideoTracks().size()); |
2146 } | 2146 } |
2147 | 2147 |
2148 // Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659 | 2148 // Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659 |
2149 #if defined(WIN) && defined(_DEBUG) | 2149 #if defined(WIN) && !defined(NDEBUG) |
2150 #define MAYBE_SdpWithMsidDontCreatesDefaultStream \ | 2150 #define MAYBE_SdpWithMsidDontCreatesDefaultStream \ |
2151 DISABLED_SdpWithMsidDontCreatesDefaultStream | 2151 DISABLED_SdpWithMsidDontCreatesDefaultStream |
2152 #else | 2152 #else |
2153 #define MAYBE_SdpWithMsidDontCreatesDefaultStream \ | 2153 #define MAYBE_SdpWithMsidDontCreatesDefaultStream \ |
2154 SdpWithMsidDontCreatesDefaultStream | 2154 SdpWithMsidDontCreatesDefaultStream |
2155 #endif | 2155 #endif |
2156 // This tests that a default MediaStream is not created if the remote session | 2156 // This tests that a default MediaStream is not created if the remote session |
2157 // description doesn't contain any streams but does support MSID. | 2157 // description doesn't contain any streams but does support MSID. |
2158 TEST_F(PeerConnectionInterfaceTest, MAYBE_SdpWithMsidDontCreatesDefaultStream) { | 2158 TEST_F(PeerConnectionInterfaceTest, MAYBE_SdpWithMsidDontCreatesDefaultStream) { |
2159 FakeConstraints constraints; | 2159 FakeConstraints constraints; |
2160 constraints.AddMandatory(webrtc::MediaConstraintsInterface::kEnableDtlsSrtp, | 2160 constraints.AddMandatory(webrtc::MediaConstraintsInterface::kEnableDtlsSrtp, |
2161 true); | 2161 true); |
2162 CreatePeerConnection(&constraints); | 2162 CreatePeerConnection(&constraints); |
2163 CreateAndSetRemoteOffer(kSdpStringWithMsidWithoutStreams); | 2163 CreateAndSetRemoteOffer(kSdpStringWithMsidWithoutStreams); |
2164 EXPECT_EQ(0u, observer_.remote_streams()->count()); | 2164 EXPECT_EQ(0u, observer_.remote_streams()->count()); |
2165 } | 2165 } |
2166 | 2166 |
2167 // Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659 | 2167 // Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659 |
2168 #if defined(WIN) && defined(_DEBUG) | 2168 #if defined(WIN) && !defined(NDEBUG) |
2169 #define MAYBE_DefaultTracksNotDestroyedAndRecreated \ | 2169 #define MAYBE_DefaultTracksNotDestroyedAndRecreated \ |
2170 DISABLED_DefaultTracksNotDestroyedAndRecreated | 2170 DISABLED_DefaultTracksNotDestroyedAndRecreated |
2171 #else | 2171 #else |
2172 #define MAYBE_DefaultTracksNotDestroyedAndRecreated \ | 2172 #define MAYBE_DefaultTracksNotDestroyedAndRecreated \ |
2173 DefaultTracksNotDestroyedAndRecreated | 2173 DefaultTracksNotDestroyedAndRecreated |
2174 #endif | 2174 #endif |
2175 // This tests that when setting a new description, the old default tracks are | 2175 // This tests that when setting a new description, the old default tracks are |
2176 // not destroyed and recreated. | 2176 // not destroyed and recreated. |
2177 // See: https://bugs.chromium.org/p/webrtc/issues/detail?id=5250 | 2177 // See: https://bugs.chromium.org/p/webrtc/issues/detail?id=5250 |
2178 TEST_F(PeerConnectionInterfaceTest, DefaultTracksNotDestroyedAndRecreated) { | 2178 TEST_F(PeerConnectionInterfaceTest, |
| 2179 MAYBE_DefaultTracksNotDestroyedAndRecreated) { |
2179 FakeConstraints constraints; | 2180 FakeConstraints constraints; |
2180 constraints.AddMandatory(webrtc::MediaConstraintsInterface::kEnableDtlsSrtp, | 2181 constraints.AddMandatory(webrtc::MediaConstraintsInterface::kEnableDtlsSrtp, |
2181 true); | 2182 true); |
2182 CreatePeerConnection(&constraints); | 2183 CreatePeerConnection(&constraints); |
2183 CreateAndSetRemoteOffer(kSdpStringWithoutStreamsAudioOnly); | 2184 CreateAndSetRemoteOffer(kSdpStringWithoutStreamsAudioOnly); |
2184 | 2185 |
2185 ASSERT_EQ(1u, observer_.remote_streams()->count()); | 2186 ASSERT_EQ(1u, observer_.remote_streams()->count()); |
2186 MediaStreamInterface* remote_stream = observer_.remote_streams()->at(0); | 2187 MediaStreamInterface* remote_stream = observer_.remote_streams()->at(0); |
2187 ASSERT_EQ(1u, remote_stream->GetAudioTracks().size()); | 2188 ASSERT_EQ(1u, remote_stream->GetAudioTracks().size()); |
2188 | 2189 |
(...skipping 15 matching lines...) Expand all Loading... |
2204 CreateAndSetRemoteOffer(kSdpStringWithStream1); | 2205 CreateAndSetRemoteOffer(kSdpStringWithStream1); |
2205 rtc::scoped_refptr<StreamCollection> reference(CreateStreamCollection(1)); | 2206 rtc::scoped_refptr<StreamCollection> reference(CreateStreamCollection(1)); |
2206 EXPECT_TRUE( | 2207 EXPECT_TRUE( |
2207 CompareStreamCollections(observer_.remote_streams(), reference.get())); | 2208 CompareStreamCollections(observer_.remote_streams(), reference.get())); |
2208 | 2209 |
2209 CreateAndSetRemoteOffer(kSdpStringWithoutStreams); | 2210 CreateAndSetRemoteOffer(kSdpStringWithoutStreams); |
2210 EXPECT_EQ(0u, observer_.remote_streams()->count()); | 2211 EXPECT_EQ(0u, observer_.remote_streams()->count()); |
2211 } | 2212 } |
2212 | 2213 |
2213 // Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659 | 2214 // Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659 |
2214 #if defined(WIN) && defined(_DEBUG) | 2215 #if defined(WIN) && !defined(NDEBUG) |
2215 #define MAYBE_LocalDescriptionChanged DISABLED_LocalDescriptionChanged | 2216 #define MAYBE_LocalDescriptionChanged DISABLED_LocalDescriptionChanged |
2216 #else | 2217 #else |
2217 #define MAYBE_LocalDescriptionChanged LocalDescriptionChanged | 2218 #define MAYBE_LocalDescriptionChanged LocalDescriptionChanged |
2218 #endif | 2219 #endif |
2219 // This tests that an RtpSender is created when the local description is set | 2220 // This tests that an RtpSender is created when the local description is set |
2220 // after adding a local stream. | 2221 // after adding a local stream. |
2221 // TODO(deadbeef): This test and the one below it need to be updated when | 2222 // TODO(deadbeef): This test and the one below it need to be updated when |
2222 // an RtpSender's lifetime isn't determined by when a local description is set. | 2223 // an RtpSender's lifetime isn't determined by when a local description is set. |
2223 TEST_F(PeerConnectionInterfaceTest, MAYBE_LocalDescriptionChanged) { | 2224 TEST_F(PeerConnectionInterfaceTest, MAYBE_LocalDescriptionChanged) { |
2224 FakeConstraints constraints; | 2225 FakeConstraints constraints; |
(...skipping 25 matching lines...) Expand all Loading... |
2250 EXPECT_TRUE(DoSetLocalDescription(desc_2.release())); | 2251 EXPECT_TRUE(DoSetLocalDescription(desc_2.release())); |
2251 senders = pc_->GetSenders(); | 2252 senders = pc_->GetSenders(); |
2252 EXPECT_EQ(2u, senders.size()); | 2253 EXPECT_EQ(2u, senders.size()); |
2253 EXPECT_TRUE(ContainsSender(senders, kAudioTracks[0])); | 2254 EXPECT_TRUE(ContainsSender(senders, kAudioTracks[0])); |
2254 EXPECT_TRUE(ContainsSender(senders, kVideoTracks[0])); | 2255 EXPECT_TRUE(ContainsSender(senders, kVideoTracks[0])); |
2255 EXPECT_FALSE(ContainsSender(senders, kAudioTracks[1])); | 2256 EXPECT_FALSE(ContainsSender(senders, kAudioTracks[1])); |
2256 EXPECT_FALSE(ContainsSender(senders, kVideoTracks[1])); | 2257 EXPECT_FALSE(ContainsSender(senders, kVideoTracks[1])); |
2257 } | 2258 } |
2258 | 2259 |
2259 // Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659 | 2260 // Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659 |
2260 #if defined(WIN) && defined(_DEBUG) | 2261 #if defined(WIN) && !defined(NDEBUG) |
2261 #define MAYBE_AddLocalStreamAfterLocalDescriptionChanged \ | 2262 #define MAYBE_AddLocalStreamAfterLocalDescriptionChanged \ |
2262 DISABLED_AddLocalStreamAfterLocalDescriptionChanged | 2263 DISABLED_AddLocalStreamAfterLocalDescriptionChanged |
2263 #else | 2264 #else |
2264 #define MAYBE_AddLocalStreamAfterLocalDescriptionChanged \ | 2265 #define MAYBE_AddLocalStreamAfterLocalDescriptionChanged \ |
2265 AddLocalStreamAfterLocalDescriptionChanged | 2266 AddLocalStreamAfterLocalDescriptionChanged |
2266 #endif | 2267 #endif |
2267 // This tests that an RtpSender is created when the local description is set | 2268 // This tests that an RtpSender is created when the local description is set |
2268 // before adding a local stream. | 2269 // before adding a local stream. |
2269 TEST_F(PeerConnectionInterfaceTest, | 2270 TEST_F(PeerConnectionInterfaceTest, |
2270 MAYBE_AddLocalStreamAfterLocalDescriptionChanged) { | 2271 MAYBE_AddLocalStreamAfterLocalDescriptionChanged) { |
(...skipping 16 matching lines...) Expand all Loading... |
2287 pc_->AddStream(reference_collection_->at(0)); | 2288 pc_->AddStream(reference_collection_->at(0)); |
2288 senders = pc_->GetSenders(); | 2289 senders = pc_->GetSenders(); |
2289 EXPECT_EQ(4u, senders.size()); | 2290 EXPECT_EQ(4u, senders.size()); |
2290 EXPECT_TRUE(ContainsSender(senders, kAudioTracks[0])); | 2291 EXPECT_TRUE(ContainsSender(senders, kAudioTracks[0])); |
2291 EXPECT_TRUE(ContainsSender(senders, kVideoTracks[0])); | 2292 EXPECT_TRUE(ContainsSender(senders, kVideoTracks[0])); |
2292 EXPECT_TRUE(ContainsSender(senders, kAudioTracks[1])); | 2293 EXPECT_TRUE(ContainsSender(senders, kAudioTracks[1])); |
2293 EXPECT_TRUE(ContainsSender(senders, kVideoTracks[1])); | 2294 EXPECT_TRUE(ContainsSender(senders, kVideoTracks[1])); |
2294 } | 2295 } |
2295 | 2296 |
2296 // Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659 | 2297 // Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659 |
2297 #if defined(WIN) && defined(_DEBUG) | 2298 #if defined(WIN) && !defined(NDEBUG) |
2298 #define MAYBE_ChangeSsrcOnTrackInLocalSessionDescription \ | 2299 #define MAYBE_ChangeSsrcOnTrackInLocalSessionDescription \ |
2299 DISABLED_ChangeSsrcOnTrackInLocalSessionDescription | 2300 DISABLED_ChangeSsrcOnTrackInLocalSessionDescription |
2300 #else | 2301 #else |
2301 #define MAYBE_ChangeSsrcOnTrackInLocalSessionDescription \ | 2302 #define MAYBE_ChangeSsrcOnTrackInLocalSessionDescription \ |
2302 ChangeSsrcOnTrackInLocalSessionDescription | 2303 ChangeSsrcOnTrackInLocalSessionDescription |
2303 #endif | 2304 #endif |
2304 // This tests that the expected behavior occurs if the SSRC on a local track is | 2305 // This tests that the expected behavior occurs if the SSRC on a local track is |
2305 // changed when SetLocalDescription is called. | 2306 // changed when SetLocalDescription is called. |
2306 TEST_F(PeerConnectionInterfaceTest, | 2307 TEST_F(PeerConnectionInterfaceTest, |
2307 MAYBE_ChangeSsrcOnTrackInLocalSessionDescription) { | 2308 MAYBE_ChangeSsrcOnTrackInLocalSessionDescription) { |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2342 EXPECT_TRUE(DoSetLocalDescription(updated_desc.release())); | 2343 EXPECT_TRUE(DoSetLocalDescription(updated_desc.release())); |
2343 senders = pc_->GetSenders(); | 2344 senders = pc_->GetSenders(); |
2344 EXPECT_EQ(2u, senders.size()); | 2345 EXPECT_EQ(2u, senders.size()); |
2345 EXPECT_TRUE(ContainsSender(senders, kAudioTracks[0])); | 2346 EXPECT_TRUE(ContainsSender(senders, kAudioTracks[0])); |
2346 EXPECT_TRUE(ContainsSender(senders, kVideoTracks[0])); | 2347 EXPECT_TRUE(ContainsSender(senders, kVideoTracks[0])); |
2347 // TODO(deadbeef): Once RtpSenders expose parameters, check that the SSRC | 2348 // TODO(deadbeef): Once RtpSenders expose parameters, check that the SSRC |
2348 // changed. | 2349 // changed. |
2349 } | 2350 } |
2350 | 2351 |
2351 // Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659 | 2352 // Disabled on Win dbg: https://bugs.chromium.org/p/webrtc/issues/detail?id=5659 |
2352 #if defined(WIN) && defined(_DEBUG) | 2353 #if defined(WIN) && !defined(NDEBUG) |
2353 #define MAYBE_SignalSameTracksInSeparateMediaStream \ | 2354 #define MAYBE_SignalSameTracksInSeparateMediaStream \ |
2354 DISABLED_SignalSameTracksInSeparateMediaStream | 2355 DISABLED_SignalSameTracksInSeparateMediaStream |
2355 #else | 2356 #else |
2356 #define MAYBE_SignalSameTracksInSeparateMediaStream \ | 2357 #define MAYBE_SignalSameTracksInSeparateMediaStream \ |
2357 SignalSameTracksInSeparateMediaStream | 2358 SignalSameTracksInSeparateMediaStream |
2358 #endif | 2359 #endif |
2359 // This tests that the expected behavior occurs if a new session description is | 2360 // This tests that the expected behavior occurs if a new session description is |
2360 // set with the same tracks, but on a different MediaStream. | 2361 // set with the same tracks, but on a different MediaStream. |
2361 TEST_F(PeerConnectionInterfaceTest, | 2362 TEST_F(PeerConnectionInterfaceTest, |
2362 MAYBE_SignalSameTracksInSeparateMediaStream) { | 2363 MAYBE_SignalSameTracksInSeparateMediaStream) { |
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2682 FakeConstraints updated_answer_c; | 2683 FakeConstraints updated_answer_c; |
2683 answer_c.SetMandatoryReceiveAudio(false); | 2684 answer_c.SetMandatoryReceiveAudio(false); |
2684 answer_c.SetMandatoryReceiveVideo(false); | 2685 answer_c.SetMandatoryReceiveVideo(false); |
2685 | 2686 |
2686 cricket::MediaSessionOptions updated_answer_options; | 2687 cricket::MediaSessionOptions updated_answer_options; |
2687 EXPECT_TRUE( | 2688 EXPECT_TRUE( |
2688 ParseConstraintsForAnswer(&updated_answer_c, &updated_answer_options)); | 2689 ParseConstraintsForAnswer(&updated_answer_c, &updated_answer_options)); |
2689 EXPECT_TRUE(updated_answer_options.has_audio()); | 2690 EXPECT_TRUE(updated_answer_options.has_audio()); |
2690 EXPECT_TRUE(updated_answer_options.has_video()); | 2691 EXPECT_TRUE(updated_answer_options.has_video()); |
2691 } | 2692 } |
OLD | NEW |