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 | 10 |
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
403 TRACE_EVENT1("webrtc", "VCM::PacketKeyFrame", "seqnum", | 403 TRACE_EVENT1("webrtc", "VCM::PacketKeyFrame", "seqnum", |
404 rtpInfo.header.sequenceNumber); | 404 rtpInfo.header.sequenceNumber); |
405 } | 405 } |
406 if (incomingPayload == nullptr) { | 406 if (incomingPayload == nullptr) { |
407 // The jitter buffer doesn't handle non-zero payload lengths for packets | 407 // The jitter buffer doesn't handle non-zero payload lengths for packets |
408 // without payload. | 408 // without payload. |
409 // TODO(holmer): We should fix this in the jitter buffer. | 409 // TODO(holmer): We should fix this in the jitter buffer. |
410 payloadLength = 0; | 410 payloadLength = 0; |
411 } | 411 } |
412 const VCMPacket packet(incomingPayload, payloadLength, rtpInfo); | 412 const VCMPacket packet(incomingPayload, payloadLength, rtpInfo); |
413 int32_t ret = _receiver.InsertPacket(packet, rtpInfo.type.Video.width, | 413 int32_t ret = _receiver.InsertPacket(packet); |
414 rtpInfo.type.Video.height); | |
415 | 414 |
416 // TODO(holmer): Investigate if this somehow should use the key frame | 415 // TODO(holmer): Investigate if this somehow should use the key frame |
417 // request scheduling to throttle the requests. | 416 // request scheduling to throttle the requests. |
418 if (ret == VCM_FLUSH_INDICATOR) { | 417 if (ret == VCM_FLUSH_INDICATOR) { |
419 { | 418 { |
420 rtc::CritScope cs(&process_crit_); | 419 rtc::CritScope cs(&process_crit_); |
421 drop_frames_until_keyframe_ = true; | 420 drop_frames_until_keyframe_ = true; |
422 } | 421 } |
423 RequestKeyFrame(); | 422 RequestKeyFrame(); |
424 } else if (ret < 0) { | 423 } else if (ret < 0) { |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
504 _receiver.SetNackSettings(max_nack_list_size, max_packet_age_to_nack, | 503 _receiver.SetNackSettings(max_nack_list_size, max_packet_age_to_nack, |
505 max_incomplete_time_ms); | 504 max_incomplete_time_ms); |
506 } | 505 } |
507 | 506 |
508 int VideoReceiver::SetMinReceiverDelay(int desired_delay_ms) { | 507 int VideoReceiver::SetMinReceiverDelay(int desired_delay_ms) { |
509 return _receiver.SetMinReceiverDelay(desired_delay_ms); | 508 return _receiver.SetMinReceiverDelay(desired_delay_ms); |
510 } | 509 } |
511 | 510 |
512 } // namespace vcm | 511 } // namespace vcm |
513 } // namespace webrtc | 512 } // namespace webrtc |
OLD | NEW |