From 5850bec83da2bea4fa66ebcfb1ca69b075195eb4 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Sat, 20 May 2017 13:27:45 +0200
Subject: [PATCH] HBBTV: Add SCT_HBBTV

---
 src/esfilter.h             | 2 +-
 src/input/mpegts/dvb_psi.c | 4 ++++
 src/streaming.c            | 1 +
 src/tvheadend.h            | 3 ++-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/esfilter.h b/src/esfilter.h
index 8bb9f6aa6..0d516fad3 100644
--- 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 6deb1761e..13872e54c 100644
--- 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 6e223d29a..10d2e6094 100644
--- 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 69e532170..d0f55a18b 100644
--- 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))
-- 
2.47.3