X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/dba614edd2aad3c17e244914eaef3809d8300cb1..1da41232bbb095c380dcc2cfb33b7114f05e8ced:/lib/dvb/esection.h

diff --git a/lib/dvb/esection.h b/lib/dvb/esection.h
index df0b93e5..3e097ccc 100644
--- a/lib/dvb/esection.h
+++ b/lib/dvb/esection.h
@@ -1,26 +1,31 @@
 #ifndef __esection_h
 #define __esection_h
 
-#include <lib/dvb/isection.h>
+#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;
 	
-	eTimer *m_timeout;
+	unsigned int m_tries;
+	
+	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; }
@@ -36,40 +41,46 @@ private:
 	std::vector<Section*> sections;
 	std::set<int> avail;
 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)
+		{
+			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];
+
 		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())
-				printf("+");
+				TABLE_eDebugNoNewLine("+");
 			else
-				printf("-");
+				TABLE_eDebugNoNewLine("-");
 				
-		printf(" %d/%d TID %02x\n", avail.size(), max, data[0]);
+		TABLE_eDebug(" %zd/%d TID %02x", avail.size(), max, data[0]);
 
 		if (avail.size() == max)
 		{
-			printf("done!\n");
+			TABLE_eDebug("done!");
 			return 1;
 		} else
 			return 0;
 	}
 public:
 	std::vector<Section*> &getSections() { return sections; }
-	eTable(): eGTable()
+	eTable(bool debug=true): eGTable(debug)
 	{
 	}
 	~eTable()
 	{
-		for (typename std::vector<Section*>::iterator i(sections.begin()); i != sections.end(); ++i)
-			delete *i;
+		for (std::set<int>::iterator i(avail.begin()); i != avail.end(); ++i)
+			delete sections[*i];
 	}
 };
 
@@ -89,6 +100,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()
@@ -97,11 +112,18 @@ public:
 
 	~eAUTable()
 	{
-		current=next=0;
+		stop();
+	}
+	
+	void stop()
+	{
+		current = next = 0;
+		m_demux = 0;
 	}
 	
 	int begin(eMainloop *m, const eDVBTableSpec &spec, ePtr<iDVBDemux> demux)
 	{
+		m_table_cnt = 0;
 		ml = m;
 		m_demux = demux;
 		first= 1;
@@ -172,7 +194,7 @@ public:
 		next=0;
 		first=0;
 		
-		assert(current->ready);
+		ASSERT(current->ready);
 			
 		/*emit*/ tableReady(0);
 		
@@ -180,6 +202,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);