From dcebf8a31f2e45edb2b0b97d3d19ac47b9f11fc6 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Tue, 1 Jan 2019 14:04:50 +0800
Subject: [PATCH] Refine kbps

---
 trunk/src/protocol/srs_protocol_kbps.cpp | 54 ++++++++++++------------
 trunk/src/protocol/srs_protocol_kbps.hpp | 20 ++++-----
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/trunk/src/protocol/srs_protocol_kbps.cpp b/trunk/src/protocol/srs_protocol_kbps.cpp
index 781e8fddd..216ef35b7 100644
--- a/trunk/src/protocol/srs_protocol_kbps.cpp
+++ b/trunk/src/protocol/srs_protocol_kbps.cpp
@@ -205,6 +205,33 @@ int SrsKbps::get_recv_kbps_5m()
     return is.sample_5m.kbps;
 }
 
+void SrsKbps::add_delta(IKbpsDelta* delta)
+{
+    srs_assert(delta);
+    
+    // update the total bytes
+    is.last_bytes += delta->get_recv_bytes_delta();
+    os.last_bytes += delta->get_send_bytes_delta();
+    
+    // we donot sample, please use sample() to do resample.
+}
+
+void SrsKbps::sample()
+{
+    // update the total bytes
+    if (os.io.out) {
+        os.last_bytes = os.io.out->get_send_bytes();
+    }
+    
+    if (is.io.in) {
+        is.last_bytes = is.io.in->get_recv_bytes();
+    }
+    
+    // resample
+    is.sample();
+    os.sample();
+}
+
 int64_t SrsKbps::get_send_bytes()
 {
     // we must calc the send bytes dynamically,
@@ -272,33 +299,6 @@ void SrsKbps::cleanup()
     is.delta_bytes = is.get_total_bytes();
 }
 
-void SrsKbps::add_delta(IKbpsDelta* delta)
-{
-    srs_assert(delta);
-    
-    // update the total bytes
-    is.last_bytes += delta->get_recv_bytes_delta();
-    os.last_bytes += delta->get_send_bytes_delta();
-    
-    // we donot sample, please use sample() to do resample.
-}
-
-void SrsKbps::sample()
-{
-    // update the total bytes
-    if (os.io.out) {
-        os.last_bytes = os.io.out->get_send_bytes();
-    }
-    
-    if (is.io.in) {
-        is.last_bytes = is.io.in->get_recv_bytes();
-    }
-    
-    // resample
-    is.sample();
-    os.sample();
-}
-
 int SrsKbps::size_memory()
 {
     return sizeof(SrsKbps);
diff --git a/trunk/src/protocol/srs_protocol_kbps.hpp b/trunk/src/protocol/srs_protocol_kbps.hpp
index ae2ba9a4e..8f3e92d69 100644
--- a/trunk/src/protocol/srs_protocol_kbps.hpp
+++ b/trunk/src/protocol/srs_protocol_kbps.hpp
@@ -218,16 +218,6 @@ public:
     // 5m
     virtual int get_send_kbps_5m();
     virtual int get_recv_kbps_5m();
-// interface ISrsProtocolStatistic
-public:
-    virtual int64_t get_send_bytes();
-    virtual int64_t get_recv_bytes();
-// interface IKbpsDelta
-public:
-    virtual void resample();
-    virtual int64_t get_send_bytes_delta();
-    virtual int64_t get_recv_bytes_delta();
-    virtual void cleanup();
 public:
     /**
      * add delta to kbps clac mechenism.
@@ -244,6 +234,16 @@ public:
      *       use the add_delta() is better solutions.
      */
     virtual void sample();
+// interface ISrsProtocolStatistic
+public:
+    virtual int64_t get_send_bytes();
+    virtual int64_t get_recv_bytes();
+// interface IKbpsDelta
+public:
+    virtual void resample();
+    virtual int64_t get_send_bytes_delta();
+    virtual int64_t get_recv_bytes_delta();
+    virtual void cleanup();
 // interface ISrsMemorySizer
 public:
     virtual int size_memory();