HBBTV: Add SCT_HBBTV

diff --git a/src/esfilter.h b/src/esfilter.h
index 8bb9f6aa60d5e3175d415a1464dee6cc9c5e38b2..0d516fad33b18f96fa0803e32941c097ffef31e5 100644 (file)
--- a/src/esfilter.h
+++ b/src/esfilter.h
@@ -62,7 +62,7 @@ extern const idclass_t esfilter_class_other;
   SCT_MASK(SCT_CA)
 
 #define ESF_MASK_OTHER \
-  SCT_MASK(SCT_MPEGTS)
+  SCT_MASK(SCT_MPEGTS|SCT_HBBTV)
 
 extern uint32_t esfilterclsmask[];
 

diff --git a/src/input/mpegts/dvb_psi.c b/src/input/mpegts/dvb_psi.c
index 6deb1761eac895974436a9efcfda596099d8bfa3..13872e54c7c5826b6aaf957680c89b05591efd69 100644 (file)
--- a/src/input/mpegts/dvb_psi.c
+++ b/src/input/mpegts/dvb_psi.c
@@ -2324,6 +2324,10 @@ psi_parse_pmt
       audio_version = 2; /* Assume Layer 2 */
       break;
 
+    case 0x05:
+      hts_stream_type = SCT_HBBTV;
+      break;
+
     case 0x06:
       /* 0x06 is Chinese Cable TV AC-3 audio track */
       /* but mark it so only when no more descriptors exist */

diff --git a/src/streaming.c b/src/streaming.c
index 6e223d29a3f671e9bb90453f0311b439ada9cee2..10d2e60948cb45141d6baae0ecb2ce2af9b238d2 100644 (file)
--- a/src/streaming.c
+++ b/src/streaming.c
@@ -556,6 +556,7 @@ static struct strtab streamtypetab[] = {
   { "VORBIS",     SCT_VORBIS },
   { "HEVC",       SCT_HEVC },
   { "VP9",        SCT_VP9 },
+  { "HBBTV",      SCT_HBBTV },
 };
 
 /**

diff --git a/src/tvheadend.h b/src/tvheadend.h
index 69e5321701a0c4edba588905cd0de6c648e2bcf9..d0f55a18b6f53df30e99008dceef3e6840e90d60 100644 (file)
--- a/src/tvheadend.h
+++ b/src/tvheadend.h
@@ -290,7 +290,8 @@ typedef enum {
   SCT_VORBIS,
   SCT_HEVC,
   SCT_VP9,
-  SCT_LAST = SCT_VP9
+  SCT_HBBTV,
+  SCT_LAST = SCT_HBBTV
 } streaming_component_type_t;
 
 #define SCT_MASK(t) (1 << (t))