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 4260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4271 | 4271 |
4272 return SEND_PACKET; | 4272 return SEND_PACKET; |
4273 } | 4273 } |
4274 | 4274 |
4275 rtc::Optional<uint16_t> last_observed_sequence_number_ GUARDED_BY(crit_); | 4275 rtc::Optional<uint16_t> last_observed_sequence_number_ GUARDED_BY(crit_); |
4276 rtc::Optional<uint32_t> last_observed_timestamp_ GUARDED_BY(crit_); | 4276 rtc::Optional<uint32_t> last_observed_timestamp_ GUARDED_BY(crit_); |
4277 size_t num_flexfec_packets_sent_ GUARDED_BY(crit_); | 4277 size_t num_flexfec_packets_sent_ GUARDED_BY(crit_); |
4278 rtc::CriticalSection crit_; | 4278 rtc::CriticalSection crit_; |
4279 } observer; | 4279 } observer; |
4280 | 4280 |
4281 constexpr int kFrameMaxWidth = 320; | 4281 // These would have been declared as constexpr, but then some compilers |
4282 constexpr int kFrameMaxHeight = 180; | 4282 // require them to be captured in the lambda, and other compilers complain |
4283 constexpr int kFrameRate = 15; | 4283 // about no-ununused-lambda-capture. Keeping them as normal variables was |
4284 // the easiest work-around. | |
4285 int kFrameMaxWidth = 320; | |
4286 int kFrameMaxHeight = 180; | |
4287 int kFrameRate = 15; | |
kwiberg-webrtc
2017/08/23 11:35:59
const?
eladalon
2017/08/23 11:42:53
Similarly.
| |
4284 | 4288 |
4285 Call::Config config(event_log_.get()); | 4289 Call::Config config(event_log_.get()); |
4286 | 4290 |
4287 std::unique_ptr<test::PacketTransport> send_transport; | 4291 std::unique_ptr<test::PacketTransport> send_transport; |
4288 std::unique_ptr<test::PacketTransport> receive_transport; | 4292 std::unique_ptr<test::PacketTransport> receive_transport; |
4289 std::unique_ptr<VideoEncoder> encoder; | 4293 std::unique_ptr<VideoEncoder> encoder; |
4290 | 4294 |
4291 task_queue_.SendTask([&]() { | 4295 task_queue_.SendTask([&]() { |
4292 CreateCalls(config, config); | 4296 CreateCalls(config, config); |
4293 | 4297 |
(...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
5012 std::unique_ptr<VideoEncoder> encoder_; | 5016 std::unique_ptr<VideoEncoder> encoder_; |
5013 std::unique_ptr<VideoDecoder> decoder_; | 5017 std::unique_ptr<VideoDecoder> decoder_; |
5014 rtc::CriticalSection crit_; | 5018 rtc::CriticalSection crit_; |
5015 int recorded_frames_ GUARDED_BY(crit_); | 5019 int recorded_frames_ GUARDED_BY(crit_); |
5016 } test(this); | 5020 } test(this); |
5017 | 5021 |
5018 RunBaseTest(&test); | 5022 RunBaseTest(&test); |
5019 } | 5023 } |
5020 | 5024 |
5021 } // namespace webrtc | 5025 } // namespace webrtc |
OLD | NEW |