| 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 | 
| 11 #include "webrtc/system_wrappers/interface/rtp_to_ntp.h" | 11 #include "webrtc/system_wrappers/include/rtp_to_ntp.h" | 
| 12 | 12 | 
| 13 #include "webrtc/system_wrappers/interface/clock.h" | 13 #include "webrtc/system_wrappers/include/clock.h" | 
| 14 | 14 | 
| 15 #include <assert.h> | 15 #include <assert.h> | 
| 16 | 16 | 
| 17 namespace webrtc { | 17 namespace webrtc { | 
| 18 | 18 | 
| 19 RtcpMeasurement::RtcpMeasurement() | 19 RtcpMeasurement::RtcpMeasurement() | 
| 20     : ntp_secs(0), ntp_frac(0), rtp_timestamp(0) {} | 20     : ntp_secs(0), ntp_frac(0), rtp_timestamp(0) {} | 
| 21 | 21 | 
| 22 RtcpMeasurement::RtcpMeasurement(uint32_t ntp_secs, uint32_t ntp_frac, | 22 RtcpMeasurement::RtcpMeasurement(uint32_t ntp_secs, uint32_t ntp_frac, | 
| 23                                  uint32_t timestamp) | 23                                  uint32_t timestamp) | 
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 141     } | 141     } | 
| 142   } else if (static_cast<int32_t>(old_timestamp - new_timestamp) > 0) { | 142   } else if (static_cast<int32_t>(old_timestamp - new_timestamp) > 0) { | 
| 143     // This difference should be less than -2^31 if we have had a backward wrap | 143     // This difference should be less than -2^31 if we have had a backward wrap | 
| 144     // around. Since it is cast to a int32_t, it should be positive. | 144     // around. Since it is cast to a int32_t, it should be positive. | 
| 145     return -1; | 145     return -1; | 
| 146   } | 146   } | 
| 147   return 0; | 147   return 0; | 
| 148 } | 148 } | 
| 149 | 149 | 
| 150 }  // namespace webrtc | 150 }  // namespace webrtc | 
| OLD | NEW | 
|---|