| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 rtcpPacketInformation.interArrivalJitter; | 129 rtcpPacketInformation.interArrivalJitter; |
| 130 rtcp_packet_info_.sliPictureId = rtcpPacketInformation.sliPictureId; | 130 rtcp_packet_info_.sliPictureId = rtcpPacketInformation.sliPictureId; |
| 131 rtcp_packet_info_.rpsiPictureId = rtcpPacketInformation.rpsiPictureId; | 131 rtcp_packet_info_.rpsiPictureId = rtcpPacketInformation.rpsiPictureId; |
| 132 rtcp_packet_info_.receiverEstimatedMaxBitrate = | 132 rtcp_packet_info_.receiverEstimatedMaxBitrate = |
| 133 rtcpPacketInformation.receiverEstimatedMaxBitrate; | 133 rtcpPacketInformation.receiverEstimatedMaxBitrate; |
| 134 rtcp_packet_info_.ntp_secs = rtcpPacketInformation.ntp_secs; | 134 rtcp_packet_info_.ntp_secs = rtcpPacketInformation.ntp_secs; |
| 135 rtcp_packet_info_.ntp_frac = rtcpPacketInformation.ntp_frac; | 135 rtcp_packet_info_.ntp_frac = rtcpPacketInformation.ntp_frac; |
| 136 rtcp_packet_info_.rtp_timestamp = rtcpPacketInformation.rtp_timestamp; | 136 rtcp_packet_info_.rtp_timestamp = rtcpPacketInformation.rtp_timestamp; |
| 137 rtcp_packet_info_.xr_dlrr_item = rtcpPacketInformation.xr_dlrr_item; | 137 rtcp_packet_info_.xr_dlrr_item = rtcpPacketInformation.xr_dlrr_item; |
| 138 if (rtcpPacketInformation.VoIPMetric) | 138 if (rtcpPacketInformation.VoIPMetric) |
| 139 rtcp_packet_info_.AddVoIPMetric(rtcpPacketInformation.VoIPMetric); | 139 rtcp_packet_info_.AddVoIPMetric(rtcpPacketInformation.VoIPMetric.get()); |
| 140 rtcp_packet_info_.transport_feedback_.reset( | 140 rtcp_packet_info_.transport_feedback_.reset( |
| 141 rtcpPacketInformation.transport_feedback_.release()); | 141 rtcpPacketInformation.transport_feedback_.release()); |
| 142 return 0; | 142 return 0; |
| 143 } | 143 } |
| 144 | 144 |
| 145 OverUseDetectorOptions over_use_detector_options_; | 145 OverUseDetectorOptions over_use_detector_options_; |
| 146 SimulatedClock system_clock_; | 146 SimulatedClock system_clock_; |
| 147 ModuleRtpRtcpImpl* rtp_rtcp_impl_; | 147 ModuleRtpRtcpImpl* rtp_rtcp_impl_; |
| 148 RTCPReceiver* rtcp_receiver_; | 148 RTCPReceiver* rtcp_receiver_; |
| 149 TestTransport* test_transport_; | 149 TestTransport* test_transport_; |
| (...skipping 1127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1277 | 1277 |
| 1278 // Transport feedback should be ignored, but next packet should work. | 1278 // Transport feedback should be ignored, but next packet should work. |
| 1279 EXPECT_EQ(0u, rtcp_packet_info_.rtcpPacketTypeFlags & kRtcpTransportFeedback); | 1279 EXPECT_EQ(0u, rtcp_packet_info_.rtcpPacketTypeFlags & kRtcpTransportFeedback); |
| 1280 EXPECT_NE(0u, rtcp_packet_info_.rtcpPacketTypeFlags & kRtcpRemb); | 1280 EXPECT_NE(0u, rtcp_packet_info_.rtcpPacketTypeFlags & kRtcpRemb); |
| 1281 EXPECT_EQ(kBitrateBps, rtcp_packet_info_.receiverEstimatedMaxBitrate); | 1281 EXPECT_EQ(kBitrateBps, rtcp_packet_info_.receiverEstimatedMaxBitrate); |
| 1282 } | 1282 } |
| 1283 | 1283 |
| 1284 } // Anonymous namespace | 1284 } // Anonymous namespace |
| 1285 | 1285 |
| 1286 } // namespace webrtc | 1286 } // namespace webrtc |
| OLD | NEW |