tsdemux: pass TS continuity errors to subscriptions

diff --git a/src/input/mpegts/tsdemux.c b/src/input/mpegts/tsdemux.c
index 816cf8ccff0ea1f0287f35642a27a07dbb35beb9..753e7e5deb86106a311f2613b3c84fc58759c996 100644 (file)
--- a/src/input/mpegts/tsdemux.c
+++ b/src/input/mpegts/tsdemux.c
@@ -42,7 +42,7 @@
 
 #define TS_REMUX_BUFSIZE (188 * 100)
 
-static void ts_remux(mpegts_service_t *t, const uint8_t *tsb);
+static void ts_remux(mpegts_service_t *t, const uint8_t *tsb, int error);
 
 /**
  * Continue processing of transport stream packets
@@ -55,11 +55,11 @@ ts_recv_packet0
 
   service_set_streaming_status_flags((service_t*)t, TSS_MUX_PACKETS);
 
-  if(streaming_pad_probe_type(&t->s_streaming_pad, SMT_MPEGTS))
-    ts_remux(t, tsb);
-
-  if (!st)
+  if (!st) {
+    if(streaming_pad_probe_type(&t->s_streaming_pad, SMT_MPEGTS))
+      ts_remux(t, tsb, 0);
     return;
+  }
 
   error = !!(tsb[1] & 0x80);
   pusi  = !!(tsb[1] & 0x40);
@@ -79,11 +79,16 @@ ts_recv_packet0
 
       // Mark as error if this is not the first packet of a payload
       if(!pusi)
-        error |= 0x2;
+        error |= 2;
+        
+      error |= 4;
     }
     st->es_cc = (cc + 1) & 0xf;
   }
 
+  if(streaming_pad_probe_type(&t->s_streaming_pad, SMT_MPEGTS))
+    ts_remux(t, tsb, error);
+
   off = tsb[3] & 0x20 ? tsb[4] + 5 : 4;
 
   switch(st->es_type) {
@@ -97,12 +102,11 @@ ts_recv_packet0
 
     if(st->es_type == SCT_TELETEXT)
       teletext_input(t, st, tsb);
-
     if(off > 188)
       break;
 
     if(t->s_status == SERVICE_RUNNING)
-      parse_mpeg_ts((service_t*)t, st, tsb + off, 188 - off, pusi, error);
+      parse_mpeg_ts((service_t*)t, st, tsb + off, 188 - off, pusi, error & 3);
     break;
   }
 }
@@ -264,7 +268,7 @@ ts_recv_packet2(mpegts_service_t *t, const uint8_t *tsb)
  *
  */
 static void
-ts_remux(mpegts_service_t *t, const uint8_t *src)
+ts_remux(mpegts_service_t *t, const uint8_t *src, int error)
 {
   streaming_message_t sm;
   pktbuf_t *pb;
@@ -275,10 +279,14 @@ ts_remux(mpegts_service_t *t, const uint8_t *src)
 
   sbuf_append(sb, src, 188);
 
+  if (error)
+    sb->sb_err++;
+
   if(sb->sb_ptr < TS_REMUX_BUFSIZE) 
     return;
 
   pb = pktbuf_alloc(sb->sb_data, sb->sb_ptr);
+  pb->pb_err = sb->sb_err;
 
   sm.sm_type = SMT_MPEGTS;
   sm.sm_data = pb;

diff --git a/src/packet.h b/src/packet.h
index df361b2d1419b666de799baa6237885840cc07ab..33b4720aba3d394211cf4036b448319faddedfe2 100644 (file)
--- a/src/packet.h
+++ b/src/packet.h
@@ -25,6 +25,7 @@
 
 typedef struct pktbuf {
   int pb_refcount;
+  int pb_err;
   uint8_t *pb_data;
   size_t pb_size;
 } pktbuf_t;

diff --git a/src/subscriptions.c b/src/subscriptions.c
index c12eaf795680ef96ca6adfcc318fdeea326d957d..9748628bb56755867d2bd7093a42ac1cc311f55c 100644 (file)
--- a/src/subscriptions.c
+++ b/src/subscriptions.c
@@ -432,6 +432,8 @@ subscription_input_direct(void *opauqe, streaming_message_t *sm)
     s->ths_bytes_in += pkt->pkt_payload->pb_size;
   } else if(sm->sm_type == SMT_MPEGTS) {
     pktbuf_t *pb = sm->sm_data;
+    if(pb->pb_err)
+      s->ths_total_err += pb->pb_err;
     s->ths_bytes_in += pb->pb_size;
   }
 

diff --git a/src/tvheadend.h b/src/tvheadend.h
index 792400990adbeb0722df5c7c4ebabd37c27ef5aa..1528625f763e4c5e44b4f41fd67f0e02952f54f5 100644 (file)
--- a/src/tvheadend.h
+++ b/src/tvheadend.h
@@ -504,10 +504,10 @@ typedef struct streaming_queue {
  */
 typedef struct sbuf {
   uint8_t *sb_data;
-  int sb_ptr;
-  int sb_size;
-  unsigned int sb_err  : 1;
-  unsigned int sb_bswap: 1;
+  int      sb_ptr;
+  int      sb_size;
+  uint16_t sb_err;
+  uint8_t  sb_bswap;
 } sbuf_t;