Tvheadend

diff --git a/src/parsers/message.c b/src/parsers/message.c

index 74c92401d..a7f860309 100644

--- a/src/parsers/message.c

+++ b/src/parsers/message.c

@@ -236,6 +236,8 @@ static void parser_init_es(parser_es_t *pes, parser_t *prs)

   pes->es_last_pcr = PTS_UNSET;

   pes->es_last_pcr_dts = PTS_UNSET;

   TAILQ_INIT(&pes->es_backlog);

+  tvhtrace(LS_PARSER, "tailq_init rstlog");

+  TAILQ_INIT(&pes->es_rstlog);

   if (pes->es_type == SCT_HBBTV && pes->es_psi.mt_name == NULL)

     dvb_table_parse_init(&pes->es_psi, "hbbtv", LS_TS, pes->es_pid,

                          DVB_HBBTV_BASE, DVB_HBBTV_MASK, pes);

@@ -250,6 +252,7 @@ static void parser_clean_es(parser_es_t *pes)

   pes->es_priv = NULL;

   streaming_queue_clear(&pes->es_backlog);

+  streaming_queue_clear(&pes->es_rstlog);

   if (pes->es_psi.mt_name)

     dvb_table_reset(&pes->es_psi);

diff --git a/src/parsers/parsers.c b/src/parsers/parsers.c

index 7524f715f..c570fedaa 100644

--- a/src/parsers/parsers.c

+++ b/src/parsers/parsers.c

@@ -92,6 +92,43 @@ parser_deliver_error(parser_t *t, parser_es_t *st)

   st->es_buf.sb_err = 0;

 }

+

+

+/**

+ * Do rstlog

+ */

+static void

+parser_rstlog(parser_t *t, parser_es_t *st, th_pkt_t *pkt)

+{

+  streaming_message_t *sm = streaming_msg_create_pkt(pkt);

+  TAILQ_INSERT_TAIL (&st->es_rstlog, sm, sm_link);

+  pkt_ref_dec(pkt); /* streaming_msg_create_pkt increses ref counter */

+}

+

+static void

+parser_do_rstlog(parser_t *t, parser_es_t *st)

+{

+  streaming_message_t *sm;

+  th_pkt_t *pkt;

+  tvhtrace(LS_PARSER,

+           "pkt rstlog %2d %-12s - rstlog flush start",

+           st->es_index,

+           streaming_component_type2txt(st->es_type));

+  while ((sm = TAILQ_FIRST(&st->es_rstlog)) != NULL) {

+    pkt = sm->sm_data;

+    TAILQ_REMOVE(&st->es_rstlog, sm, sm_link);

+    pkt_trace(LS_PARSER, pkt, "deliver from rstlog");

+    streaming_target_deliver2(t->prs_output, streaming_msg_create_pkt(pkt));

+    sm->sm_data = NULL;

+    streaming_msg_free(sm);

+  }

+  tvhtrace(LS_PARSER,

+           "pkt rstlog %2d %-12s - rstlog flush end -",

+           st->es_index,

+           streaming_component_type2txt(st->es_type));

+}

+

+

 /**

  *

  */

@@ -127,15 +164,24 @@ parser_deliver(parser_t *t, parser_es_t *st, th_pkt_t *pkt)

 deliver:

   pkt->pkt_componentindex = st->es_index;

-  pkt_trace(LS_PARSER, pkt, "deliver");

-

   if (SCT_ISVIDEO(pkt->pkt_type)) {

     pkt->v.pkt_aspect_num = st->es_aspect_num;

     pkt->v.pkt_aspect_den = st->es_aspect_den;

   }

   /* Forward packet */

-  streaming_target_deliver2(t->prs_output, streaming_msg_create_pkt(pkt));

+  if(atomic_get(&st->es_service->s_pending_restart) == 1) {

+    /* Queue pkt to es_rstlog if pending restart */

+    pkt_trace(LS_PARSER, pkt, "deliver to rstlog");

+    parser_rstlog(t, st, pkt);

+  } else {

+    /* empty es_restart queue */

+    if (!TAILQ_EMPTY(&st->es_rstlog)) {

+      parser_do_rstlog(t, st);

+    }

+    pkt_trace(LS_PARSER, pkt, "deliver");

+    streaming_target_deliver2(t->prs_output, streaming_msg_create_pkt(pkt));

+  }

   /* Decrease our own reference to the packet */

   pkt_ref_dec(pkt);

diff --git a/src/parsers/parsers.h b/src/parsers/parsers.h

index f37a56c57..c7ae69bed 100644

--- a/src/parsers/parsers.h

+++ b/src/parsers/parsers.h

@@ -56,6 +56,7 @@ struct parser_es {

   int       es_global_data_len;

   struct th_pkt *es_curpkt;

   struct streaming_message_queue es_backlog;

+  struct streaming_message_queue es_rstlog;

   tvhlog_limit_t es_pes_log;

   mpegts_psi_table_t es_psi;

   /* Clocks */

diff --git a/src/plumbing/tsfix.c b/src/plumbing/tsfix.c

index 4b4843e5d..6584597f5 100644

--- a/src/plumbing/tsfix.c

+++ b/src/plumbing/tsfix.c

@@ -552,6 +552,8 @@ tsfix_input_packet(tsfix_t *tf, streaming_message_t *sm)

   tfs = tfs_find(tf, pkt);

   streaming_msg_free(sm);

+  pkt_trace(LS_TSFIX, pkt, "*input*");

+

   if (tfs == NULL || mclk() < tf->tf_start_time) {

     tsfix_packet_drop(tfs, pkt, "start time");

     return;