Changeset 10655

Timestamp:

05/05/15 15:56:56 (9 years ago)

Author:

theparasol

Message:

dvbapi:

• Reworked capmt handling
• Some log cosmetics

File:

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

trunk/module-dvbapi.c

@@ -2606 +2606 @@
     cs_log_dump_dbg(D_DVBAPI, buffer, length, "capmt:");
     cs_log_dbg(D_DVBAPI, "Receiver sends PMT command %d for channel %04X", ca_pmt_list_management, program_number);
-    if((ca_pmt_list_management == LIST_FIRST || ca_pmt_list_management == LIST_ONLY))
-    {
-        for(i = 0; i < MAX_DEMUX; i++)
-        {
-            if(cfg.dvbapi_pmtmode == 6 && pmt_stopmarking == 1) { continue; } // already marked channels that need to stop -> skip!
-            if(demux[i].program_number == 0) { continue; }  // skip empty demuxers
-            if(demux[i].ECMpidcount != 0 && demux[i].pidindex != -1 ) { demux[i].running = 1; }  // mark if channel is already descrambling and running
-            if(demux[i].socket_fd != connfd) { continue; }  // skip demuxers belonging to other ca pmt connection
-            if(cfg.dvbapi_pmtmode == 6)
-            {
-                demux[i].stopdescramble = 1; // Mark for deletion if not used again by following pmt objects.
-                cs_log_dbg(D_DVBAPI, "Marked demuxer %d/%d (srvid = %04X fd = %d) to stop decoding", i, MAX_DEMUX, demux[i].program_number, connfd);
-            }
-        }
-        pmt_stopmarking = 1;
+    
+    for(i = 0; i < MAX_DEMUX && !pmt_stopmarking; i++, pmt_stopmarking = (i == MAX_DEMUX)) // only mark running and deleting for first pmt record
+    {
+        if(demux[i].program_number == 0) { continue; }  // skip empty demuxers
+        if(demux[i].ECMpidcount != 0 && demux[i].pidindex != -1 ) 
+        { 
+            cs_log_dbg(D_DVBAPI, "Marked demuxer %d/%d (srvid = %04X fd = %d ecmpids = %d pidindex = %d) as already running", i, MAX_DEMUX,
+                demux[i].program_number, connfd, demux[i].ECMpidcount, demux[i].pidindex);
+            demux[i].running = 1; }  // mark if channel is already descrambling and running
+        if(demux[i].socket_fd != connfd) { continue; }  // skip demuxers belonging to other ca pmt connection
+        if(ca_pmt_list_management == LIST_FIRST || ca_pmt_list_management == LIST_ONLY)
+        {
+            demux[i].stopdescramble = 1; // Mark for deletion if not used again by following pmt objects.
+            cs_log_dbg(D_DVBAPI, "Marked demuxer %d/%d (srvid = %04X fd = %d) to stop decoding", i, MAX_DEMUX, demux[i].program_number, connfd);
+        }
     }
     getDemuxOptions(i, buffer, &ca_mask, &demux_index, &adapter_index, &pmtpid);
@@ -2662 +2662 @@
     }
 
-    // stop descramble old demuxers from this ca pmt connection that arent used anymore
-    if((ca_pmt_list_management == LIST_LAST) || (ca_pmt_list_management == LIST_ONLY))
+    // start using the new list
+    if(ca_pmt_list_management != LIST_FIRST && ca_pmt_list_management != LIST_MORE)
     {
         for(j = 0; j < MAX_DEMUX; j++)
@@ -2881 +2881 @@
     }
 
-    if(demux[demux_id].running == 0) // only do emm setup on non-running channels!
+    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(cfg.dvbapi_au > 0 && demux[demux_id].emmstart.time == 1)   // irdeto fetch emm cat direct!
+        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
@@ -2937 +2937 @@
 
         if(k > 0)
-            cs_log_dump_dbg(D_DVBAPI, buffer + k, len - k, "Parsing next PMT object(s):");
+            cs_log_dump_dbg(D_DVBAPI, buffer + k, len - k, "Parsing next PMT object:");
 
         if(buffer[3 + k] & 0x80)
@@ -4093 +4093 @@
                                     if ((opcode & 0xFFFFF000) == DVBAPI_AOT_CA)
                                     {
-                                        cs_log_dump_dbg(D_DVBAPI, mbuf, chunksize, "Parsing %d PMT object(s):", chunks_processed);
+                                        cs_log_dump_dbg(D_DVBAPI, mbuf, chunksize, "Parsing PMT object %d:", chunks_processed);
                                         dvbapi_handlesockmsg(mbuf, chunksize, connfd);
                                         add_to_poll = 0;