From e7fd309cb0369d99e9a7042bac403a27bdc6c7c9 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Tue, 7 Apr 2015 10:30:45 +0800
Subject: [PATCH] refine hls info, show the deviation in seconds and pieces.

---
 trunk/src/app/srs_app_hls.cpp | 11 +++++++++--
 trunk/src/app/srs_app_hls.hpp |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/trunk/src/app/srs_app_hls.cpp b/trunk/src/app/srs_app_hls.cpp
index 87e208d3f..74031ee2a 100644
--- a/trunk/src/app/srs_app_hls.cpp
+++ b/trunk/src/app/srs_app_hls.cpp
@@ -272,6 +272,13 @@ double SrsHlsMuxer::deviation()
     return hls_fragment_deviation;
 }
 
+int SrsHlsMuxer::absolute_deviation()
+{
+    // accept the floor ts for the first piece.
+    int64_t floor_ts = (int64_t)(srs_get_system_time_ms() / (1000 * hls_fragment));
+    return (int)(accept_floor_ts - (floor_ts - 1));
+}
+
 int SrsHlsMuxer::initialize(ISrsHlsHandler* h)
 {
     int ret = ERROR_SUCCESS;
@@ -1203,9 +1210,9 @@ void SrsHls::hls_show_mux_log()
         // the run time is not equals to stream time,
         // @see: https://github.com/winlinvip/simple-rtmp-server/issues/81#issuecomment-48100994
         // it's ok.
-        srs_trace("-> "SRS_CONSTS_LOG_HLS" time=%"PRId64", stream dts=%"PRId64"(%"PRId64"ms), sequence_no=%d, ts=%s, duration=%.2f, deviation=%.2f",
+        srs_trace("-> "SRS_CONSTS_LOG_HLS" time=%"PRId64", stream dts=%"PRId64"(%"PRId64"ms), sno=%d, ts=%s, dur=%.2f, dva=%.2fs/%dp",
             pprint->age(), stream_dts, stream_dts / 90, muxer->sequence_no(), muxer->ts_url().c_str(),
-            muxer->duration(), muxer->deviation());
+            muxer->duration(), muxer->deviation(), muxer->absolute_deviation());
     }
 }
 
diff --git a/trunk/src/app/srs_app_hls.hpp b/trunk/src/app/srs_app_hls.hpp
index e0d17e8f3..03f3e0cfc 100644
--- a/trunk/src/app/srs_app_hls.hpp
+++ b/trunk/src/app/srs_app_hls.hpp
@@ -237,6 +237,7 @@ public:
     virtual std::string ts_url();
     virtual double duration();
     virtual double deviation();
+    virtual int absolute_deviation();
 public:
     /**
     * initialize the hls muxer.