Changeset 10808

Timestamp:

10/29/11 20:48:34 (11 years ago)

Author:

nit

Message:

[titan] optimize epg read funktion

Location:

titan/titan

Files:

• epg.h (modified) (7 diffs)
• struct.h (modified) (1 diff)

titan/titan/epg.h

@@ -1153 +1153 @@
                 }
 #endif
-                //set timer to akttime
-                if(flag == 0) status.epgtimer = time(NULL);
-                if(flag == 1) status.epgscantimer = time(NULL);
 
                 epgnode = addepg(tmpchnode, HILO(evt->event_id), eit->version_number, starttime, endtime, NULL, 1);
@@ -1333 +1330 @@
         struct dvbdev* dmxnode;
         struct eit* eit = NULL;
+        unsigned long seen[16] = {0};
+        unsigned long firstseen[16] = {0};
+        int roundend = 0, round = 0x4e, i = 0;
+        time_t akttime, roundstart;
 
         buf = malloc(MINMALLOC * 4);
@@ -1359 +1360 @@
         dmxsetbuffersize(dmxnode, getconfigint("dmxepgbuffersize", NULL));
         dmxsetsource(dmxnode, fenode->fedmxsource);
-        dmxsetfilter(dmxnode, 0x12, 0, 5);
 
 #ifdef SIMULATE
@@ -1369 +1369 @@
         }
 #endif
-        if(flag == 0) status.epgtimer = time(NULL);
-        if(flag == 1) status.epgscantimer = time(NULL);
+
+        for(i = 2; i < 16; i++) firstseen[i] = 1;
+        roundstart = time(NULL);
+        dmxsetfilter(dmxnode, 0x12, 0, 8);
         while(self->aktion != STOP && self->aktion != PAUSE)
         {
+                akttime = time(NULL);
+                roundend = 1;
+
+                //check end of epg infos
+                for(i = 0; i < 16; i++)
+                {
+                        if(roundstart + 5 < akttime && firstseen[i] == 0)
+                                firstseen[i] = 1;
+                        if(roundstart + 30 < akttime && firstseen[i] != 1)
+                                firstseen[i] = 1;
+                        if(firstseen[i] != 1)
+                                roundend = 0;
+                }
+                
+                if(roundend == 1)
+                {
+                        for(i = 0; i < 16; i++)
+                        {
+                                seen[i] = 0;
+                                firstseen[i] = 0;
+                        }
+
+                        roundend = 0;
+                        pos = 0;
+                        head = buf;
+
+                        if(round == 0x60)
+                        {
+                                dmxstop(dmxnode);
+                                if(flag == 1) goto end;
+                                debug(400, "epg no more new data, wait for next run");
+                                while(self->aktion != STOP && self->aktion != PAUSE)
+                                {
+                                        if(count > 10 * 60 * 20) break; //20 min
+                                        count++;
+                                        usleep(100000);
+                                }
+                                count = 0;
+                                debug(400, "epg next run start");
+                        }
+                        if(round == 0x4e)
+                        {
+                                dmxsetfilter(dmxnode, 0x12, 0, 6);
+                                round = 0x50;
+                        }
+                        else if(round == 0x50)
+                        {
+                                dmxsetfilter(dmxnode, 0x12, 0, 7);
+                                round = 0x60;
+                        }
+                        else if(round == 0x60)
+                        {
+                                dmxsetfilter(dmxnode, 0x12, 0, 8);
+                                for(i = 2; i < 16; i++) firstseen[i] = 1;
+                                round = 0x4e;
+                        }
+                        roundstart = time(NULL);
+                        continue;
+                }
+        
                 if(pos < 3) goto read_more;
 
@@ -1380 +1442 @@
                 if (pos < len) goto read_more;
                 
-                if(eit->table_id < 0x4e || eit->table_id > 0x6f)
-                {
-                        err("epg table id");
-                        pos -= len;
-                        head += len;
-                        goto read_more;
-                }
-
-                if(dvbcrc32((uint8_t *)head, len) == 0)
-                        parseeit(chnode, head, len, flag);
-                else
-                {
-                        err("epg crc");
+                if(eit->table_id - round < 0 || eit->table_id - round > 15 || dvbcrc32((uint8_t *)head, len) != 0)
+                {
+                        err("epg crc or table id not ok");
                         dmxstop(dmxnode);
                         dmxstart(dmxnode);
@@ -1399 +1451 @@
                         goto read_more;
                 }
+
+                seen[eit->table_id - round] = (eit->table_id << 24) | (HILO(eit->service_id) << 8) | eit->section_number;
+
+                if(firstseen[eit->table_id - round] == 0)
+                        firstseen[eit->table_id - round] = seen[eit->table_id - round];
+                else if(firstseen[eit->table_id - round] == seen[eit->table_id - round])
+                        firstseen[eit->table_id - round] = 1;
+
+                parseeit(chnode, head, len, flag);
 
                 //remove packet
@@ -1431 +1492 @@
                 usleep(1000);
 #endif
-                if(flag == 1 && status.epgscantimer < time(NULL) - 3) goto end;
-                if(flag == 0 && status.epgtimer < time(NULL) - 3)
-                {
-                        debug(400, "epg no more new data, wait for next run");
-                        dmxstop(dmxnode);
-                        pos = 0;
-                        head = buf;
-                        while(self->aktion != STOP && self->aktion != PAUSE && status.epgtimer < time(NULL) - 3)
-                        {
-                                if(count > 2 * 60 * 20) break; //20 min
-                                count++;
-                                usleep(500000);
-                        }
-                        count = 0;
-                        status.epgtimer = time(NULL);
-                        dmxstart(dmxnode);
-                        debug(400, "epg next run start");
-                }
                 if(readlen < 0) readlen = 0;
                 head = buf;

titan/titan/struct.h

@@ -894 +894 @@
         // httpd thread pointer
         struct stimerthread* httpthread;
-        // got new epg if 0 and stop it no new epg for a spezified period
-        time_t epgtimer;
-        // same as epgtimer for epgscan
-        time_t epgscantimer;
         struct service* aktservice;
         struct service* lastservice;