lib/dvb/tstools.h/cpp: make eDVBTSTool thread safe (i.e. this fixes seeking in timesh...

[vuplus_dvbapp] / lib / dvb / tstools.h

diff --git a/lib/dvb/tstools.h b/lib/dvb/tstools.h
index a8e0751..ed8b924 100644 (file)
--- a/lib/dvb/tstools.h
+++ b/lib/dvb/tstools.h
@@ -4,6 +4,7 @@
 #include <sys/types.h>
 #include <lib/dvb/pvrparse.h>
 #include <lib/base/rawfile.h>
+#include <lib/base/elock.h>
 
 /*
  * Note: we're interested in PTS values, not STC values.
@@ -56,13 +57,29 @@ public:
        
        int findPMT(int &pmt_pid, int &service_id);
        
-       int findIFrame(off_t &offset, size_t &len, int direction);
+       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;
-       
+
+       eSingleLock m_file_lock;
        eRawFile m_file;
-       
+
        int m_begin_valid, m_end_valid;
        pts_t m_pts_begin, m_pts_end;
        off_t m_offset_begin, m_offset_end;