timeshift: do not send already delivered packets twice (pause)

diff --git a/src/packet.h b/src/packet.h
index 14d3c6c697096308473ccddf7371827cd4fea00e..fb12be1c5847bb304af4db7b6ea177245bcad31e 100644 (file)
--- a/src/packet.h
+++ b/src/packet.h
@@ -56,6 +56,9 @@ typedef struct th_pkt {
   uint8_t pkt_componentindex;
   uint8_t pkt_frametype;
   uint8_t pkt_field;  // Set if packet is only a half frame (a field)
+#if ENABLE_TIMESHIFT
+  uint8_t pkt_delivered;
+#endif
 
   uint8_t pkt_channels;
   uint8_t pkt_sri;

diff --git a/src/timeshift.c b/src/timeshift.c
index 38367bff1cdb19f6f46dcdf5594e3b05fd67e979..1b712ad5dffac6c9d54fcb254bdaaf809cd5251b 100644 (file)
--- a/src/timeshift.c
+++ b/src/timeshift.c
@@ -283,14 +283,17 @@ timeshift_packet( timeshift_t *ts, th_pkt_t *pkt, int deliver )
     if (pkt->pkt_componentindex >= ts->backlog_max)
       ts->backlog_max = pkt->pkt_componentindex + 1;
     TAILQ_INSERT_TAIL(&ts->backlog[pkt->pkt_componentindex], sm, sm_link);
+    pkt->pkt_delivered = ts->state <= TS_LIVE;
   }
 }
 
 void
-timeshift_packets_clone( timeshift_t *ts, struct streaming_message_queue *dst )
+timeshift_packets_clone
+  ( timeshift_t *ts, struct streaming_message_queue *dst, int delivered )
 {
   streaming_message_t *lowest, *sm, *sm2;
   struct streaming_message_queue *sq, *sq2, *backlogs;
+  th_pkt_t *pkt;
   int i;
 
   lock_assert(&ts->state_mutex);
@@ -302,6 +305,11 @@ timeshift_packets_clone( timeshift_t *ts, struct streaming_message_queue *dst )
     sq2 = &ts->backlog[i];
     TAILQ_INIT(sq);
     TAILQ_FOREACH(sm, sq2, sm_link) {
+      if (!delivered) {
+        pkt = sm->sm_data;
+        if (pkt->pkt_delivered)
+          continue;
+      }
       sm2 = streaming_msg_clone(sm);
       TAILQ_INSERT_TAIL(sq, sm2, sm_link);
     }

diff --git a/src/timeshift/private.h b/src/timeshift/private.h
index 2a762eabb292d1912c6511f5a1bbc84eb5dc4c97..12d1fdf02511b36ee74e74d49658cb5bf1298993 100644 (file)
--- a/src/timeshift/private.h
+++ b/src/timeshift/private.h
@@ -133,7 +133,7 @@ extern uint64_t timeshift_total_ram_size;
 /*
  *
  */
-void timeshift_packets_clone ( timeshift_t *ts, struct streaming_message_queue *dst );
+void timeshift_packets_clone ( timeshift_t *ts, struct streaming_message_queue *dst, int delivered );
 
 /*
  * Write functions

diff --git a/src/timeshift/timeshift_reader.c b/src/timeshift/timeshift_reader.c
index 80490e03a2fcc3dc962134900072e27851f08a82..1f733df46d93d3b1403af06c55d54bbd874cafbd 100644 (file)
--- a/src/timeshift/timeshift_reader.c
+++ b/src/timeshift/timeshift_reader.c
@@ -487,7 +487,7 @@ static void _timeshift_write_queues
 
   TAILQ_INIT(&sq);
   timeshift_writer_clone(ts, &sq);
-  timeshift_packets_clone(ts, &sq);
+  timeshift_packets_clone(ts, &sq, 0);
   while ((sm = TAILQ_FIRST(&sq)) != NULL) {
     TAILQ_REMOVE(&sq, sm, sm_link);
     streaming_target_deliver2(ts->output, sm);
@@ -561,7 +561,7 @@ static void timeshift_trace_pkt
 void *timeshift_reader ( void *p )
 {
   timeshift_t *ts = p;
-  int nfds, end, run = 1, wait = -1;
+  int nfds, end, run = 1, wait = -1, skip_delivered = 0;
   timeshift_file_t *cur_file = NULL;
   int cur_speed = 100, keyframe_mode = 0;
   int64_t mono_now, mono_play_time = 0, mono_last_status = 0;
@@ -571,6 +571,7 @@ void *timeshift_reader ( void *p )
   streaming_skip_t *skip = NULL;
   tvhpoll_t *pd;
   tvhpoll_event_t ev = { 0 };
+  th_pkt_t *pkt;
 
   pd = tvhpoll_create(1);
   ev.fd     = ts->rd_pipe.rd;
@@ -638,6 +639,7 @@ void *timeshift_reader ( void *p )
                        ts->id);
                 timeshift_writer_flush(ts);
                 ts->dobuf = 1;
+                skip_delivered = 1;
                 pthread_mutex_lock(&ts->rdwr_mutex);
                 cur_file = timeshift_filemgr_newest(ts);
                 cur_file = timeshift_filemgr_get(ts, cur_file ? cur_file->last :
@@ -666,7 +668,7 @@ void *timeshift_reader ( void *p )
             }
 
             /* Update */
-            cur_speed  = speed;
+            cur_speed = speed;
             if (speed != 100 || ts->state != TS_LIVE) {
               ts->state = speed == 0 ? TS_PAUSE : TS_PLAY;
               tvhtrace("timeshift", "reader - set %s", speed == 0 ? "TS_PAUSE" : "TS_PLAY");
@@ -674,6 +676,8 @@ void *timeshift_reader ( void *p )
             if (ts->state == TS_PLAY) {
               mono_play_time = mono_now;
               tvhtrace("timeshift", "update play time TS_LIVE - %"PRId64" play buffer from %"PRId64, mono_now, pause_time);
+            } else if (ts->state == TS_PAUSE) {
+              skip_delivered = 1;
             }
             tvhlog(LOG_DEBUG, "timeshift", "ts %d change speed %d", ts->id, speed);
           }
@@ -726,6 +730,7 @@ void *timeshift_reader ( void *p )
                 } else {
                   last_time      = atomic_add_s64(&ts->last_time, 0);
                 }
+                skip_delivered = 0;
                 pthread_mutex_unlock(&ts->rdwr_mutex);
               }
 
@@ -866,10 +871,18 @@ void *timeshift_reader ( void *p )
                (((cur_speed < 0) && (sm->sm_time >= deliver)) ||
                 ((cur_speed > 0) && (sm->sm_time <= deliver))))) {
 
-      if (sm->sm_type == SMT_PACKET && tvhtrace_enabled())
-        timeshift_trace_pkt(ts, sm);
       last_time = sm->sm_time;
+      if (sm->sm_type == SMT_PACKET) {
+        pkt = sm->sm_data;
+        if (skip_delivered && pkt->pkt_delivered) {
+          streaming_msg_free(sm);
+          goto skip_pkt;
+        }
+        if (tvhtrace_enabled())
+          timeshift_trace_pkt(ts, sm);
+      }
       streaming_target_deliver2(ts->output, sm);
+skip_pkt:
       sm        = NULL;
       wait      = 0;
 

diff --git a/src/tvheadend.h b/src/tvheadend.h
index 5cbb58063e7f0fc9ab42d5f0629ad86ce37657b5..1b7993d54ea446e1b75206a9ec859560d2b86cfd 100644 (file)
--- a/src/tvheadend.h
+++ b/src/tvheadend.h
@@ -529,7 +529,7 @@ typedef struct streaming_message {
   TAILQ_ENTRY(streaming_message) sm_link;
   streaming_message_type_t sm_type;
 #if ENABLE_TIMESHIFT
-  int64_t  sm_time;
+  int64_t sm_time;
 #endif
   union {
     void *sm_data;