Changeset 11518 for trunk/module-dvbapi.c

Timestamp:

05/05/19 11:42:54 (4 years ago)

Author:

Gorgone Impertinence

Message:

DVBAPI:
Fixed bug in dvbapi not releasing used descramblers in stapi, coolapi and gxapi boxes
Increased MAX_STREAM_INDICES back to 32 (it must be equal to MAX_STREAM_PIDS)
Modified the get_emm_filter_adv() function to accept more arguments

OTHER:
Cosmetics to module-cccam.c and module-cccam-cacheex.x
Removed some emu specific code not needed anymore

File:

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

trunk/module-dvbapi.c

@@ -1884 +1884 @@
                         if(rdr->typ == R_EMU)
                         {
-                            csystem->get_emm_filter_adv(rdr, &dmx_filter, &filter_count, caid, provid, demux[demux_id].program_number);
+                            csystem->get_emm_filter_adv(rdr, &dmx_filter, &filter_count, caid, provid, demux[demux_id].program_number,
+                                                        demux[demux_id].tsid, demux[demux_id].onid, demux[demux_id].ens);
                         }
                         else
@@ -2259 +2260 @@
     }
 
-    // make sure we haven't run out of descramblers
-    if(ca_descramblers_used < ca_descramblers_total)
-    {
-        ca_descramblers_used++; // increase number of descramblers used
-    }
-    else
-    {
-        idx = INDEX_INVALID; // we don't have any descramblers left
+    if(selected_api == DVBAPI_3 || selected_api == DVBAPI_1)
+    {
+        // make sure we haven't run out of descramblers
+        if(ca_descramblers_used < ca_descramblers_total)
+        {
+            ca_descramblers_used++; // increase number of descramblers used
+        }
+        else
+        {
+            idx = INDEX_INVALID; // we don't have any descramblers left
+        }
+    }
+    else // old style check for STAPI, COOLAPI, etc
+    {
+        if(idx > ca_descramblers_total)
+        {
+            idx = INDEX_INVALID; // we don't have any descramblers left
+        }
     }