X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Ftstools.h;h=ed8b9241f285c74189a6078cc778621dc8ecc8ae;hp=1316825390391782b63b072e10a5deacfcb349a5;hb=b64b791cb481944585fceaf5bcac9e2c699dbeb0;hpb=7fe561a6df44e7d71ff436a84bfd7e8881d24373

diff --git a/lib/dvb/tstools.h b/lib/dvb/tstools.h
index 1316825..ed8b924 100644
--- 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.
@@ -40,7 +41,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);
 	
@@ -55,12 +56,30 @@ public:
 	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;
-	
+
+	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;