SAT>IP: Fix the global_lock input thread deadlock

diff --git a/src/input/mpegts/satip/satip_frontend.c b/src/input/mpegts/satip/satip_frontend.c
index 5b8990acd804670ef163c81d547cfded5385a613..5846232c7b7dad21fe858dd98d9aff99b948c871 100644 (file)
--- a/src/input/mpegts/satip/satip_frontend.c
+++ b/src/input/mpegts/satip/satip_frontend.c
@@ -761,15 +761,7 @@ ok:
 }
 
 static void
-satip_frontend_default_tables 
-  ( satip_frontend_t *lfe, mpegts_mux_t *mm )
-{
-  psi_tables_default(mm);
-  psi_tables_dvb(mm);
-}
-
-static void
-satip_frontend_store_pids(char *buf, uint16_t *pids, int count)
+satip_frontend_store_pids( char *buf, uint16_t *pids, int count )
 {
   int first = 1;
   char *s = buf;
@@ -1060,9 +1052,6 @@ satip_frontend_input_thread ( void *aux )
             tvhdebug("satip", "%s #%i - new session %s stream id %li",
                         rtsp->hc_host, lfe->sf_number,
                         rtsp->hc_rtsp_session, rtsp->hc_rtsp_stream_id);
-            pthread_mutex_lock(&global_lock);
-            satip_frontend_default_tables(lfe, mmi->mmi_mux);
-            pthread_mutex_unlock(&global_lock);
             if (lfe->sf_play2) {
               r = satip_rtsp_setup(rtsp, position, lfe->sf_number,
                                    lfe->sf_rtp_port, &lm->lm_tuning,
@@ -1222,6 +1211,11 @@ satip_frontend_signal_cb( void *aux )
 
   if (mmi == NULL)
     return;
+  if (!lfe->sf_tables) {
+    psi_tables_default(mmi->mmi_mux);
+    psi_tables_dvb(mmi->mmi_mux);
+    lfe->sf_tables = 1;
+  }
   sigstat.status_text  = signal2str(lfe->sf_status);
   sigstat.snr          = mmi->mmi_stats.snr;
   sigstat.signal       = mmi->mmi_stats.signal;
@@ -1275,6 +1269,7 @@ satip_frontend_tune0
 
   lfe->sf_mmi             = mmi;
   lfe->sf_running         = 1;
+  lfe->sf_tables          = 0;
 
   tvhtrace("satip", "%s - local RTP port %i RTCP port %i",
                     lfe->mi_name,
@@ -1285,7 +1280,7 @@ satip_frontend_tune0
   tvhthread_create(&lfe->sf_dvr_thread, NULL,
                    satip_frontend_input_thread, lfe, 0);
 
-  gtimer_arm_ms(&lfe->sf_monitor_timer, satip_frontend_signal_cb, lfe, 250);
+  gtimer_arm_ms(&lfe->sf_monitor_timer, satip_frontend_signal_cb, lfe, 50);
 
   return 0;
 }

diff --git a/src/input/mpegts/satip/satip_private.h b/src/input/mpegts/satip/satip_private.h
index 1fe5b78016e1ccb15a2184ff292edabe3ae59cab..93782b55bbbfb2cf9122c55ed8453ec731a5edd9 100644 (file)
--- a/src/input/mpegts/satip/satip_private.h
+++ b/src/input/mpegts/satip/satip_private.h
@@ -122,6 +122,7 @@ struct satip_frontend
   int                        sf_pids_tcount;     /*< tuned count */
   int                        sf_running;
   int                        sf_shutdown;
+  int                        sf_tables;
   int                        sf_position;
   udp_connection_t          *sf_rtp;
   udp_connection_t          *sf_rtcp;