X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/dd59dbf670d3da8b6d566b724c8a718374d5ca89..d7ab8980f447224e6ece5d741dd9a334949ca315:/lib/dvb/tstools.h

diff --git a/lib/dvb/tstools.h b/lib/dvb/tstools.h
index f5df8c48..99827921 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);
 	
@@ -40,7 +44,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);
 	
@@ -52,15 +56,32 @@ public:
 	int calcBitrate(); /* in bits/sec */
 	
 	void takeSamples();
-	int eDVBTSTools::takeSample(off_t off, pts_t &p);
+	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;
-	
-	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;