| 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 1607 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1618 | 1618 |
| 1619 void ModifyAudioConfigs( | 1619 void ModifyAudioConfigs( |
| 1620 AudioSendStream::Config* send_config, | 1620 AudioSendStream::Config* send_config, |
| 1621 std::vector<AudioReceiveStream::Config>* receive_configs) override { | 1621 std::vector<AudioReceiveStream::Config>* receive_configs) override { |
| 1622 send_config->rtp.extensions.clear(); | 1622 send_config->rtp.extensions.clear(); |
| 1623 send_config->rtp.extensions.push_back( | 1623 send_config->rtp.extensions.push_back( |
| 1624 RtpExtension(RtpExtension::kTransportSequenceNumber, kExtensionId)); | 1624 RtpExtension(RtpExtension::kTransportSequenceNumber, kExtensionId)); |
| 1625 (*receive_configs)[0].rtp.extensions.clear(); | 1625 (*receive_configs)[0].rtp.extensions.clear(); |
| 1626 (*receive_configs)[0].rtp.extensions = send_config->rtp.extensions; | 1626 (*receive_configs)[0].rtp.extensions = send_config->rtp.extensions; |
| 1627 (*receive_configs)[0].rtp.transport_cc = feedback_enabled_; | 1627 (*receive_configs)[0].rtp.transport_cc = feedback_enabled_; |
| 1628 (*receive_configs)[0].combined_audio_video_bwe = true; | |
| 1629 } | 1628 } |
| 1630 | 1629 |
| 1631 private: | 1630 private: |
| 1632 static const int kExtensionId = 5; | 1631 static const int kExtensionId = 5; |
| 1633 const bool feedback_enabled_; | 1632 const bool feedback_enabled_; |
| 1634 const size_t num_video_streams_; | 1633 const size_t num_video_streams_; |
| 1635 const size_t num_audio_streams_; | 1634 const size_t num_audio_streams_; |
| 1636 Call* receiver_call_; | 1635 Call* receiver_call_; |
| 1637 }; | 1636 }; |
| 1638 | 1637 |
| (...skipping 1881 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3520 private: | 3519 private: |
| 3521 bool video_observed_; | 3520 bool video_observed_; |
| 3522 bool audio_observed_; | 3521 bool audio_observed_; |
| 3523 SequenceNumberUnwrapper unwrapper_; | 3522 SequenceNumberUnwrapper unwrapper_; |
| 3524 std::set<int64_t> received_packet_ids_; | 3523 std::set<int64_t> received_packet_ids_; |
| 3525 } test; | 3524 } test; |
| 3526 | 3525 |
| 3527 RunBaseTest(&test); | 3526 RunBaseTest(&test); |
| 3528 } | 3527 } |
| 3529 } // namespace webrtc | 3528 } // namespace webrtc |
| OLD | NEW |