scan.cpp: more robust streamtype detection for pat scan.. use libdvbsi++ to parse...

[enigma2.git] / lib / dvb / esection.h

diff --git a/lib/dvb/esection.h b/lib/dvb/esection.h
index 2d71eef8531922151dcefc9c8dac396a98ae2651..2bb17a98e5a70fb9321788bc608be7f254351687 100644 (file)
--- a/lib/dvb/esection.h
+++ b/lib/dvb/esection.h
@@ -4,23 +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;
        
-       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(" %d/%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];
        }
 };
 
@@ -97,7 +108,13 @@ public:
 
        ~eAUTable()
        {
-               current=next=0;
+               stop();
+       }
+       
+       void stop()
+       {
+               current = next = 0;
+               m_demux = 0;
        }
        
        int begin(eMainloop *m, const eDVBTableSpec &spec, ePtr<iDVBDemux> demux)
@@ -172,7 +189,7 @@ public:
                next=0;
                first=0;
                
-               assert(current->ready);
+               ASSERT(current->ready);
                        
                /*emit*/ tableReady(0);