Changeset 3083

Timestamp:

06/22/09 21:51:10 (9 months ago)

Author:

andoma

Message:

Figure out if we need to re-save a transport configuration instead of relying on if we've seen it once, it can not change

Location:

trunk/tvheadend/src

Files:

• dvb/dvb_adapter.c (modified) (1 diff)
• psi.c (modified) (8 diffs)
• rawtsinput.c (modified) (1 diff)
• transports.c (modified) (3 diffs)
• transports.h (modified) (1 diff)
• tvhead.h (modified) (1 diff)

trunk/tvheadend/src/dvb/dvb_adapter.c

@@ -372 +372 @@
       LIST_FOREACH(st_src, &t_src->tht_components, st_link) {
 
-        st_dst = transport_add_stream(t_dst, 
-                                      st_src->st_pid,
-                                      st_src->st_type);
+        st_dst = transport_stream_create(t_dst, 
+                                         st_src->st_pid,
+                                         st_src->st_type);
         
         st_dst->st_tb = (AVRational){1, 90000};

trunk/tvheadend/src/psi.c

@@ -93 +93 @@
 
     if(prognum != 0) {
-      st = transport_add_stream(t, pid, SCT_PMT);
-      st->st_section_docrc = 1;
-      st->st_got_section = pmt_callback;
-
+      if(transport_stream_find(t, pid) == NULL) {
+        st = transport_stream_create(t, pid, SCT_PMT);
+        st->st_section_docrc = 1;
+        st->st_got_section = pmt_callback;
+      }
     }
     ptr += 4;
@@ -165 +166 @@
 
 
+/**
+ * Parser for CA descriptor
+ */
+static int
+psi_desc_ca(th_transport_t *t, uint8_t *ptr)
+{
+  uint16_t pid = (ptr[2] & 0x1f) << 8 | ptr[3];
+  th_stream_t *st;
+  int r = 0;
+  uint16_t caid = (ptr[0] << 8) | ptr[1];
+
+  if((st = transport_stream_find(t, pid)) == NULL) {
+    st = transport_stream_create(t, pid, SCT_CA);
+    r = 1;
+  }
+
+  if(st->st_caid != caid) {
+    st->st_caid = caid;
+    r = 1;
+  }
+  return r;
+}
 
 /** 
  * PMT parser, from ISO 13818-1 and ETSI EN 300 468
  */
-
 int
 psi_parse_pmt(th_transport_t *t, uint8_t *ptr, int len, int chksvcid)
@@ -182 +204 @@
   char lang[4];
   int frameduration;
+  int need_save = 0;
+
   if(len < 9)
     return -1;
@@ -191 +215 @@
   dllen   = (ptr[7] & 0xf) << 8 | ptr[8];
   
-  t->tht_pcr_pid = pcr_pid;
+  if(chksvcid && sid != t->tht_dvb_service_id)
+    return -1;
+
+  if(t->tht_pcr_pid != pcr_pid) {
+    t->tht_pcr_pid = pcr_pid;
+    need_save = 1;
+  }
 
   ptr += 9;
   len -= 9;
-
-  if(chksvcid && sid != t->tht_dvb_service_id)
-    return -1;
 
   while(dllen > 1) {
@@ -209 +236 @@
     switch(dtag) {
     case DVB_DESC_CA:
-      st = transport_add_stream(t, (ptr[2] & 0x1f) << 8 | ptr[3], SCT_CA);
-      st->st_caid = (ptr[0] << 8) | ptr[1];
+      need_save |= psi_desc_ca(t, ptr);
       break;
 
@@ -263 +289 @@
       switch(dtag) {
       case DVB_DESC_CA:
-        st = transport_add_stream(t, (ptr[2] & 0x1f) << 8 | ptr[3], SCT_CA);
-        st->st_caid = (ptr[0] << 8) | ptr[1];
+        need_save |= psi_desc_ca(t, ptr);
         break;
 
@@ -297 +322 @@
 
     if(hts_stream_type != 0) {
-      st = transport_add_stream(t, pid, hts_stream_type);
+
+      if((st = transport_stream_find(t, pid)) == NULL) {
+        need_save = 1;
+        st = transport_stream_create(t, pid, hts_stream_type);
+      }
+
       st->st_tb = (AVRational){1, 90000};
-      memcpy(st->st_lang, lang, 4);
-
-      if(st->st_frame_duration == 0)
+
+      if(memcmp(st->st_lang, lang, 4)) {
+        need_save = 1;
+        memcpy(st->st_lang, lang, 4);
+      }
+
+      if(st->st_frame_duration == 0 && frameduration != 0) {
         st->st_frame_duration = frameduration;
-    }
-  }
-
-  if(t->tht_pmt_seen == 0)
+        need_save = 1;
+      }
+    }
+  }
+
+  if(need_save)
     t->tht_config_change(t);
 
-  t->tht_pmt_seen = 1;
   return 0;
 }
@@ -636 +671 @@
       continue;
 
-    st = transport_add_stream(t, pid, type);
+    st = transport_stream_create(t, pid, type);
     st->st_tb = (AVRational){1, 90000};
     

trunk/tvheadend/src/rawtsinput.c

@@ -196 +196 @@
       if(t != NULL) {
         pthread_mutex_lock(&t->tht_stream_mutex);
-        st = transport_add_stream(t, pid, SCT_PMT);
-        st->st_section_docrc = 1;
-        st->st_got_section = got_pmt;
+
+        if(transport_stream_find(t, pid) == NULL) {
+          st = transport_stream_create(t, pid, SCT_PMT);
+          st->st_section_docrc = 1;
+          st->st_got_section = got_pmt;
+        }
         pthread_mutex_unlock(&t->tht_stream_mutex);
       }

trunk/tvheadend/src/transports.c

@@ -472 +472 @@
 /**
  * Add a new stream to a transport
- *
- * 
  */
 th_stream_t *
-transport_add_stream(th_transport_t *t, int pid,
-                     streaming_component_type_t type)
+transport_stream_create(th_transport_t *t, int pid,
+                        streaming_component_type_t type)
 {
   th_stream_t *st;
   int i = 0;
-
+ 
   lock_assert(&t->tht_stream_mutex);
 
@@ -491 +489 @@
 
   if(t->tht_flags & THT_DEBUG)
-      tvhlog(LOG_DEBUG, "transport", "%s: Add stream \"%s\", pid: %d",
-             t->tht_identifier, streaming_component_type2txt(type), pid);
+    tvhlog(LOG_DEBUG, "transport", "%s: Add stream \"%s\", pid: %d",
+           t->tht_identifier, streaming_component_type2txt(type), pid);
 
   st = calloc(1, sizeof(th_stream_t));
@@ -507 +505 @@
   avgstat_init(&st->st_rate, 10);
   avgstat_init(&st->st_cc_errors, 10);
+
   return st;
 }
+
+
+
+/**
+ * Add a new stream to a transport
+ */
+th_stream_t *
+transport_stream_find(th_transport_t *t, int pid)
+{
+  th_stream_t *st;
+ 
+  lock_assert(&t->tht_stream_mutex);
+
+  LIST_FOREACH(st, &t->tht_components, st_link) {
+    if(st->st_pid == pid)
+      return st;
+  }
+  return NULL;
+}
+
 
 

trunk/tvheadend/src/transports.h

@@ -43 +43 @@
 th_transport_t *transport_find(channel_t *ch, unsigned int weight);
 
-th_stream_t *transport_add_stream(th_transport_t *t, int pid,
-                                  streaming_component_type_t type);
+th_stream_t *transport_stream_find(th_transport_t *t, int pid);
+
+th_stream_t *transport_stream_create(th_transport_t *t, int pid,
+                                     streaming_component_type_t type);
 
 void transport_set_priority(th_transport_t *t, int prio);

trunk/tvheadend/src/tvhead.h

@@ -579 +579 @@
 
   /**
-   * Set if we've seen the PMT. Used to avoid (re)saving the transport
-   * for everytime we see a PMT. 
-   * XXX: Not very good, should be replaced with more intelligent
-   * code in psi.c
-   */
-  int tht_pmt_seen;
-
-
+   * List of all components.
+   */
   struct th_stream_list tht_components;