…ht)'

Makefile.ffmpeg

@@ -82,10 +82,10 @@ LIBX264_TB      = $(LIBX264).tar.bz2
 LIBX264_URL     = http://ftp.via.ecp.fr/pub/videolan/x264/snapshots/$(LIBX264_TB)
 LIBX264_SHA1    = 24a3b20e2c49a112e40df9f64885cbd81250298a
 
-LIBVPX          = libvpx-v1.3.0
+LIBVPX          = libvpx-1.4.0
 LIBVPX_TB       = $(LIBVPX).tar.bz2
-LIBVPX_URL      = https://webm.googlecode.com/files/$(LIBVPX_TB)
-LIBVPX_SHA1     = 191b95817aede8c136cc3f3745fb1b8c50e6d5dc
+LIBVPX_URL      = http://storage.googleapis.com/downloads.webmproject.org/releases/webm/$(LIBVPX_TB)
+LIBVPX_SHA1     = d05f4e9a9878886282ac9c9246f8fac080c94c8f
 
 YASM            = yasm-1.3.0
 YASM_TB         = $(YASM).tar.gz

data/conf/epggrab/opentv/prov/skyit

@@ -4,7 +4,7 @@
   "genre": "skyit",
   "nid": 64511,
   "tsid": 5800,
-  "sid": 3635,
+  "sid": 3641,
   "bouquetid": 0,
   "channel" : [
     17

src/channels.h

@@ -192,7 +192,7 @@ void channel_save(channel_t *ch);
 const char *channel_get_name ( channel_t *ch );
 int channel_set_name ( channel_t *ch, const char *name );
 
-#define CHANNEL_SPLIT 1000000
+#define CHANNEL_SPLIT ((int64_t)1000000)
 
 static inline uint32_t channel_get_major ( int64_t chnum ) { return chnum / CHANNEL_SPLIT; }
 static inline uint32_t channel_get_minor ( int64_t chnum ) { return chnum % CHANNEL_SPLIT; }

src/descrambler/capmt.c

@@ -496,7 +496,7 @@ capmt_connect(capmt_t *capmt, int i)
 
   }
 
-  if (fd) {
+  if (fd >= 0) {
     tvhlog(LOG_DEBUG, "capmt", "%s: Created socket %d", capmt_name(capmt), fd);
     capmt->capmt_sock[i] = fd;
     capmt->capmt_sock_reconnect[i]++;
@@ -753,18 +753,16 @@ capmt_send_stop(capmt_service_t *t)
 static void
 capmt_send_stop_descrambling(capmt_t *capmt)
 {
-  uint8_t buf[8];
-
-  buf[0] = 0x9F;
-  buf[1] = 0x80;
-  buf[2] = 0x3F;
-  buf[3] = 0x04;
-
-  buf[4] = 0x83;
-  buf[5] = 0x02;
-  buf[6] = 0x00;
-  buf[7] = 0xFF; //wildcard demux id
-
+  static uint8_t buf[8] = {
+    0x9F,
+    0x80,
+    0x3F,
+    0x04,
+    0x83,
+    0x02,
+    0x00,
+    0xFF, /* wildcard demux id */
+  };
   capmt_write_msg(capmt, 0, 0, buf, 8);
 }
 

src/dvr/dvr_config.c

@@ -121,7 +121,7 @@ dvr_config_find_by_list(htsmsg_t *uuids, const char *name)
       }
     }
   } else {
-    if (cfg->dvr_enabled)
+    if (cfg && cfg->dvr_enabled)
       res = cfg;
   }
   if (!res)

src/dvr/dvr_db.c

@@ -1280,6 +1280,8 @@ dvr_entry_class_save(idnode_t *self)
   dvr_entry_save(de);
   if (dvr_entry_is_valid(de))
     dvr_entry_set_timer(de);
+
+  htsp_dvr_entry_update(de);
 }
 
 static void

src/epgdb.c

@@ -21,6 +21,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <pthread.h>
+#include <signal.h>
+#include <setjmp.h>
 
 #include "tvheadend.h"
 #include "queue.h"
@@ -144,6 +146,16 @@ _epgdb_v2_process( char **sect, htsmsg_t *m, epggrab_stats_t *stats )
 }
 
 /*
+ * Recovery
+ */
+static sigjmp_buf epg_mmap_env;
+
+static void epg_mmap_sigbus (int sig, siginfo_t *siginfo, void *ptr)
+{
+  siglongjmp(epg_mmap_env, 1);
+}
+
+/*
  * Load data
  */
 void epg_init ( void )
@@ -154,6 +166,7 @@ void epg_init ( void )
   uint8_t *mem, *rp;
   epggrab_stats_t stats;
   int ver = EPG_DB_VERSION;
+  struct sigaction act, oldact;
   char *sect = NULL;
 
   /* Find the right file (and version) */
@@ -168,21 +181,37 @@ void epg_init ( void )
     tvhlog(LOG_DEBUG, "epgdb", "database does not exist");
     return;
   }
+
+  memset (&act, 0, sizeof(act));
+  act.sa_sigaction = epg_mmap_sigbus;
+  act.sa_flags = SA_SIGINFO;
+  if (sigaction(SIGBUS, &act, &oldact)) {
+    tvhlog(LOG_ERR, "epgdb", "failed to install SIGBUS handler");
+    close(fd);
+    return;
+  }
   
   /* Map file to memory */
   if ( fstat(fd, &st) != 0 ) {
     tvhlog(LOG_ERR, "epgdb", "failed to detect database size");
-    return;
+    goto end;
   }
   if ( !st.st_size ) {
     tvhlog(LOG_DEBUG, "epgdb", "database is empty");
-    return;
+    goto end;
   }
   remain   = st.st_size;
   rp = mem = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
   if ( mem == MAP_FAILED ) {
     tvhlog(LOG_ERR, "epgdb", "failed to mmap database");
-    return;
+    goto end;
+  }
+
+  if (sigsetjmp(epg_mmap_env, 1)) {
+    tvhlog(LOG_ERR, "epgdb", "failed to read from mapped file");
+    if (mem)
+      munmap(mem, st.st_size);
+    goto end;
   }
 
   /* Process */
@@ -244,6 +273,8 @@ void epg_init ( void )
 
   /* Close file */
   munmap(mem, st.st_size);
+end:
+  sigaction(SIGBUS, &oldact, NULL);
   close(fd);
 }
 

src/htsmsg.c

@@ -298,6 +298,7 @@ htsmsg_add_msg(htsmsg_t *msg, const char *name, htsmsg_t *sub)
 		       HMF_NAME_ALLOCED);
 
   assert(sub->hm_data == NULL);
+  f->hmf_msg.hm_data = NULL;
   f->hmf_msg.hm_islist = sub->hm_islist;
   TAILQ_MOVE(&f->hmf_msg.hm_fields, &sub->hm_fields, hmf_link);
   free(sub);
@@ -321,6 +322,7 @@ htsmsg_add_msg_extname(htsmsg_t *msg, const char *name, htsmsg_t *sub)
   f = htsmsg_field_add(msg, name, sub->hm_islist ? HMF_LIST : HMF_MAP, 0);
 
   assert(sub->hm_data == NULL);
+  f->hmf_msg.hm_data = NULL;
   TAILQ_MOVE(&f->hmf_msg.hm_fields, &sub->hm_fields, hmf_link);
   f->hmf_msg.hm_islist = sub->hm_islist;
   free(sub);
@@ -711,6 +713,7 @@ htsmsg_field_get_msg ( htsmsg_field_t *f, int islist )
       free((void*)f->hmf_str);
       f->hmf_type          = m->hm_islist ? HMF_LIST : HMF_MAP;
       f->hmf_msg.hm_islist = m->hm_islist;
+      f->hmf_msg.hm_data   = NULL;
       TAILQ_MOVE(&f->hmf_msg.hm_fields, &m->hm_fields, hmf_link);
       free(m);
     }

src/htsp_server.c

@@ -2020,7 +2020,8 @@ htsp_method_subscribe(htsp_connection_t *htsp, htsmsg_t *in)
   }
 #endif
 
-  pro = profile_find_by_list(htsp->htsp_granted_access->aa_profiles, profile_id, "htsp");
+  pro = profile_find_by_list(htsp->htsp_granted_access->aa_profiles, profile_id,
+                             "htsp", SUBSCRIPTION_PACKET | SUBSCRIPTION_HTSP);
   profile_chain_init(&hs->hs_prch, pro, ch);
   if (profile_chain_work(&hs->hs_prch, &hs->hs_input, timeshiftPeriod, 0)) {
     tvhlog(LOG_ERR, "htsp", "unable to create profile chain '%s'", pro->pro_name);

src/idnode.c

@@ -564,7 +564,7 @@ idnode_perm(idnode_t *self, struct access *a, htsmsg_t *msg_to_write)
     if (ic->ic_perm)
       return self->in_class->ic_perm(self, a, msg_to_write);
     if (ic->ic_perm_def)
-      return access_verify2(a, self->in_class->ic_perm_def);
+      return access_verify2(a, ic->ic_perm_def);
     ic = ic->ic_super;
   }
   return 0;

src/input/mpegts/dvb_psi.c

@@ -1222,7 +1222,7 @@ dvb_nit_mux
       break;
     case 0x83:
       if (priv == 0 || priv == 0x28 || priv == 0x29 || priv == 0xa5 ||
-          priv == 0x233A) goto lcn;
+          priv == 0x233A || priv == 0x3200 || priv == 0x3201) goto lcn;
       break;
     case 0x86:
       if (priv == 0) goto lcn;
@@ -2381,8 +2381,10 @@ static void dvb_time_update(const uint8_t *ptr, const char *srcname)
   time_t t;
   if (dvb_last_update + 1800 < dispatch_clock) {
     t = dvb_convert_date(ptr, 0);
-    tvhtime_update(t, srcname);
-    dvb_last_update = dispatch_clock;
+    if (t > 0) {
+      tvhtime_update(t, srcname);
+      dvb_last_update = dispatch_clock;
+    }
   }
 }
 

src/input/mpegts/dvb_psi_lib.c

@@ -464,6 +464,10 @@ int dvb_table_remux
     buf += l;
   }
 
+  if (ol <= 0) {
+    free(obuf);
+    return 0;
+  }
   *out = obuf;
   return ol;
 }

src/input/mpegts/linuxdvb/linuxdvb_frontend.c

@@ -1556,7 +1556,7 @@ linuxdvb_frontend_create
   lfe->lfe_type = type;
   strncpy(lfe->lfe_name, name, sizeof(lfe->lfe_name));
   lfe->lfe_name[sizeof(lfe->lfe_name)-1] = '\0';
-  lfe->lfe_ibuf_size = 18800;
+  lfe->lfe_ibuf_size = 188000;
   lfe->lfe_status_period = 1000;
   lfe->lfe_pids_max = 32;
   lfe = (linuxdvb_frontend_t*)mpegts_input_create0((mpegts_input_t*)lfe, idc, uuid, conf);

src/input/mpegts/linuxdvb/linuxdvb_satconf.c

@@ -827,8 +827,7 @@ int
 linuxdvb_satconf_start_mux
   ( linuxdvb_satconf_t *ls, mpegts_mux_instance_t *mmi )
 {
-  int r;
-  uint32_t f;
+  int r, f;
   linuxdvb_satconf_ele_t *lse = linuxdvb_satconf_find_ele(ls, mmi->mmi_mux);
   linuxdvb_frontend_t    *lfe = (linuxdvb_frontend_t*)ls->ls_frontend;
   dvb_mux_t              *lm  = (dvb_mux_t*)mmi->mmi_mux;

src/input/mpegts/mpegts_network_dvb.c

@@ -430,6 +430,7 @@ dvb_network_create_mux
     satpos = dvb_network_get_orbital_pos(mn);
     if (dvb_network_check_orbital_pos(satpos, dmc->u.dmc_fe_qpsk.orbital_pos)) {
       LIST_FOREACH(mn, &mpegts_network_all, mn_global_link) {
+        if (!idnode_is_instance(&mn->mn_id, &dvb_network_dvbs_class)) continue;
         satpos = dvb_network_get_orbital_pos(mn);
         if (satpos == INT_MAX) continue;
         if (!dvb_network_check_orbital_pos(satpos, dmc->u.dmc_fe_qpsk.orbital_pos))

src/input/mpegts/mpegts_table.c

@@ -199,6 +199,8 @@ mpegts_table_add
     } else if (pid >= 0) {
       if (mt->mt_pid != pid)
         continue;
+      if (mt->mt_table != tableid)
+        continue;
       if (mt->mt_callback != callback)
         continue;
     } else {

src/input/mpegts/satip/satip.c

@@ -191,6 +191,7 @@ satip_device_class_tunercfg_notify ( void *o )
 const idclass_t satip_device_class =
 {
   .ic_class      = "satip_client",
+  .ic_event      = "satip_client",
   .ic_caption    = "SAT>IP Client",
   .ic_save       = satip_device_class_save,
   .ic_get_childs = satip_device_class_get_childs,

src/input/mpegts/satip/satip_frontend.c

@@ -1459,9 +1459,6 @@ satip_frontend_input_thread ( void *aux )
     pthread_mutex_unlock(&lfe->sf_dvr_lock);
   }
 
-  /* Do not send the SMT_SIGNAL_STATUS packets - we are out of service */
-  gtimer_disarm(&lfe->sf_monitor_timer);
-
   sbuf_free(&sb);
   udp_multirecv_free(&um);