| 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 #include "webrtc/modules/video_coding/main/source/jitter_buffer.h" | 10 #include "webrtc/modules/video_coding/main/source/jitter_buffer.h" |
| 11 | 11 |
| 12 #include <assert.h> | 12 #include <assert.h> |
| 13 | 13 |
| 14 #include <algorithm> | 14 #include <algorithm> |
| 15 #include <utility> | 15 #include <utility> |
| 16 | 16 |
| 17 #include "webrtc/base/trace_event.h" |
| 17 #include "webrtc/modules/video_coding/main/interface/video_coding.h" | 18 #include "webrtc/modules/video_coding/main/interface/video_coding.h" |
| 18 #include "webrtc/modules/video_coding/main/source/frame_buffer.h" | 19 #include "webrtc/modules/video_coding/main/source/frame_buffer.h" |
| 19 #include "webrtc/modules/video_coding/main/source/inter_frame_delay.h" | 20 #include "webrtc/modules/video_coding/main/source/inter_frame_delay.h" |
| 20 #include "webrtc/modules/video_coding/main/source/internal_defines.h" | 21 #include "webrtc/modules/video_coding/main/source/internal_defines.h" |
| 21 #include "webrtc/modules/video_coding/main/source/jitter_buffer_common.h" | 22 #include "webrtc/modules/video_coding/main/source/jitter_buffer_common.h" |
| 22 #include "webrtc/modules/video_coding/main/source/jitter_estimator.h" | 23 #include "webrtc/modules/video_coding/main/source/jitter_estimator.h" |
| 23 #include "webrtc/modules/video_coding/main/source/packet.h" | 24 #include "webrtc/modules/video_coding/main/source/packet.h" |
| 24 #include "webrtc/system_wrappers/interface/clock.h" | 25 #include "webrtc/system_wrappers/interface/clock.h" |
| 25 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" | 26 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" |
| 26 #include "webrtc/system_wrappers/interface/event_wrapper.h" | 27 #include "webrtc/system_wrappers/interface/event_wrapper.h" |
| 27 #include "webrtc/system_wrappers/interface/logging.h" | 28 #include "webrtc/system_wrappers/interface/logging.h" |
| 28 #include "webrtc/system_wrappers/interface/metrics.h" | 29 #include "webrtc/system_wrappers/interface/metrics.h" |
| 29 #include "webrtc/system_wrappers/interface/trace_event.h" | |
| 30 | 30 |
| 31 namespace webrtc { | 31 namespace webrtc { |
| 32 | 32 |
| 33 // Use this rtt if no value has been reported. | 33 // Use this rtt if no value has been reported. |
| 34 static const int64_t kDefaultRtt = 200; | 34 static const int64_t kDefaultRtt = 200; |
| 35 | 35 |
| 36 typedef std::pair<uint32_t, VCMFrameBuffer*> FrameListPair; | 36 typedef std::pair<uint32_t, VCMFrameBuffer*> FrameListPair; |
| 37 | 37 |
| 38 bool IsKeyFrame(FrameListPair pair) { | 38 bool IsKeyFrame(FrameListPair pair) { |
| 39 return pair.second->FrameType() == kVideoFrameKey; | 39 return pair.second->FrameType() == kVideoFrameKey; |
| (...skipping 1213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1253 } | 1253 } |
| 1254 // Evaluate if the RTT is higher than |high_rtt_nack_threshold_ms_|, and in | 1254 // Evaluate if the RTT is higher than |high_rtt_nack_threshold_ms_|, and in |
| 1255 // that case we don't wait for retransmissions. | 1255 // that case we don't wait for retransmissions. |
| 1256 if (high_rtt_nack_threshold_ms_ >= 0 && | 1256 if (high_rtt_nack_threshold_ms_ >= 0 && |
| 1257 rtt_ms_ >= high_rtt_nack_threshold_ms_) { | 1257 rtt_ms_ >= high_rtt_nack_threshold_ms_) { |
| 1258 return false; | 1258 return false; |
| 1259 } | 1259 } |
| 1260 return true; | 1260 return true; |
| 1261 } | 1261 } |
| 1262 } // namespace webrtc | 1262 } // namespace webrtc |
| OLD | NEW |