Changeset 1657

Timestamp:

02/23/10 09:43:38 (12 years ago)

Author:

_network

Message:

module-dvbapi: fix crash on mips architecture

File:

• trunk/module-dvbapi.c (modified) (4 diffs)

trunk/module-dvbapi.c

@@ -57 +57 @@
     unsigned char lastcw0[8];
     unsigned char lastcw1[8];
-    pthread_t descramble_thread; 
-    unsigned int thread_active; 
 } DEMUXTYPE;
 #define DMX_FILTER_SIZE 16
@@ -425 +423 @@
         close(demux[demux_id].demux_emm_fd);
         demux[demux_id].demux_emm_fd=0;
-    }
-
-    if (demux[demux_id].thread_active == 0) { 
-        pthread_cancel(demux[demux_id].descramble_thread);
-        pthread_join(demux[demux_id].descramble_thread, NULL);
-        demux[demux_id].thread_active = -1;
     }
 
@@ -879 +871 @@
     if (demux[demux_id].ECMpidcount>0) {
         dvbapi_resort_ecmpids(demux_id);
-        if (demux[demux_id].ECMpidcount>0) {}
-            demux[demux_id].thread_active=pthread_create(&demux[demux_id].descramble_thread, NULL, thread_descrambling, (void*)demux_id);
+        if (demux[demux_id].ECMpidcount>0) {
+            pthread_t p3;
+            if (pthread_create(&p3, NULL, thread_descrambling, (void*)demux_id))
+                cs_log("dvbapi: pthread error");
+        }
     }
 
@@ -1047 +1042 @@
         demux[i].ca_fd=0;
         demux[i].demux_index=-1;
-        demux[i].thread_active = -1; 
         memset(demux[i].buffer_cache_dmx,0 ,12);
     }