Chromium Code Reviews| 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 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 302 if (header.extension.hasTransmissionTimeOffset) | 302 if (header.extension.hasTransmissionTimeOffset) |
| 303 ss << ", toffset: " << header.extension.transmissionTimeOffset; | 303 ss << ", toffset: " << header.extension.transmissionTimeOffset; |
| 304 if (header.extension.hasAbsoluteSendTime) | 304 if (header.extension.hasAbsoluteSendTime) |
| 305 ss << ", abs send time: " << header.extension.absoluteSendTime; | 305 ss << ", abs send time: " << header.extension.absoluteSendTime; |
| 306 LOG(LS_INFO) << ss.str(); | 306 LOG(LS_INFO) << ss.str(); |
| 307 last_packet_log_ms_ = now_ms; | 307 last_packet_log_ms_ = now_ms; |
| 308 } | 308 } |
| 309 } | 309 } |
| 310 | 310 |
| 311 remote_bitrate_estimator_->IncomingPacket(arrival_time_ms, payload_length, | 311 remote_bitrate_estimator_->IncomingPacket(arrival_time_ms, payload_length, |
| 312 header, true); | 312 header, PacketInfo::kNotAProbe); |
|
danilchap
2016/05/26 11:22:42
this change looks even stranger than similar code
stefan-webrtc
2016/05/26 16:29:50
Yes, this looks wrong. If anything it should be as
| |
| 313 header.payload_type_frequency = kVideoPayloadTypeFrequency; | 313 header.payload_type_frequency = kVideoPayloadTypeFrequency; |
| 314 | 314 |
| 315 bool in_order = IsPacketInOrder(header); | 315 bool in_order = IsPacketInOrder(header); |
| 316 rtp_payload_registry_.SetIncomingPayloadType(header); | 316 rtp_payload_registry_.SetIncomingPayloadType(header); |
| 317 bool ret = ReceivePacket(rtp_packet, rtp_packet_length, header, in_order); | 317 bool ret = ReceivePacket(rtp_packet, rtp_packet_length, header, in_order); |
| 318 // Update receive statistics after ReceivePacket. | 318 // Update receive statistics after ReceivePacket. |
| 319 // Receive statistics will be reset if the payload type changes (make sure | 319 // Receive statistics will be reset if the payload type changes (make sure |
| 320 // that the first packet is included in the stats). | 320 // that the first packet is included in the stats). |
| 321 rtp_receive_statistics_->IncomingPacket( | 321 rtp_receive_statistics_->IncomingPacket( |
| 322 header, rtp_packet_length, IsPacketRetransmitted(header, in_order)); | 322 header, rtp_packet_length, IsPacketRetransmitted(header, in_order)); |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 533 const std::string& extension, int id) { | 533 const std::string& extension, int id) { |
| 534 // One-byte-extension local identifiers are in the range 1-14 inclusive. | 534 // One-byte-extension local identifiers are in the range 1-14 inclusive. |
| 535 RTC_DCHECK_GE(id, 1); | 535 RTC_DCHECK_GE(id, 1); |
| 536 RTC_DCHECK_LE(id, 14); | 536 RTC_DCHECK_LE(id, 14); |
| 537 RTC_DCHECK(RtpExtension::IsSupportedForVideo(extension)); | 537 RTC_DCHECK(RtpExtension::IsSupportedForVideo(extension)); |
| 538 RTC_CHECK(rtp_header_parser_->RegisterRtpHeaderExtension( | 538 RTC_CHECK(rtp_header_parser_->RegisterRtpHeaderExtension( |
| 539 StringToRtpExtensionType(extension), id)); | 539 StringToRtpExtensionType(extension), id)); |
| 540 } | 540 } |
| 541 | 541 |
| 542 } // namespace webrtc | 542 } // namespace webrtc |
| OLD | NEW |