mpegts input: implement MPEGTS_DATA_CC_RESTART

diff --git a/src/input/mpegts.h b/src/input/mpegts.h
index 6253f339361e7d6798b934dc008787c6a79767f6..4f47f100a1b35724dd83ec740f603dc99b682574 100644 (file)
--- a/src/input/mpegts.h
+++ b/src/input/mpegts.h
@@ -49,6 +49,7 @@ typedef struct mpegts_input         mpegts_input_t;
 typedef struct mpegts_table_feed    mpegts_table_feed_t;
 typedef struct mpegts_network_link  mpegts_network_link_t;
 typedef struct mpegts_packet        mpegts_packet_t;
+typedef struct mpegts_pcr           mpegts_pcr_t;
 typedef struct mpegts_buffer        mpegts_buffer_t;
 
 /* Lists */
@@ -121,9 +122,18 @@ struct mpegts_packet
   TAILQ_ENTRY(mpegts_packet)  mp_link;
   size_t                      mp_len;
   mpegts_mux_t               *mp_mux;
+  uint8_t                     mp_cc_restart;
   uint8_t                     mp_data[0];
 };
 
+struct mpegts_pcr {
+  int64_t  pcr_first;
+  int64_t  pcr_last;
+  uint16_t pcr_pid;
+};
+
+#define MPEGTS_DATA_CC_RESTART (1<<0)
+
 typedef int (*mpegts_table_callback_t)
   ( mpegts_table_t*, const uint8_t *buf, int len, int tableid );
 
@@ -894,7 +904,7 @@ void mpegts_mux_update_pids ( mpegts_mux_t *mm );
 
 void mpegts_input_recv_packets
   (mpegts_input_t *mi, mpegts_mux_instance_t *mmi, sbuf_t *sb,
-   int64_t *pcr_first, int64_t *pcr_last, uint16_t *pcr_pid);
+   int flags, mpegts_pcr_t *pcr);
 
 int mpegts_input_get_weight ( mpegts_input_t *mi, mpegts_mux_t *mm, int flags );
 int mpegts_input_get_priority ( mpegts_input_t *mi, mpegts_mux_t *mm, int flags );

diff --git a/src/input/mpegts/iptv/iptv.c b/src/input/mpegts/iptv/iptv.c
index 08b0adbd5ed06f25d01f59f15d7425f06a2183b8..dc0bf335a1e85c269c680872334c82610c53855a 100644 (file)
--- a/src/input/mpegts/iptv/iptv.c
+++ b/src/input/mpegts/iptv/iptv.c
@@ -506,14 +506,30 @@ iptv_input_pause_handler ( iptv_mux_t *im, int pause )
     tvhpoll_add(iptv_poll, &ev, 1);
 }
 
+void
+iptv_input_recv_flush ( iptv_mux_t *im )
+{
+  mpegts_mux_instance_t *mmi = im->mm_active;
+
+  if (mmi == NULL)
+    return;
+  mpegts_input_recv_packets((mpegts_input_t*)iptv_input, mmi,
+                            &im->mm_iptv_buffer, MPEGTS_DATA_CC_RESTART,
+                            NULL);
+}
+
 int
 iptv_input_recv_packets ( iptv_mux_t *im, ssize_t len )
 {
   static time_t t1 = 0, t2;
   iptv_network_t *in = (iptv_network_t*)im->mm_network;
   mpegts_mux_instance_t *mmi;
-  int64_t pcr_first = PTS_UNSET, pcr_last = PTS_UNSET, s64;
+  mpegts_pcr_t pcr;
+  int64_t s64;
 
+  pcr.pcr_first = PTS_UNSET;
+  pcr.pcr_last  = PTS_UNSET;
+  pcr.pcr_pid   = im->im_pcr_pid;
   in->in_bps += len * 8;
   time(&t2);
   if (t2 != t1) {
@@ -537,23 +553,23 @@ iptv_input_recv_packets ( iptv_mux_t *im, ssize_t len )
       return 1;
     }
     mpegts_input_recv_packets((mpegts_input_t*)iptv_input, mmi,
-                              &im->mm_iptv_buffer,
-                              &pcr_first, &pcr_last, &im->im_pcr_pid);
-    if (pcr_first != PTS_UNSET && pcr_last != PTS_UNSET) {
+                              &im->mm_iptv_buffer, 0, &pcr);
+    if (pcr.pcr_first != PTS_UNSET && pcr.pcr_last != PTS_UNSET) {
+      im->im_pcr_pid = pcr.pcr_pid;
       if (im->im_pcr == PTS_UNSET) {
-        s64 = pts_diff(pcr_first, pcr_last);
+        s64 = pts_diff(pcr.pcr_first, pcr.pcr_last);
         if (s64 != PTS_UNSET) {
-          im->im_pcr = pcr_first;
+          im->im_pcr = pcr.pcr_first;
           im->im_pcr_start = getmonoclock();
           im->im_pcr_end = im->im_pcr_start + ((s64 * 100LL) + 50LL) / 9LL;
           tvhtrace("iptv-pcr", "pcr: first %"PRId64" last %"PRId64", time start %"PRId64", end %"PRId64,
-                   pcr_first, pcr_last, im->im_pcr_start, im->im_pcr_end);
+                   pcr.pcr_first, pcr.pcr_last, im->im_pcr_start, im->im_pcr_end);
         }
       } else {
-        s64 = pts_diff(im->im_pcr, pcr_last);
+        s64 = pts_diff(im->im_pcr, pcr.pcr_last);
         if (s64 != PTS_UNSET) {
           im->im_pcr_end = im->im_pcr_start + ((s64 * 100LL) + 50LL) / 9LL;
-          tvhtrace("iptv-pcr", "pcr: last %"PRId64", time end %"PRId64, pcr_last, im->im_pcr_end);
+          tvhtrace("iptv-pcr", "pcr: last %"PRId64", time end %"PRId64, pcr.pcr_last, im->im_pcr_end);
         }
       }
       if (iptv_input_pause_check(im)) {

diff --git a/src/input/mpegts/iptv/iptv_http.c b/src/input/mpegts/iptv/iptv_http.c
index 466196b5c631cfc1be8436f1395cb4ff1732a94a..b4b1b41540882505a46d073081f182f7cfe5778f 100644 (file)
--- a/src/input/mpegts/iptv/iptv_http.c
+++ b/src/input/mpegts/iptv/iptv_http.c
@@ -166,11 +166,13 @@ iptv_http_header ( http_client_t *hc )
 
   hp->m3u_header = 0;
   hp->off = 0;
+  pthread_mutex_lock(&global_lock);
   if (!hp->started) {
-    pthread_mutex_lock(&global_lock);
     iptv_input_mux_started(hp->im);
-    pthread_mutex_unlock(&global_lock);
+  } else {
+    iptv_input_recv_flush(hp->im);
   }
+  pthread_mutex_unlock(&global_lock);
   hp->started = 1;
   return 0;
 }

diff --git a/src/input/mpegts/iptv/iptv_private.h b/src/input/mpegts/iptv/iptv_private.h
index 68eae0d5ede66008cd214338dd2243ea10715201..a96213af87711d55776621b513a2a20e34d650a7 100644 (file)
--- a/src/input/mpegts/iptv/iptv_private.h
+++ b/src/input/mpegts/iptv/iptv_private.h
@@ -67,6 +67,7 @@ struct iptv_input
 int  iptv_input_fd_started ( iptv_mux_t *im );
 void iptv_input_mux_started ( iptv_mux_t *im );
 int  iptv_input_recv_packets ( iptv_mux_t *im, ssize_t len );
+void iptv_input_recv_flush ( iptv_mux_t *im );
 void iptv_input_pause_handler ( iptv_mux_t *im, int pause );
 
 struct iptv_network

diff --git a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
index aae3b756ff1cd6b013802f8533481efb94ba0f55..baf20cac42001fee66864201d3d0e964c25ef132 100644 (file)
--- a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
@@ -1136,7 +1136,7 @@ linuxdvb_frontend_input_thread ( void *aux )
     }
     
     /* Process */
-    mpegts_input_recv_packets((mpegts_input_t*)lfe, mmi, &sb, NULL, NULL, NULL);
+    mpegts_input_recv_packets((mpegts_input_t*)lfe, mmi, &sb, 0, NULL);
   }
 
   sbuf_free(&sb);

diff --git a/src/input/mpegts/mpegts_input.c b/src/input/mpegts/mpegts_input.c
index 6f5e8d7571f87cd7b4179c55564f5f99c7ce6f3e..7cf8937e505e0be44099e13f56d31d6576c6394c 100644 (file)
--- a/src/input/mpegts/mpegts_input.c
+++ b/src/input/mpegts/mpegts_input.c
@@ -977,7 +977,7 @@ ts_sync_count ( const uint8_t *tsb, int len )
 void
 mpegts_input_recv_packets
   ( mpegts_input_t *mi, mpegts_mux_instance_t *mmi, sbuf_t *sb,
-    int64_t *pcr_first, int64_t *pcr_last, uint16_t *pcr_pid )
+    int flags, mpegts_pcr_t *pcr )
 {
   int len2 = 0, off = 0;
   mpegts_packet_t *mp;
@@ -986,7 +986,7 @@ mpegts_input_recv_packets
 #define MIN_TS_PKT 100
 #define MIN_TS_SYN (5*188)
 
-  if (len < (MIN_TS_PKT * 188)) {
+  if (len < (MIN_TS_PKT * 188) && (flags & MPEGTS_DATA_CC_RESTART) == 0) {
     /* For slow streams, check also against the clock */
     if (dispatch_clock == mi->mi_last_dispatch)
       return;
@@ -1008,24 +1008,24 @@ mpegts_input_recv_packets
   //       require per mmi buffers, where this is generally not required)
 
   /* Extract PCR on demand */
-  if (pcr_first && pcr_last && pcr_pid) {
+  if (pcr) {
     uint8_t *tmp, *end;
     uint16_t pid;
     for (tmp = tsb, end = tsb + len2; tmp < end; tmp += 188) {
       pid = ((tmp[1] & 0x1f) << 8) | tmp[2];
-      if (*pcr_pid == MPEGTS_PID_NONE || *pcr_pid == pid) {
-        if (get_pcr(tmp, pcr_first)) {
-          *pcr_pid = pid;
+      if (pcr->pcr_pid == MPEGTS_PID_NONE || pcr->pcr_pid == pid) {
+        if (get_pcr(tmp, &pcr->pcr_first)) {
+          pcr->pcr_pid = pid;
           break;
         }
       }
     }
-    if (*pcr_pid != MPEGTS_PID_NONE) {
+    if (pcr->pcr_pid != MPEGTS_PID_NONE) {
       for (tmp = tsb + len2 - 188; tmp >= tsb; tmp -= 188) {
         pid = ((tmp[1] & 0x1f) << 8) | tmp[2];
-        if (*pcr_pid == pid) {
-          if (get_pcr(tmp, pcr_last)) {
-            *pcr_pid = pid;
+        if (pcr->pcr_pid == pid) {
+          if (get_pcr(tmp, &pcr->pcr_last)) {
+            pcr->pcr_pid = pid;
             break;
           }
         }
@@ -1034,10 +1034,11 @@ mpegts_input_recv_packets
   }
 
   /* Pass */
-  if (len2 >= MIN_TS_SYN) {
+  if (len2 >= MIN_TS_SYN || (flags & MPEGTS_DATA_CC_RESTART)) {
     mp = malloc(sizeof(mpegts_packet_t) + len2);
-    mp->mp_mux  = mmi->mmi_mux;
-    mp->mp_len  = len2;
+    mp->mp_mux        = mmi->mmi_mux;
+    mp->mp_len        = len2;
+    mp->mp_cc_restart = (flags & MPEGTS_DATA_CC_RESTART) ? 1 : 0;
     memcpy(mp->mp_data, tsb, len2);
 
     len -= len2;
@@ -1054,7 +1055,7 @@ mpegts_input_recv_packets
   }
 
   /* Adjust buffer */
-  if (len)
+  if (len && (flags & MPEGTS_DATA_CC_RESTART) == 0)
     sbuf_cut(sb, off); // cut off the bottom
   else
     sb->sb_ptr = 0;    // clear
@@ -1183,6 +1184,7 @@ mpegts_input_process
   mpegts_pid_t *mp;
   mpegts_pid_sub_t *mps;
   service_t *s;
+  elementary_stream_t *st;
   int table_wakeup = 0;
   mpegts_mux_t *mm = mpkt->mp_mux;
   mpegts_mux_instance_t *mmi;
@@ -1352,6 +1354,12 @@ done:
   }
 #endif
 
+  if (mpkt->mp_cc_restart) {
+    LIST_FOREACH(s, &mm->mm_transports, s_active_link)
+      TAILQ_FOREACH(st, &s->s_components, es_link)
+        st->es_cc = -1;
+  }
+
   /* Wake table */
   if (table_wakeup)
     pthread_cond_signal(&mi->mi_table_cond);

diff --git a/src/input/mpegts/satip/satip_frontend.c b/src/input/mpegts/satip/satip_frontend.c
index 6b64d700705ae7dcfb48a959b6fadbdadd763806..d6d0a6829b3fbb118e00ba12a06432591a523e1a 100644 (file)
--- a/src/input/mpegts/satip/satip_frontend.c
+++ b/src/input/mpegts/satip/satip_frontend.c
@@ -1024,7 +1024,7 @@ wrdata:
         mmi = lfe->sf_req->sf_mmi;
         mmi->tii_stats.unc += unc;
         mpegts_input_recv_packets((mpegts_input_t*)lfe, mmi,
-                                  &lfe->sf_sbuf, NULL, NULL, NULL);
+                                  &lfe->sf_sbuf, 0, NULL);
       }
       pthread_mutex_unlock(&lfe->sf_dvr_lock);
       lfe->sf_last_data_tstamp = dispatch_clock;
@@ -1572,8 +1572,7 @@ wrdata:
     pthread_mutex_lock(&lfe->sf_dvr_lock);
     if (lfe->sf_req == lfe->sf_req_thread) {
       mmi->tii_stats.unc += unc;
-      mpegts_input_recv_packets((mpegts_input_t*)lfe, mmi,
-                                sb, NULL, NULL, NULL);
+      mpegts_input_recv_packets((mpegts_input_t*)lfe, mmi, sb, 0, NULL);
     } else
       fatal = 1;
     pthread_mutex_unlock(&lfe->sf_dvr_lock);

diff --git a/src/input/mpegts/tsfile/tsfile_input.c b/src/input/mpegts/tsfile/tsfile_input.c
index d430d5a60fe080db112991bb2a9ee97dbd1a4208..09c7bf4681fbe0198f630fa90a6e489f974a30f2 100644 (file)
--- a/src/input/mpegts/tsfile/tsfile_input.c
+++ b/src/input/mpegts/tsfile/tsfile_input.c
@@ -44,7 +44,8 @@ tsfile_input_thread ( void *aux )
   tvhpoll_event_t ev;
   struct stat st;
   sbuf_t buf;
-  int64_t pcr, pcr2, pcr_last = PTS_UNSET;
+  mpegts_pcr_t pcr;
+  int64_t pcr_last = PTS_UNSET;
 #if PLATFORM_LINUX
   int64_t pcr_last_realtime = 0;
 #endif
@@ -130,17 +131,20 @@ tsfile_input_thread ( void *aux )
 
     /* Process */
     if (c > 0) {
-      pcr = PTS_UNSET;
-      mpegts_input_recv_packets((mpegts_input_t*)mi, mmi, &buf,
-                                &pcr, &pcr2, &tmi->mmi_tsfile_pcr_pid);
+      pcr.pcr_first = PTS_UNSET;
+      pcr.pcr_last  = PTS_UNSET;
+      pcr.pcr_pid   = tmi->mmi_tsfile_pcr_pid;
+      mpegts_input_recv_packets((mpegts_input_t*)mi, mmi, &buf, 0, &pcr);
+      if (pcr.pcr_pid)
+        tmi->mmi_tsfile_pcr_pid = pcr.pcr_pid;
 
       /* Delay */
-      if (pcr != PTS_UNSET) {
+      if (pcr.pcr_first != PTS_UNSET) {
         if (pcr_last != PTS_UNSET) {
           struct timespec slp;
           int64_t delta;
 
-          delta = pcr - pcr_last;
+          delta = pcr.pcr_first - pcr_last;
 
           if (delta < 0)
             delta = 0;
@@ -159,7 +163,7 @@ tsfile_input_thread ( void *aux )
           nanosleep(&slp, NULL);
 #endif
         }
-        pcr_last          = pcr;
+        pcr_last          = pcr.pcr_first;
 #if PLATFORM_LINUX
         pcr_last_realtime = getmonoclock();
 #endif

diff --git a/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c b/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c
index 5fc774999e8a7463f486ad0166ec012a318f6f02..485e3d0ed81477205c5a071efe0deaa05f6526ea 100644 (file)
--- a/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c
+++ b/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c
@@ -196,7 +196,7 @@ tvhdhomerun_frontend_input_thread ( void *aux )
 
     //tvhdebug("tvhdhomerun", "got r=%d (thats %d)", r, (r == 7*188));
 
-    mpegts_input_recv_packets((mpegts_input_t*) hfe, mmi, &sb, NULL, NULL, NULL);
+    mpegts_input_recv_packets((mpegts_input_t*) hfe, mmi, &sb, 0, NULL);
   }
 
   tvhdebug("tvhdhomerun", "setting target to none");