Changeset 11331

Timestamp:

01/14/17 11:38:58 (6 years ago)

Author:

theparasol

Message:

DVBAPI:

• more fix for ticket #4486 (thanks ua2Ahfieghah)

Location:

trunk

Files:

• module-dvbapi.c (modified) (8 diffs)
• module-dvbapi.h (modified) (1 diff)

trunk/module-dvbapi.c

@@ -1762 +1762 @@
 }
 
+static pthread_mutex_t lockindex = PTHREAD_MUTEX_INITIALIZER;
+
 ca_index_t dvbapi_get_descindex(int32_t demux_index, int32_t pid, int32_t stream_id)
 {
@@ -1767 +1769 @@
     ca_index_t idx = 0;
     uint32_t tmp_idx;
-
-    static pthread_mutex_t lockindex;
-    static int8_t init_mutex = 0;
-    
-    if(init_mutex == 0)
-    {
-        SAFE_MUTEX_INIT(&lockindex, NULL);
-        init_mutex = 1; 
-    }
     
     if(cfg.dvbapi_boxtype == BOXTYPE_NEUMO)
@@ -1998 +1991 @@
     
     memset(&demux[demux_id], 0 , sizeof(DEMUXTYPE));
+    SAFE_MUTEX_INIT(&demux[demux_id].answerlock, NULL);
     for(i = 0; i < ECM_PIDS; i++)
     {
@@ -4077 +4071 @@
 }
 
-static pthread_mutex_t event_handler_lock;
-static int8_t init_mutex = 0;
+static pthread_mutex_t event_handler_lock = PTHREAD_MUTEX_INITIALIZER;
 
 void event_handler(int32_t UNUSED(signal))
@@ -4089 +4082 @@
     uchar mbuf[2048]; // dirty fix: larger buffer needed for CA PMT mode 6 with many parallel channels to decode
     if(dvbapi_client != cur_client()) { return; }
-    
-    if(init_mutex == 0)
-    {
-        SAFE_MUTEX_INIT(&event_handler_lock, NULL);
-        init_mutex = 1; 
-    }
 
     SAFE_MUTEX_LOCK(&event_handler_lock);
@@ -5179 +5166 @@
     for(i = 0; i < MAX_DEMUX; i++)
     {
+        SAFE_MUTEX_INIT(&demux[i].answerlock, NULL);
         for(j = 0; j < ECM_PIDS; j++)
         {
@@ -5186 +5174 @@
             }
         }
+        demux[i].pidindex = -1;
+        demux[i].curindex = -1;
     }
     
@@ -5983 +5973 @@
 
         if(er->rc < E_NOTFOUND && cfg.dvbapi_requestmode == 1 && er->caid != 0) // FOUND
-        {
-            if(demux[i].init_mutex == 0)
-            {
-                SAFE_MUTEX_INIT(&demux[i].answerlock, NULL);
-                demux[i].init_mutex = 1;    
-            }
-            
+        {   
             SAFE_MUTEX_LOCK(&demux[i].answerlock); // only process one ecm answer
             

trunk/module-dvbapi.h

@@ -210 +210 @@
     uint8_t old_emmfiltercount; // previous emm filtercount
     pthread_mutex_t answerlock; // requestmode 1 avoid race
-    int8_t init_mutex;
 #ifdef WITH_STAPI
     uint32_t DescramblerHandle[PTINUM];