Merge branch 'master' of git.opendreambox.org:/git/enigma2

[vuplus_dvbapp] / lib / dvb / tstools.h

diff --git a/lib/dvb/tstools.h b/lib/dvb/tstools.h
index b6a275d..c230a34 100644 (file)
--- a/lib/dvb/tstools.h
+++ b/lib/dvb/tstools.h
@@ -18,7 +18,7 @@ public:
        eDVBTSTools();
        ~eDVBTSTools();
 
-       int openFile(const char *filename);
+       int openFile(const char *filename, int nostreaminfo = 0);
        void closeFile();
        
        void setSyncPID(int pid);
@@ -40,7 +40,7 @@ public:
        int fixupPTS(const off_t &offset, pts_t &pts);
        
                /* get (approximate) offset corresponding to PTS */
-       int getOffset(off_t &offset, pts_t &pts);
+       int getOffset(off_t &offset, pts_t &pts, int marg=0);
        
        int getNextAccessPoint(pts_t &ts, const pts_t &start, int direction);
        
@@ -51,6 +51,27 @@ public:
        
        int calcBitrate(); /* in bits/sec */
        
+       void takeSamples();
+       int takeSample(off_t off, pts_t &p);
+       
+       int findPMT(int &pmt_pid, int &service_id);
+       
+       enum { 
+               frametypeI = 1, 
+               frametypeP = 2, 
+               frametypeB = 4, 
+               frametypeAll = frametypeI | frametypeP | frametypeB
+       };
+       /** findFrame: finds a specific frame at a given position
+       
+       findFrame will look for the specified frame type starting at the given position, moving forward
+       (when direction is >0) or backward (when direction is <0). (direction=0 is a special case and also moves
+       forward, but starts with the last frame.)
+       
+       return values are the new offset, the length of the found frame (both unaligned), and the (signed) 
+       number of frames skipped. */
+       int findFrame(off_t &offset, size_t &len, int &direction, int frame_types = frametypeI);
+       int findNextPicture(off_t &offset, size_t &len, int &distance, int frame_types = frametypeAll);
 private:
        int m_pid;
        int m_maxrange;
@@ -61,8 +82,14 @@ private:
        pts_t m_pts_begin, m_pts_end;
        off_t m_offset_begin, m_offset_end;
        
+               /* for simple linear interpolation */
+       std::map<pts_t, off_t> m_samples;
+       int m_samples_taken;
+       
        eMPEGStreamInformation m_streaminfo;
        int m_use_streaminfo;
+       off_t m_last_filelength;
+       int m_futile;
 };
 
 #endif