From: premultiply <ulrich.peters@posteo.de>
Date: Sat, 8 Jun 2019 09:38:57 +0000 (+0200)
Subject: revert bogus ONID and TSID remapping
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a60f73eeea638ecbdd1d228f2e087ade4debf28;p=thirdparty%2Ftvheadend.git

revert bogus ONID and TSID remapping

ONID and TSID values of 65535 (0xFFFF) are used and valid values.
This fix allows the proper reception of streams with this value.
---

diff --git a/src/input/mpegts/dvb_psi.c b/src/input/mpegts/dvb_psi.c
index 66f82fd80..cafa3def3 100644
--- a/src/input/mpegts/dvb_psi.c
+++ b/src/input/mpegts/dvb_psi.c
@@ -109,18 +109,14 @@ extract_4byte(const uint8_t *ptr)
 static inline uint16_t
 extract_tsid(const uint8_t *ptr)
 {
-  uint16_t r = (ptr[0] << 8) | ptr[1];
-  if (r == MPEGTS_TSID_NONE) r = 55555;
-  return r;
+  return (ptr[0] << 8) | ptr[1];
 }
 
 
 static inline uint16_t
 extract_onid(const uint8_t *ptr)
 {
-  uint16_t r = (ptr[0] << 8) | ptr[1];
-  if (r == MPEGTS_ONID_NONE) r = 55555;
-  return r;
+  return (ptr[0] << 8) | ptr[1];
 }