| OLD | NEW | 
|     1 /* |     1 /* | 
|     2  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. |     2  *  Copyright (c) 2013 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 #include <algorithm>  // max |    10 #include <algorithm>  // max | 
| (...skipping 1639 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1650     rtc::Event encoder_init_; |  1650     rtc::Event encoder_init_; | 
|  1651     rtc::Event bitrate_changed_; |  1651     rtc::Event bitrate_changed_; | 
|  1652     int bitrate_kbps_ GUARDED_BY(crit_); |  1652     int bitrate_kbps_ GUARDED_BY(crit_); | 
|  1653   }; |  1653   }; | 
|  1654  |  1654  | 
|  1655   CreateSenderCall(Call::Config(&event_log_)); |  1655   CreateSenderCall(Call::Config(&event_log_)); | 
|  1656  |  1656  | 
|  1657   test::NullTransport transport; |  1657   test::NullTransport transport; | 
|  1658   CreateSendConfig(1, 0, 0, &transport); |  1658   CreateSendConfig(1, 0, 0, &transport); | 
|  1659  |  1659  | 
|  1660   sender_call_->SignalChannelNetworkState(MediaType::VIDEO, kNetworkUp); |  | 
|  1661  |  | 
|  1662   StartStopBitrateObserver encoder; |  1660   StartStopBitrateObserver encoder; | 
|  1663   video_send_config_.encoder_settings.encoder = &encoder; |  1661   video_send_config_.encoder_settings.encoder = &encoder; | 
|  1664   video_send_config_.encoder_settings.internal_source = true; |  1662   video_send_config_.encoder_settings.internal_source = true; | 
|  1665  |  1663  | 
|  1666   CreateVideoStreams(); |  1664   CreateVideoStreams(); | 
|  1667  |  1665  | 
|  1668   EXPECT_TRUE(encoder.WaitForEncoderInit()); |  1666   EXPECT_TRUE(encoder.WaitForEncoderInit()); | 
|  1669   EXPECT_GT(encoder.GetBitrateKbps(), 0); |  1667   EXPECT_GT(encoder.GetBitrateKbps(), 0); | 
|  1670   video_send_stream_->Start(); |  1668   video_send_stream_->Start(); | 
|  1671   EXPECT_TRUE(encoder.WaitBitrateChanged()); |  1669   EXPECT_TRUE(encoder.WaitBitrateChanged()); | 
| (...skipping 1317 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  2989        RequestSourceRotateIfVideoOrientationExtensionNotSupported) { |  2987        RequestSourceRotateIfVideoOrientationExtensionNotSupported) { | 
|  2990   TestRequestSourceRotateVideo(false); |  2988   TestRequestSourceRotateVideo(false); | 
|  2991 } |  2989 } | 
|  2992  |  2990  | 
|  2993 TEST_F(VideoSendStreamTest, |  2991 TEST_F(VideoSendStreamTest, | 
|  2994        DoNotRequestsRotationIfVideoOrientationExtensionSupported) { |  2992        DoNotRequestsRotationIfVideoOrientationExtensionSupported) { | 
|  2995   TestRequestSourceRotateVideo(true); |  2993   TestRequestSourceRotateVideo(true); | 
|  2996 } |  2994 } | 
|  2997  |  2995  | 
|  2998 }  // namespace webrtc |  2996 }  // namespace webrtc | 
| OLD | NEW |