RTC: Rename APIs

pull/1809/head
忘篱 5 years ago
parent 99496ed24c
commit d1485c40e4

@ -62,7 +62,7 @@ struct SrsRtcpHeader
struct SrsSeqCompareLess { struct SrsSeqCompareLess {
bool operator()(const uint16_t &lhs, const uint16_t &rhs) const { bool operator()(const uint16_t &lhs, const uint16_t &rhs) const {
return SnCompare(rhs, lhs); return SrsSeqIsNewer(rhs, lhs);
} }
}; };

@ -33,8 +33,8 @@ using namespace std;
#include <srs_kernel_utility.hpp> #include <srs_kernel_utility.hpp>
#include <srs_kernel_flv.hpp> #include <srs_kernel_flv.hpp>
//sn comparisonif current_sn is more than last_snreturn trueelse return false //sn comparisonif current_sn is more(newer) than last_snreturn trueelse return false
bool SnCompare(uint16_t current_sn, uint16_t last_sn) { bool SrsSeqIsNewer(uint16_t current_sn, uint16_t last_sn) {
if(current_sn > last_sn) { if(current_sn > last_sn) {
//current_sn 65533 last_sn 5 //current_sn 65533 last_sn 5
if(current_sn - last_sn > 0x8000) { if(current_sn - last_sn > 0x8000) {
@ -52,9 +52,9 @@ bool SnCompare(uint16_t current_sn, uint16_t last_sn) {
} }
} }
bool SnRollback(uint16_t current_sn, uint16_t last_sn) bool SrsSeqIsRoolback(uint16_t current_sn, uint16_t last_sn)
{ {
if(SnCompare(current_sn, last_sn)) { if(SrsSeqIsNewer(current_sn, last_sn)) {
if((last_sn > current_sn)) { if((last_sn > current_sn)) {
return true; return true;
} }
@ -63,7 +63,7 @@ bool SnRollback(uint16_t current_sn, uint16_t last_sn)
} }
// caculate the difference between sn. If current_sn is more then last_sn, return positive difference, else return negative difference. // caculate the difference between sn. If current_sn is more then last_sn, return positive difference, else return negative difference.
int32_t SnDiff(uint16_t current_sn, uint16_t last_sn) { int32_t SrsSeqDistance(uint16_t current_sn, uint16_t last_sn) {
if(current_sn > last_sn) { if(current_sn > last_sn) {
//current_sn 65535 last_sn 0 //current_sn 65535 last_sn 0
if(current_sn - last_sn > 0x8000) { if(current_sn - last_sn > 0x8000) {

@ -59,9 +59,9 @@ class SrsRtpFUAPayload2;
class SrsSharedPtrMessage; class SrsSharedPtrMessage;
// TODO: FIXME: Merge with srs_rtp_seq_distance // TODO: FIXME: Merge with srs_rtp_seq_distance
bool SnCompare(uint16_t current_sn, uint16_t last_sn); bool SrsSeqIsNewer(uint16_t current_sn, uint16_t last_sn);
bool SnRollback(uint16_t current_sn, uint16_t last_sn); bool SrsSeqIsRoolback(uint16_t current_sn, uint16_t last_sn);
int32_t SnDiff(uint16_t current_sn, uint16_t last_sn); int32_t SrsSeqDistance(uint16_t current_sn, uint16_t last_sn);
class SrsRtpHeader class SrsRtpHeader
{ {

Loading…
Cancel
Save