add calc bitrate to tstools

2 files changed, 25 insertions, 1 deletions

diff --git a/lib/dvb/tstools.cpp b/lib/dvb/tstools.cpp
index 8e74b4c7..b83fd50a 100644
--- a/lib/dvb/tstools.cpp
+++ b/lib/dvb/tstools.cpp
@@ -1,4 +1,6 @@
+#include <config.h>
 #include <lib/dvb/tstools.h>
+#include <lib/base/eerror.h>
 #include <unistd.h>
 #include <fcntl.h>
 
@@ -148,3 +150,21 @@ int eDVBTSTools::calcLen(pts_t &len)
 	return 0;
 }
 
+int eDVBTSTools::calcBitrate()
+{
+	calcBegin(); calcEnd();
+	if (!(m_begin_valid && m_end_valid))
+		return -1;
+
+	pts_t len_in_pts = m_pts_end - m_pts_begin;
+	off_t len_in_bytes = m_offset_end - m_offset_begin;
+	
+	if (!len_in_pts)
+		return -1;
+	
+	unsigned long long bitrate = len_in_bytes * 90000 * 8 / len_in_pts;
+	if ((bitrate < 10000) || (bitrate > 100000000))
+		return -1;
+	
+	return bitrate;
+}
diff --git a/lib/dvb/tstools.h b/lib/dvb/tstools.h
index 4ec4b66a..509946de 100644
--- a/lib/dvb/tstools.h
+++ b/lib/dvb/tstools.h
@@ -9,7 +9,7 @@
  * thus we're not evaluating PES headers, not adaption fields.
  */
 
-typedef unsigned long long pts_t;
+typedef long long pts_t;
 
 class eDVBTSTools
 {
@@ -26,11 +26,15 @@ public:
 		/* get first PTS *after* the given offset. */
 	int getPTS(off_t &offset, pts_t &pts);
 	
+	int getPosition(off_t &offset, pts_t &pts);
+	
 	void calcBegin();
 	void calcEnd();
 	
 	int calcLen(pts_t &len);
 	
+	int calcBitrate(); /* in bits/sec */
+	
 private:
 	int m_fd, m_pid;
 	int m_maxrange;