Changeset 9756

Timestamp:

06/03/14 23:17:07 (10 years ago)

Author:

theparasol

Message:

DVBAPI Enhancement:
It's same as the new TCP mode, but using the unix named socket (one socket covers whole communication requirements).
The tvheadend supports this access.

Tnx Perexg for providing patch!

Location:

trunk

Files:

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

trunk/module-dvbapi.c

@@ -88 +88 @@
 struct s_client *dvbapi_client;
 
-const char *boxdesc[] = { "none", "dreambox", "duckbox", "ufs910", "dbox2", "ipbox", "ipbox-pmt", "dm7000", "qboxhd", "coolstream", "neumo", "pc" };
+const char *boxdesc[] = { "none", "dreambox", "duckbox", "ufs910", "dbox2", "ipbox", "ipbox-pmt", "dm7000", "qboxhd", "coolstream", "neumo", "pc", "pc-nodmx" };
 
 static const struct box_devices devices[BOX_COUNT] =
@@ -449 +449 @@
     {
     case DVBAPI_3:
-        if (cfg.dvbapi_listenport)
+        if (cfg.dvbapi_listenport || cfg.dvbapi_boxtype == BOXTYPE_PC_NODMX)
             ret = demux[demux_id].demux_fd[n].fd = DUMMY_FD;
         else
@@ -487 +487 @@
             memcpy(sFP2.filter.filter, filt, 16);
             memcpy(sFP2.filter.mask, mask, 16);
-            if (cfg.dvbapi_listenport)
+            if (cfg.dvbapi_listenport || cfg.dvbapi_boxtype == BOXTYPE_PC_NODMX)
                 ret = dvbapi_net_filter_request(demux_id, n, &sFP2);
             else
@@ -566 +566 @@
         return 1;
     }
+    if (cfg.dvbapi_boxtype == BOXTYPE_PC_NODMX) {
+        selected_api = DVBAPI_3;
+        selected_box = 1;
+        cs_log("[DVBAPI] Using %s listen socket, API forced to DVBAPIv3 (%d), userconfig boxtype: %d", devices[selected_box].cam_socket_path, selected_api, cfg.dvbapi_boxtype);
+        return 1;
+    }
     int32_t i = 0, n = 0, devnum = -1, dmx_fd = 0, boxnum = sizeof(devices) / sizeof(struct box_devices);
     char device_path[128], device_path2[128];
@@ -635 +641 @@
     char device_path[128], device_path2[128];
 
+    if(cfg.dvbapi_boxtype == BOXTYPE_PC_NODMX)
+        return DUMMY_FD;
+    
     if(type == 0)
     {
@@ -772 +781 @@
         {
         case DVBAPI_3:
-            if (cfg.dvbapi_listenport)
+            if (cfg.dvbapi_listenport || cfg.dvbapi_boxtype == BOXTYPE_PC_NODMX)
                 retfilter = dvbapi_net_filter_request(demux_index, num, NULL);
             else
@@ -810 +819 @@
         }
 #ifndef WITH_COOLAPI // no fd close for coolapi and stapi, all others do close fd!
-        if (!cfg.dvbapi_listenport)
+        if (!cfg.dvbapi_listenport && cfg.dvbapi_boxtype != BOXTYPE_PC_NODMX)
         {
             retfd = close(fd);
@@ -1360 +1369 @@
                     ca_pid2.index = idx;
 
-                    if(cfg.dvbapi_boxtype == BOXTYPE_PC)
+                    if(cfg.dvbapi_boxtype == BOXTYPE_PC || cfg.dvbapi_boxtype == BOXTYPE_PC_NODMX)
                     {
                         // preparing packet
@@ -1370 +1379 @@
 
                         // sending data to UDP (deprecated, will be removed in the future)
-                        send(currentfd, &packet[1], sizeof(packet)-1, 0);
+                        if (cfg.dvbapi_boxtype != BOXTYPE_PC_NODMX)
+                          send(currentfd, &packet[1], sizeof(packet)-1, 0);
                         cs_debug_mask(D_DVBAPI, "[DVBAPI] Demuxer #%d %s stream #%d pid=0x%04x index=%d on ca%d", demux_id,
                             (enable ? "enable" : "disable"), num + 1, ca_pid2.pid, ca_pid2.index, i);
@@ -2372 +2382 @@
     }
 #endif
+    cs_debug_mask(D_DVBAPI, "[DVBAPI] GET_CW");
     get_cw(client, er);
 #if defined WITH_AZBOX || defined WITH_MCA
@@ -2452 +2463 @@
     }
 
-    if(cfg.dvbapi_boxtype == BOXTYPE_PC && buffer[7] == 0x82 && buffer[8] == 0x02)
+    if((cfg.dvbapi_boxtype == BOXTYPE_PC || cfg.dvbapi_boxtype == BOXTYPE_PC_NODMX) && buffer[7] == 0x82 && buffer[8] == 0x02)
     {
         *demux_index = buffer[9]; // it is always 0 but you never know
@@ -2952 +2963 @@
     pthread_mutex_lock(&event_handler_lock);
 
-    if(cfg.dvbapi_boxtype == BOXTYPE_PC)
+    if(cfg.dvbapi_boxtype == BOXTYPE_PC || cfg.dvbapi_boxtype == BOXTYPE_PC_NODMX)
         { pausecam = 0; }
     else
@@ -3624 +3635 @@
             for(g = 0; g < MAX_FILTER; g++)
             {
-                if(!cfg.dvbapi_listenport && demux[i].demux_fd[g].fd > 0 && selected_api != STAPI && selected_api != COOLAPI)
+                if(!cfg.dvbapi_listenport && cfg.dvbapi_boxtype != BOXTYPE_PC_NODMX && demux[i].demux_fd[g].fd > 0 && selected_api != STAPI && selected_api != COOLAPI)
                 {
                     pfd2[pfdcount].fd = demux[i].demux_fd[g].fd;
@@ -3848 +3859 @@
                             if (len > 0)
                                 pmtlen += len;
-                            if (cfg.dvbapi_listenport && len == 0) {
+                            if ((cfg.dvbapi_listenport || cfg.dvbapi_boxtype == BOXTYPE_PC_NODMX) && len == 0) {
                                 //client disconnects, stop all assigned decoding
                                 for (j = 0; j < MAX_DEMUX; j++)
@@ -3870 +3881 @@
                                     if (pmtlen > chunksize)
                                         memmove(mbuf, mbuf + chunksize, pmtlen - chunksize);
+                                    
                                     pmtlen -= chunksize;
                                     continue;
@@ -4029 +4041 @@
                     }
 
-                    if(cfg.dvbapi_boxtype == BOXTYPE_PC)
+                    if(cfg.dvbapi_boxtype == BOXTYPE_PC || cfg.dvbapi_boxtype == BOXTYPE_PC_NODMX)
                     {
                         // preparing packet
@@ -4579 +4591 @@
             memcpy(sFP2.filter.filter, filter, 16);
             memcpy(sFP2.filter.mask, mask, 16);
-            if (cfg.dvbapi_listenport)
+            if (cfg.dvbapi_listenport || cfg.dvbapi_boxtype == BOXTYPE_PC_NODMX)
                 ret = dvbapi_net_filter_request(demux_index, num, &sFP2);
             else

trunk/module-dvbapi.h

@@ -38 +38 @@
 #define BOXTYPE_NEUMO   10
 #define BOXTYPE_PC      11
-#define BOXTYPES        11
+#define BOXTYPE_PC_NODMX    12
+#define BOXTYPES        12
 #define DMXMD5HASHSIZE  16  // use MD5() 
 #define REMOVED_STREAMPID_LASTINDEX 2