| 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   57         channel_manager_(media_engine_, |   57         channel_manager_(media_engine_, | 
|   58                          rtc::Thread::Current(), |   58                          rtc::Thread::Current(), | 
|   59                          rtc::Thread::Current()), |   59                          rtc::Thread::Current()), | 
|   60         fake_call_(Call::Config(&event_log_)), |   60         fake_call_(Call::Config(&event_log_)), | 
|   61         fake_media_controller_(&channel_manager_, &fake_call_), |   61         fake_media_controller_(&channel_manager_, &fake_call_), | 
|   62         stream_(MediaStream::Create(kStreamLabel1)) { |   62         stream_(MediaStream::Create(kStreamLabel1)) { | 
|   63     // Create channels to be used by the RtpSenders and RtpReceivers. |   63     // Create channels to be used by the RtpSenders and RtpReceivers. | 
|   64     channel_manager_.Init(); |   64     channel_manager_.Init(); | 
|   65     bool rtcp_mux_required = true; |   65     bool rtcp_mux_required = true; | 
|   66     bool srtp_required = true; |   66     bool srtp_required = true; | 
|   67     cricket::TransportChannel* rtp_transport = |   67     cricket::DtlsTransportInternal* rtp_transport = | 
|   68         fake_transport_controller_.CreateTransportChannel( |   68         fake_transport_controller_.CreateDtlsTransport( | 
|   69             cricket::CN_AUDIO, cricket::ICE_CANDIDATE_COMPONENT_RTP); |   69             cricket::CN_AUDIO, cricket::ICE_CANDIDATE_COMPONENT_RTP); | 
|   70     voice_channel_ = channel_manager_.CreateVoiceChannel( |   70     voice_channel_ = channel_manager_.CreateVoiceChannel( | 
|   71         &fake_media_controller_, rtp_transport, nullptr, rtc::Thread::Current(), |   71         &fake_media_controller_, rtp_transport, nullptr, rtc::Thread::Current(), | 
|   72         cricket::CN_AUDIO, nullptr, rtcp_mux_required, srtp_required, |   72         cricket::CN_AUDIO, nullptr, rtcp_mux_required, srtp_required, | 
|   73         cricket::AudioOptions()); |   73         cricket::AudioOptions()); | 
|   74     video_channel_ = channel_manager_.CreateVideoChannel( |   74     video_channel_ = channel_manager_.CreateVideoChannel( | 
|   75         &fake_media_controller_, rtp_transport, nullptr, rtc::Thread::Current(), |   75         &fake_media_controller_, rtp_transport, nullptr, rtc::Thread::Current(), | 
|   76         cricket::CN_VIDEO, nullptr, rtcp_mux_required, srtp_required, |   76         cricket::CN_VIDEO, nullptr, rtcp_mux_required, srtp_required, | 
|   77         cricket::VideoOptions()); |   77         cricket::VideoOptions()); | 
|   78     voice_media_channel_ = media_engine_->GetVoiceChannel(0); |   78     voice_media_channel_ = media_engine_->GetVoiceChannel(0); | 
| (...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  715   // And removing the hint should go back to false (to verify that false was |  715   // And removing the hint should go back to false (to verify that false was | 
|  716   // default correctly). |  716   // default correctly). | 
|  717   video_track_->set_content_hint(VideoTrackInterface::ContentHint::kNone); |  717   video_track_->set_content_hint(VideoTrackInterface::ContentHint::kNone); | 
|  718   EXPECT_EQ(rtc::Optional<bool>(false), |  718   EXPECT_EQ(rtc::Optional<bool>(false), | 
|  719             video_media_channel_->options().is_screencast); |  719             video_media_channel_->options().is_screencast); | 
|  720  |  720  | 
|  721   DestroyVideoRtpSender(); |  721   DestroyVideoRtpSender(); | 
|  722 } |  722 } | 
|  723  |  723  | 
|  724 }  // namespace webrtc |  724 }  // namespace webrtc | 
| OLD | NEW |