| 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> | 10 #include <algorithm> | 
| (...skipping 2429 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2440         VideoSendStream* send_stream, | 2440         VideoSendStream* send_stream, | 
| 2441         const std::vector<VideoReceiveStream*>& receive_streams) override { | 2441         const std::vector<VideoReceiveStream*>& receive_streams) override { | 
| 2442       send_stream_ = send_stream; | 2442       send_stream_ = send_stream; | 
| 2443     } | 2443     } | 
| 2444 | 2444 | 
| 2445     void ModifyVideoConfigs( | 2445     void ModifyVideoConfigs( | 
| 2446         VideoSendStream::Config* send_config, | 2446         VideoSendStream::Config* send_config, | 
| 2447         std::vector<VideoReceiveStream::Config>* receive_configs, | 2447         std::vector<VideoReceiveStream::Config>* receive_configs, | 
| 2448         VideoEncoderConfig* encoder_config) override { | 2448         VideoEncoderConfig* encoder_config) override { | 
| 2449       send_config->encoder_settings.encoder = this; | 2449       send_config->encoder_settings.encoder = this; | 
|  | 2450       RTC_DCHECK_EQ(1u, encoder_config->streams.size()); | 
| 2450     } | 2451     } | 
| 2451 | 2452 | 
| 2452     int32_t SetRates(uint32_t new_target_bitrate, uint32_t framerate) override { | 2453     int32_t SetRates(uint32_t new_target_bitrate, uint32_t framerate) override { | 
| 2453       // Make sure not to trigger on any default zero bitrates. | 2454       // Make sure not to trigger on any default zero bitrates. | 
| 2454       if (new_target_bitrate == 0) | 2455       if (new_target_bitrate == 0) | 
| 2455         return 0; | 2456         return 0; | 
| 2456       rtc::CritScope lock(&crit_); | 2457       rtc::CritScope lock(&crit_); | 
| 2457       bitrate_kbps_ = new_target_bitrate; | 2458       bitrate_kbps_ = new_target_bitrate; | 
| 2458       observation_complete_.Set(); | 2459       observation_complete_.Set(); | 
| 2459       return 0; | 2460       return 0; | 
| (...skipping 1081 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 3541    private: | 3542    private: | 
| 3542     bool video_observed_; | 3543     bool video_observed_; | 
| 3543     bool audio_observed_; | 3544     bool audio_observed_; | 
| 3544     SequenceNumberUnwrapper unwrapper_; | 3545     SequenceNumberUnwrapper unwrapper_; | 
| 3545     std::set<int64_t> received_packet_ids_; | 3546     std::set<int64_t> received_packet_ids_; | 
| 3546   } test; | 3547   } test; | 
| 3547 | 3548 | 
| 3548   RunBaseTest(&test); | 3549   RunBaseTest(&test); | 
| 3549 } | 3550 } | 
| 3550 }  // namespace webrtc | 3551 }  // namespace webrtc | 
| OLD | NEW | 
|---|