Make class of static functions in rtp_to_ntp.h:
- UpdateRtcpList - RtpToNtp class RtpToNtpEstimator - UpdateMeasurements - Estimate List with rtcp measurements is now private. BUG=none Review-Url: https://codereview.webrtc.org/2574133003 Cr-Commit-Position: refs/heads/master@{#15762}
This commit is contained in:
asapersson
@ -1,71 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license
|
||||
* that can be found in the LICENSE file in the root of the source
|
||||
* tree. An additional intellectual property rights grant can be found
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#ifndef SYSTEM_WRAPPERS_INCLUDE_RTP_TO_NTP_H_
|
||||
#define SYSTEM_WRAPPERS_INCLUDE_RTP_TO_NTP_H_
|
||||
|
||||
#include <list>
|
||||
|
||||
#include "webrtc/system_wrappers/include/ntp_time.h"
|
||||
#include "webrtc/typedefs.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
struct RtcpMeasurement {
|
||||
RtcpMeasurement();
|
||||
RtcpMeasurement(uint32_t ntp_secs, uint32_t ntp_frac, uint32_t timestamp);
|
||||
bool IsEqual(const RtcpMeasurement& other) const;
|
||||
|
||||
NtpTime ntp_time;
|
||||
uint32_t rtp_timestamp;
|
||||
};
|
||||
|
||||
struct RtcpMeasurements {
|
||||
RtcpMeasurements();
|
||||
~RtcpMeasurements();
|
||||
bool Contains(const RtcpMeasurement& other) const;
|
||||
bool IsValid(const RtcpMeasurement& other) const;
|
||||
void UpdateParameters();
|
||||
|
||||
// Estimated parameters from RTP and NTP timestamp pairs in |list|.
|
||||
struct RtpToNtpParameters {
|
||||
double frequency_khz = 0.0;
|
||||
double offset_ms = 0.0;
|
||||
bool calculated = false;
|
||||
};
|
||||
|
||||
std::list<RtcpMeasurement> list;
|
||||
RtpToNtpParameters params;
|
||||
};
|
||||
|
||||
// Updates |list| in |rtcp_measurements| with timestamps from the RTCP SR.
|
||||
// |new_rtcp_sr| will be set to true if these are the timestamps which have
|
||||
// never be added to |list|.
|
||||
// |rtcp_measurements.params| are estimated from the RTP and NTP timestamp pairs
|
||||
// in the |list| when a new RTCP SR is inserted.
|
||||
bool UpdateRtcpList(uint32_t ntp_secs,
|
||||
uint32_t ntp_frac,
|
||||
uint32_t rtp_timestamp,
|
||||
RtcpMeasurements* rtcp_measurements,
|
||||
bool* new_rtcp_sr);
|
||||
|
||||
// Converts an RTP timestamp to the NTP domain in milliseconds using the
|
||||
// estimated |rtcp_measurements.params|.
|
||||
bool RtpToNtpMs(int64_t rtp_timestamp,
|
||||
const RtcpMeasurements& rtcp_measurements,
|
||||
int64_t* rtp_timestamp_in_ms);
|
||||
|
||||
// Returns 1 there has been a forward wrap around, 0 if there has been no wrap
|
||||
// around and -1 if there has been a backwards wrap around (i.e. reordering).
|
||||
int CheckForWrapArounds(uint32_t rtp_timestamp, uint32_t rtcp_rtp_timestamp);
|
||||
|
||||
} // namespace webrtc
|
||||
|
||||
#endif // SYSTEM_WRAPPERS_INCLUDE_RTP_TO_NTP_H_
|
||||
72
webrtc/system_wrappers/include/rtp_to_ntp_estimator.h
Normal file
72
webrtc/system_wrappers/include/rtp_to_ntp_estimator.h
Normal file
@ -0,0 +1,72 @@
|
||||
/*
|
||||
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license
|
||||
* that can be found in the LICENSE file in the root of the source
|
||||
* tree. An additional intellectual property rights grant can be found
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_RTP_TO_NTP_ESTIMATOR_H_
|
||||
#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_RTP_TO_NTP_ESTIMATOR_H_
|
||||
|
||||
#include <list>
|
||||
|
||||
#include "webrtc/system_wrappers/include/ntp_time.h"
|
||||
#include "webrtc/typedefs.h"
|
||||
|
||||
namespace webrtc {
|
||||
// Class for converting an RTP timestamp to the NTP domain in milliseconds.
|
||||
// The class needs to be trained with (at least 2) RTP/NTP timestamp pairs from
|
||||
// RTCP sender reports before the convertion can be done.
|
||||
class RtpToNtpEstimator {
|
||||
public:
|
||||
RtpToNtpEstimator();
|
||||
~RtpToNtpEstimator();
|
||||
|
||||
// RTP and NTP timestamp pair from a RTCP SR report.
|
||||
struct RtcpMeasurement {
|
||||
RtcpMeasurement(uint32_t ntp_secs, uint32_t ntp_frac, uint32_t timestamp);
|
||||
bool IsEqual(const RtcpMeasurement& other) const;
|
||||
|
||||
NtpTime ntp_time;
|
||||
uint32_t rtp_timestamp;
|
||||
};
|
||||
|
||||
// Estimated parameters from RTP and NTP timestamp pairs in |measurements_|.
|
||||
struct Parameters {
|
||||
double frequency_khz = 0.0;
|
||||
double offset_ms = 0.0;
|
||||
bool calculated = false;
|
||||
};
|
||||
|
||||
// Updates measurements with RTP/NTP timestamp pair from a RTCP sender report.
|
||||
// |new_rtcp_sr| is set to true if a new report is added.
|
||||
bool UpdateMeasurements(uint32_t ntp_secs,
|
||||
uint32_t ntp_frac,
|
||||
uint32_t rtp_timestamp,
|
||||
bool* new_rtcp_sr);
|
||||
|
||||
// Converts an RTP timestamp to the NTP domain in milliseconds.
|
||||
// Returns true on success, false otherwise.
|
||||
bool Estimate(int64_t rtp_timestamp, int64_t* rtp_timestamp_ms) const;
|
||||
|
||||
const Parameters& params() const { return params_; }
|
||||
|
||||
private:
|
||||
void UpdateParameters();
|
||||
|
||||
std::list<RtcpMeasurement> measurements_;
|
||||
Parameters params_;
|
||||
};
|
||||
|
||||
// Returns:
|
||||
// 1: forward wrap around.
|
||||
// 0: no wrap around.
|
||||
// -1: backwards wrap around (i.e. reordering).
|
||||
int CheckForWrapArounds(uint32_t new_timestamp, uint32_t old_timestamp);
|
||||
|
||||
} // namespace webrtc
|
||||
|
||||
#endif // WEBRTC_SYSTEM_WRAPPERS_INCLUDE_RTP_TO_NTP_ESTIMATOR_H_
|
||||
Reference in New Issue
Block a user