Chromium Code Reviews| 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 500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 511 if (data_channel_ && session_->data_channel_type() == cricket::DCT_RTP) { | 511 if (data_channel_ && session_->data_channel_type() == cricket::DCT_RTP) { |
| 512 session_options->AddSendStream(cricket::MEDIA_TYPE_DATA, | 512 session_options->AddSendStream(cricket::MEDIA_TYPE_DATA, |
| 513 data_channel_->label(), | 513 data_channel_->label(), |
| 514 data_channel_->label()); | 514 data_channel_->label()); |
| 515 } | 515 } |
| 516 } | 516 } |
| 517 | 517 |
| 518 void GetOptionsForOffer( | 518 void GetOptionsForOffer( |
| 519 const PeerConnectionInterface::RTCOfferAnswerOptions& rtc_options, | 519 const PeerConnectionInterface::RTCOfferAnswerOptions& rtc_options, |
| 520 cricket::MediaSessionOptions* session_options) { | 520 cricket::MediaSessionOptions* session_options) { |
| 521 ASSERT_TRUE(ExtractMediaSessionOptions(rtc_options, session_options)); | 521 ASSERT_TRUE(ExtractMediaSessionOptions(rtc_options, true, session_options)); |
|
perkj_webrtc
2016/03/10 15:35:24
Hum. weird that ExtractMediaSessionOptions has bee
hta-webrtc
2016/03/10 16:22:05
Yep, I wondered if I could stop exporting it at al
| |
| 522 | 522 |
| 523 AddStreamsToOptions(session_options); | 523 AddStreamsToOptions(session_options); |
| 524 if (rtc_options.offer_to_receive_audio == | 524 if (rtc_options.offer_to_receive_audio == |
| 525 RTCOfferAnswerOptions::kUndefined) { | 525 RTCOfferAnswerOptions::kUndefined) { |
| 526 session_options->recv_audio = | 526 session_options->recv_audio = |
| 527 session_options->HasSendMediaStream(cricket::MEDIA_TYPE_AUDIO); | 527 session_options->HasSendMediaStream(cricket::MEDIA_TYPE_AUDIO); |
| 528 } | 528 } |
| 529 if (rtc_options.offer_to_receive_video == | 529 if (rtc_options.offer_to_receive_video == |
| 530 RTCOfferAnswerOptions::kUndefined) { | 530 RTCOfferAnswerOptions::kUndefined) { |
| 531 session_options->recv_video = | 531 session_options->recv_video = |
| (...skipping 3755 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4287 } | 4287 } |
| 4288 | 4288 |
| 4289 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test | 4289 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test |
| 4290 // currently fails because upon disconnection and reconnection OnIceComplete is | 4290 // currently fails because upon disconnection and reconnection OnIceComplete is |
| 4291 // called more than once without returning to IceGatheringGathering. | 4291 // called more than once without returning to IceGatheringGathering. |
| 4292 | 4292 |
| 4293 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, | 4293 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, |
| 4294 WebRtcSessionTest, | 4294 WebRtcSessionTest, |
| 4295 testing::Values(ALREADY_GENERATED, | 4295 testing::Values(ALREADY_GENERATED, |
| 4296 DTLS_IDENTITY_STORE)); | 4296 DTLS_IDENTITY_STORE)); |
| OLD | NEW |