0002-add-signal-status-in-HTSP.patch - Tvheadend

       tda->tda_allpids_dmx_fd = -1;
       tda->tda_dump_fd = -1;
       /* current signal status */
       tda->sig_status = malloc(sizeof(signal_status_t));
       tda->sig_status->snr         = -2;
       tda->sig_status->signal      = -2;
       tda->sig_status->ber         = -2;
       tda->sig_status->unc         = -2;
       tda->sig_status->status      = -2;
       tda->sig_status->status_text = NULL;
       tda->sig_status->name        = NULL;
       pthread_mutex_init(&tda->sig_status_update_mutex, NULL);
       return tda;
+    }

+    {
       th_dvb_adapter_t *tda = aux;
       fe_status_t fe_status;
       int status, v, update = 0, vv, i, fec, q;
       int status, v, update = 0, vv, i, fec, q, ber, signal, snr;
       th_dvb_mux_instance_t *tdmi = tda->tda_mux_current;
       char buf[50];
-...
         } else {
           status = TDMI_FE_CONSTANT_FEC;
+        }
         /* bit error rate */
         if (ioctl(tda->tda_fe_fd, FE_READ_BER, &ber) == -1)
           ber = -2;
         /* signal strength */
         if (ioctl(tda->tda_fe_fd, FE_READ_SIGNAL_STRENGTH, &signal) == -1)
           signal = -2;
         /* signal/noise ratio */
         if (ioctl(tda->tda_fe_fd, FE_READ_SNR, &snr) == -1)
           snr = -2;
+      }
       if(status != tdmi->tdmi_fe_status) {
-...
+        }
+      }
       /* update transport status */
       pthread_mutex_lock(&tda->sig_status_update_mutex);
       tda->sig_status->ber =    ber;
       tda->sig_status->signal = signal;
       tda->sig_status->snr =    snr;
       tda->sig_status->status = fe_status;
       tda->sig_status->unc =    fec;
       tvh_str_update(&tda->sig_status->status_text, dvb_mux_status(tdmi));
       pthread_mutex_unlock(&tda->sig_status_update_mutex);
       if(update) {
         htsmsg_t *m = htsmsg_create_map();

       int tda_allpids_dmx_fd;
       int tda_dump_fd;
       pthread_mutex_t sig_status_update_mutex;
       signal_status_t *sig_status; /* current signal status */
     } th_dvb_adapter_t;
-...
     htsmsg_t *dvb_transport_build_msg(th_transport_t *t);
     void dvb_transport_get_signal_status(th_transport_t *current_transport,
                        signal_status_t *status);
     /**
      * DVB Frontend

       htsmsg_add_str(m, "adapterId", tdmi->tdmi_adapter->tda_identifier);
       notify_by_msg("dvbService", m);
+    }
     /**
      * Get the signal status from a DVB transport
      */
     void
     dvb_transport_get_signal_status(th_transport_t *current_transport,
                      signal_status_t *status)
+    {
       if (current_transport && current_transport->tht_dvb_mux_instance &&
                   current_transport->tht_dvb_mux_instance->tdmi_adapter)
+      {
         th_dvb_adapter_t *tda =
                 current_transport->tht_dvb_mux_instance->tdmi_adapter;
         pthread_mutex_lock(&tda->sig_status_update_mutex);
         status->ber =         tda->sig_status->ber;
         status->signal =      tda->sig_status->signal;
         status->snr =         tda->sig_status->snr;
         status->status =      tda->sig_status->status;
         status->unc =         tda->sig_status->unc;
         status->status_text = strdup(tda->sig_status->status_text);
         status->name =        strdup(tda->tda_displayname);
         pthread_mutex_unlock(&tda->sig_status_update_mutex);
+      }
+    }

     } htsp_subscription_t;
     static void htsp_get_signal_status(htsp_subscription_t *hs, signal_status_t *status);
     /**
+     *
-...
       htsp_connection_t *htsp = hs->hs_htsp;
       int64_t ts;
       int qlen = hs->hs_q.hmq_payload;
       signal_status_t *status = malloc(sizeof(signal_status_t));
       if((qlen > 500000 && pkt->pkt_frametype == PKT_B_FRAME) ||
          (qlen > 750000 && pkt->pkt_frametype == PKT_P_FRAME) ||
-...
       htsp_send(htsp, m, pkt->pkt_payload, &hs->hs_q, pktbuf_len(pkt->pkt_payload));
       if(hs->hs_last_report != dispatch_clock) {
         /* Send a queue status report every second */
         /* Send a queue and signal status report every second */
         htsp_get_signal_status(hs, status);
         hs->hs_last_report = dispatch_clock;
-...
         htsmsg_add_u32(m, "Pdrops", hs->hs_dropstats[PKT_P_FRAME]);
         htsmsg_add_u32(m, "Idrops", hs->hs_dropstats[PKT_I_FRAME]);
         /* add the signal status */
         if (status->status_text != NULL)
           htsmsg_add_str(m, "feStatus", status->status_text);
         htsmsg_add_u32(m, "feSNR",      status->snr);
         htsmsg_add_u32(m, "feSignal",   status->signal);
         htsmsg_add_u32(m, "feBER",      status->ber);
         htsmsg_add_u32(m, "feUNC",      status->unc);
         /* add the tuner name */
         if (status->name != NULL)
           htsmsg_add_str(m, "feName",   status->name);
         /* We use a special queue for queue status message so they're not
            blocked by anything else */
-...
+      }
       streaming_msg_free(sm);
+    }
     /**
      * Adds the signal status of the adapter used by a subscription
      */
     static void
     htsp_get_signal_status(htsp_subscription_t *hs, signal_status_t *status)
+    {
       status->status_text = NULL;
       status->name        = NULL;
       status->status      = 0;
       status->snr         = -2;
       status->signal      = -2;
       status->ber         = -2;
       status->unc         = -2;
       // get signal status from the current transport
       if (hs->hs_s && hs->hs_s->ths_transport)
+      {
         return get_signal_status_from_transport(hs->hs_s->ths_transport, status);
+      }
+    }

       return 0;
+    }
     /**
      * Get the signal status from a transport
      */
     void
     get_signal_status_from_transport(th_transport_t *current_transport,
                      signal_status_t *status)
+    {
       if (current_transport)
+      {
         // get signal status from the transport
         switch (current_transport->tht_type)
+        {
           case TRANSPORT_DVB:
             dvb_transport_get_signal_status(current_transport, status);
             break;
           case TRANSPORT_V4L:
             //TODO add signal status from a V4L adapter
             break;
           case TRANSPORT_IPTV:
             //TODO add signal status from an IPTV adapter
             break;
+        }
+      }
+    }

tvheadend-patch/src/transports.h 2010-11-06 14:50:26.095507576 +0100
100	100
101	101	uint16_t get_encryption_from_transport(th_transport_t *t);
102	102
	103	void get_signal_status_from_transport(th_transport_t *current_transport,
	104	signal_status_t *status);
	105
103	106	#endif /* TRANSPORTS_H */

     #define SCT_ISVIDEO(t) ((t) == SCT_MPEG2VIDEO || (t) == SCT_H264)
     #define SCT_ISAUDIO(t) ((t) == SCT_MPEG2AUDIO || (t) == SCT_AC3 || \
                             (t) == SCT_AAC)
     /**
      * The signal status of a tuner
      */
     typedef struct signal_status {
       char *name;        /* adapter name */
       char *status_text; /* adapter status text */
       int status;        /* adapter status code */
       uint16_t snr;      /* signal/noise ratio */
       uint16_t signal;   /* signal strength */
       uint32_t ber;      /* bit error rate */
       uint32_t unc;      /* uncorrected blocks */
     } signal_status_t;
     /**
      * A streaming pad generates data.
      * It has one or more streaming targets attached to it.

Project

General

Profile

Tvheadend

Feature #300 » 0002-add-signal-status-in-HTSP.patch