Changeset 11300

Timestamp:

01/01/17 20:23:24 (6 years ago)

Author:

Gorgone Impertinence

Message:

add coolapi-legacy for COOLSTREAM HD1 and HD2

Location:

trunk

Files:

• Makefile (modified) (1 diff)
• module-dvbapi-coolapi-legacy.c (added)
• module-dvbapi-coolapi.c (modified) (1 diff)
• module-dvbapi.c (modified) (6 diffs)

trunk/Makefile

@@ -273 +273 @@
 SRC-$(CONFIG_WITH_AZBOX) += module-dvbapi-azbox.c
 SRC-$(CONFIG_WITH_MCA) += module-dvbapi-mca.c
-SRC-$(CONFIG_WITH_COOLAPI) += module-dvbapi-coolapi.c
+### SRC-$(CONFIG_WITH_COOLAPI) += module-dvbapi-coolapi.c 
+### experimental reversed API
+SRC-$(CONFIG_WITH_COOLAPI) += module-dvbapi-coolapi-legacy.c
 SRC-$(CONFIG_WITH_COOLAPI2) += module-dvbapi-coolapi.c
 SRC-$(CONFIG_WITH_SU980) += module-dvbapi-coolapi.c

trunk/module-dvbapi-coolapi.c

@@ -689 +689 @@
         coolapi_check_error("cnxt_dmx_close_filter", result);
     }
+    
+    // COOLAPI2 - We don't want to close Channel on no ECM Filters (Makes AU / EMMs work)
+    if(dmx->type != TYPE_ECM)
+        { return 0; }
+
     if (channel) {
         result = cnxt_dmx_channel_close(channel);

trunk/module-dvbapi.c

@@ -1125 +1125 @@
 int32_t dvbapi_stop_filter(int32_t demux_index, int32_t type)
 {
+    #if defined(WITH_COOLAPI) || defined(WITH_COOLAPI2)
+    // We prevented PAT and PMT from starting, so lets don't close them either.
+    if (type != TYPE_ECM && type != TYPE_EMM && type != TYPE_SDT) {
+        return 1;
+    }
+    #endif
+
     int32_t g, error = 0;
 
@@ -1372 +1379 @@
 void dvbapi_start_pat_filter(int32_t demux_index)
 {
+    #if defined(WITH_COOLAPI) || defined(WITH_COOLAPI2)
+        // PAT-Filter breaks API and OSCAM for Coolstream. 
+        // Don't use it
+        return;
+    #endif
+
     dvbapi_start_filter(demux_index, demux[demux_index].pidindex, 0x00, 0x001, 0x01, 0x00, 0xFF, 0, TYPE_PAT);
 }
@@ -1377 +1390 @@
 void dvbapi_start_pmt_filter(int32_t demux_index, int32_t pmt_pid)
 {
+    #if defined(WITH_COOLAPI) || defined(WITH_COOLAPI2)
+        // PMT-Filter breaks API and OSCAM for Coolstream. 
+        // Don't use it
+        return;
+    #endif
+
     uchar filter[16], mask[16];
     memset(filter, 0, 16);
@@ -3530 +3549 @@
     }
 
-    if(cfg.dvbapi_au > 0 && demux[demux_id].EMMpidcount == 0) // only do emm setup if au enabled and not running!
-    {
-        demux[demux_id].emm_filter = -1; // to register first run emmfilter start
-        if(demux[demux_id].emmstart.time == 1)   // irdeto fetch emm cat direct!
-        {
-            cs_ftime(&demux[demux_id].emmstart); // trick to let emm fetching start after 30 seconds to speed up zapping
-            dvbapi_start_filter(demux_id, demux[demux_id].pidindex, 0x001, 0x001, 0x01, 0x01, 0xFF, 0, TYPE_EMM); //CAT
-        }
-        else { cs_ftime(&demux[demux_id].emmstart); } // for all other caids delayed start!
-    }
-
     if(start_descrambling)
     {
@@ -3578 +3586 @@
         }
     }
+    
+    int32_t DoNotStartEMM = NULL;
+    #if defined(WITH_COOLAPI) || defined(WITH_COOLAPI2)
+        // Don't start and Stop EMM Filters over and over again if we are on FTA
+        if (dvbapi_client->last_caid == NO_CAID_VALUE) {
+            DoNotStartEMM = 1;
+        }
+    #endif
+    
+    if(cfg.dvbapi_au > 0 && demux[demux_id].EMMpidcount == 0 && !DoNotStartEMM) // only do emm setup if au enabled and not running!
+    {
+        demux[demux_id].emm_filter = -1; // to register first run emmfilter start
+        if(demux[demux_id].emmstart.time == 1)   // irdeto fetch emm cat direct!
+        {
+            cs_ftime(&demux[demux_id].emmstart); // trick to let emm fetching start after 30 seconds to speed up zapping
+            dvbapi_start_filter(demux_id, demux[demux_id].pidindex, 0x001, 0x001, 0x01, 0x01, 0xFF, 0, TYPE_EMM); //CAT
+        }
+        else { cs_ftime(&demux[demux_id].emmstart); } // for all other caids delayed start!
+    }
+
     return demux_id;
 }
@@ -6657 +6685 @@
     }
 #endif
-    #if defined WITH_COOLAPI || defined WITH_COOLAPI2
+    // Isn't implemented in COOLAPI-1 (legacy)
+    #if defined WITH_COOLAPI2
     case COOLAPI:
     {