X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Ftstools.h;h=9d66efc175ec06a6d7dfa26e8b0eac5147f0968e;hp=4bc04729c42056c3ab645ce46cb5a56249f0cb2f;hb=fe619dbed1c9bf14a0d442cc16d7e968769bbcc0;hpb=bbfcb7ea1f040d030277e2b6f2efa9ea0967bf2b

diff --git a/lib/dvb/tstools.h b/lib/dvb/tstools.h
index 4bc0472..9d66efc 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.
@@ -18,9 +19,12 @@ public:
 	eDVBTSTools();
 	~eDVBTSTools();
 
+	void setSource(ePtr<iTsSource> &source, const char *streaminfo_filename=NULL);
+	void closeSource();
+
 	int openFile(const char *filename, int nostreaminfo = 0);
 	void closeFile();
-	
+
 	void setSyncPID(int pid);
 	void setSearchRange(int maxrange);
 	
@@ -55,12 +59,29 @@ 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 &_iframe_offset, 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;
-	
-	eRawFile m_file;
-	
+
+	ePtr<iTsSource> m_source;
+
 	int m_begin_valid, m_end_valid;
 	pts_t m_pts_begin, m_pts_end;
 	off_t m_offset_begin, m_offset_end;