X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fesection.h;h=6efe8c38b54f6774aa42605341b76a01551cfe3d;hp=d7fd728a2b3ad50e23723a7272218e5125bb584a;hb=9d9d69d8242d27915c95cb794bd4e7a93759b6db;hpb=4dfae02c457922170d52822bed2c80bd82152d3f

diff --git a/lib/dvb/esection.h b/lib/dvb/esection.h
index d7fd728..6efe8c3 100644
--- a/lib/dvb/esection.h
+++ b/lib/dvb/esection.h
@@ -4,25 +4,28 @@
 #include <lib/dvb/idemux.h>
 #include <set>
 
+#define TABLE_eDebug(x...) do { if (m_debug) eDebug(x); } while(0)
+#define TABLE_eDebugNoNewLine(x...) do { if (m_debug) eDebugNoNewLine(x); } while(0)
+
 class eGTable: public iObject, public Object
 {
-DECLARE_REF(eGTable);
-private:
+	DECLARE_REF(eGTable);
 	ePtr<iDVBSectionReader> m_reader;
 	eDVBTableSpec m_table;
 	
 	unsigned int m_tries;
 	
-	eTimer *m_timeout;
+	ePtr<eTimer> m_timeout;
 
 	void sectionRead(const __u8 *data);
 	void timeout();
 	ePtr<eConnection> m_sectionRead_conn;
 protected:
-	virtual int createTable(int nr, const __u8 *data, unsigned int max)=0;
+	bool m_debug;
+	virtual int createTable(unsigned int nr, const __u8 *data, unsigned int max)=0;
 public:
 	Signal1<void, int> tableReady;
-	eGTable();
+	eGTable(bool debug=true);
 	RESULT start(iDVBSectionReader *reader, const eDVBTableSpec &table);
 	RESULT start(iDVBDemux *reader, const eDVBTableSpec &table);
 	RESULT getSpec(eDVBTableSpec &spec) { spec = m_table; return 0; }
@@ -37,41 +40,46 @@ class eTable: public eGTable
 private:
 	std::vector<Section*> sections;
 	std::set<int> avail;
+	unsigned char m_section_data[4096];
 protected:
-	int createTable(int nr, const __u8 *data, unsigned int max)
+	int createTable(unsigned int nr, const __u8 *data, unsigned int max)
 	{
 		unsigned int ssize = sections.size();
 		if (max < ssize || nr >= max)
 		{
-			eDebug("kaputt max(%d) < ssize(%d) || nr(%d) >= max(%d)",
+			TABLE_eDebug("kaputt max(%d) < ssize(%d) || nr(%d) >= max(%d)",
 				max, ssize, nr, max);
 			return 0;
 		}
 		if (avail.find(nr) != avail.end())
 			delete sections[nr];
 
+		memset(m_section_data, 0, 4096);
+		memcpy(m_section_data, data, 4096);
+
 		sections.resize(max);
 		sections[nr] = new Section(data);
 		avail.insert(nr);
 
 		for (unsigned int i = 0; i < max; ++i)
 			if (avail.find(i) != avail.end())
-				eDebugNoNewLine("+");
+				TABLE_eDebugNoNewLine("+");
 			else
-				eDebugNoNewLine("-");
+				TABLE_eDebugNoNewLine("-");
 				
-		eDebug(" %d/%d TID %02x", avail.size(), max, data[0]);
+		TABLE_eDebug(" %zd/%d TID %02x", avail.size(), max, data[0]);
 
 		if (avail.size() == max)
 		{
-			eDebug("done!");
+			TABLE_eDebug("done!");
 			return 1;
 		} else
 			return 0;
 	}
 public:
 	std::vector<Section*> &getSections() { return sections; }
-	eTable(): eGTable()
+	unsigned char* getBufferData() { return m_section_data; }
+	eTable(bool debug=true): eGTable(debug)
 	{
 	}
 	~eTable()
@@ -97,6 +105,10 @@ class eAUTable: public eAUGTable
 	int first;
 	ePtr<iDVBDemux> m_demux;
 	eMainloop *ml;
+
+	/* needed to detect broken table version handling (seen on some m2ts files) */
+	struct timespec m_prev_table_update;
+	int m_table_cnt;
 public:
 
 	eAUTable()
@@ -116,6 +128,7 @@ public:
 	
 	int begin(eMainloop *m, const eDVBTableSpec &spec, ePtr<iDVBDemux> demux)
 	{
+		m_table_cnt = 0;
 		ml = m;
 		m_demux = demux;
 		first= 1;
@@ -186,7 +199,7 @@ public:
 		next=0;
 		first=0;
 		
-		assert(current->ready);
+		ASSERT(current->ready);
 			
 		/*emit*/ tableReady(0);
 		
@@ -194,6 +207,24 @@ public:
 
 		if (current && (!current->getSpec(spec)))
 		{
+			/* detect broken table version handling (seen on some m2ts files) */
+			if (m_table_cnt)
+			{
+				if (abs(timeout_usec(m_prev_table_update)) > 500000)
+					m_table_cnt = -1;
+				else if (m_table_cnt > 1) // two pmt update within one second
+				{
+					eDebug("Seen two consecutive table version changes within 500ms. "
+					    "This seems broken, so auto update for pid %04x, table %02x is now disabled!!",
+					    spec.pid, spec.tid);
+					m_table_cnt = 0;
+					return;
+				}
+			}
+
+			++m_table_cnt;
+			clock_gettime(CLOCK_MONOTONIC, &m_prev_table_update);
+
 			next = new Table();
 			CONNECT(next->tableReady, eAUTable::slotTableReady);
 			spec.flags &= ~(eDVBTableSpec::tfAnyVersion|eDVBTableSpec::tfThisVersion|eDVBTableSpec::tfHaveTimeout);