tsmpegdecoder: set audio type

[enigma2.git] / lib / dvb / tstools.cpp

diff --git a/lib/dvb/tstools.cpp b/lib/dvb/tstools.cpp
index 5d1c7e354ae747d58d1b7ee26d1abcd0a5ec64c9..81e62dd256e6e3cf03b18cb03f23f57e76993bd0 100644 (file)
--- 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>
 
@@ -8,7 +10,7 @@ eDVBTSTools::eDVBTSTools()
 {
        m_fd = -1;
        m_pid = -1;
-       m_maxrange = 1*1024*1024;
+       m_maxrange = 256*1024;
        
        m_begin_valid = 0;
        m_end_valid = 0;
@@ -48,8 +50,6 @@ int eDVBTSTools::getPTS(off_t &offset, pts_t &pts)
 {
        if (m_fd < 0)
                return -1;
-       if (m_pid < 0)
-               return -1;
 
        offset -= offset % 188;
        
@@ -82,8 +82,9 @@ int eDVBTSTools::getPTS(off_t &offset, pts_t &pts)
                
 //             printf("PID %04x, PUSI %d\n", pid, pusi);
                
-               if (pid != m_pid)
-                       continue;
+               if (m_pid >= 0)
+                       if (pid != m_pid)
+                               continue;
                if (!pusi)
                        continue;
                
@@ -91,7 +92,7 @@ int eDVBTSTools::getPTS(off_t &offset, pts_t &pts)
                unsigned char *pes;
                
                        /* check for adaption field */
-               if (block[3] & 0x10)
+               if (block[3] & 0x20)
                        pes = block + block[4] + 4 + 1;
                else
                        pes = block + 4;
@@ -111,7 +112,7 @@ int eDVBTSTools::getPTS(off_t &offset, pts_t &pts)
                        return 0;
                }
        }
-
+       
        return -1;
 }
 
@@ -132,11 +133,22 @@ void eDVBTSTools::calcEnd()
        if (m_fd < 0)   
                return;
        
-       if (!m_end_valid)
+       m_offset_end = lseek(m_fd, 0, SEEK_END);
+       
+       int maxiter = 10;
+       
+       while (!m_end_valid)
        {
-               m_offset_end = lseek(m_fd, 0, SEEK_END) - m_maxrange;
+               if (!--maxiter)
+                       return;
+               
+               m_offset_end -= m_maxrange;
+               if (m_offset_end < 0)
+                       m_offset_end = 0;
                if (!getPTS(m_offset_end, m_pts_end))
                        m_end_valid = 1;
+               if (!m_offset_end)
+                       return;
        }
 }
 
@@ -149,3 +161,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;
+}