Updated for vdr-2.4.0.

Ignore handlers without any data.

HISTORY

@@ -165,3 +165,45 @@ VDR Plugin 'satip' Revision History
 - Added support for FRITZ!Box 6490 Cable (Thanks to 9000h).
 - Updated FRITZ!WLAN Repeater DVB-C detection for the latest firmware (Thanks to 9000h).
 - Added GCC7 compatibility (Thanks to Sascha Kuehndel).
+
+
+===================================
+VDR Plugin 'satip' Revision History
+===================================
+
+2016-12-18: Version 2.3.0
+
+- Updated for vdr-2.3.1.
+- Updated German translation (Thanks to Frank Neumann).
+- Fixed Panasonic CXW804 support (Thanks to Tobias Grimm).
+- Fixed C++11 support (Thanks to Tobias Grimm).
+- Fixed server assigment with source validation (Thanks to Patrick Boettcher).
+- Added configurable RTP/RTCP ports (Thanks to chriszero).
+- Added support for X-SATIP-RTSP-Port header.
+- Added multicast and RTP-over-TCP support.
+- Added support for activating/deactivating server on-the-fly.
+- Extended command-line parameters for setting server quirks.
+
+2017-08-15: Version 2.3.1
+
+- Updated for vdr-2.3.7 (Thanks to Klaus Schmidinger).
+- Added Polish translation (Thanks to Tomasz Nowak).
+- Updated Catalan and Spanish translations (Thanks to Gabriel Bonich).
+- Added support for KATHREIN SatIP Server (Thanks to kavanu).
+- Added support for FRITZ!Box 6490 Cable (Thanks to 9000h).
+- Updated FRITZ!WLAN Repeater DVB-C detection for the latest firmware (Thanks to 9000h).
+- Added GCC7 compatibility (Thanks to Sascha Kuehndel).
+
+
+===================================
+VDR Plugin 'satip' Revision History
+===================================
+
+2018-04-15: Version 2.4.0
+
+- Updated for vdr-2.4.0.
+- Removed speed limit.
+- Fixed transport media changes.
+- Fixed memory leak in cSatipSectionFilter (Thanks to Alexander Pipelka).
+- Added more robust section filter handling (Thanks to Alexander Pipelka).
+- Added a command line parameter for the RTP receive buffer size (Thanks to Stefan Rehm).

Makefile

@@ -88,14 +88,15 @@ all: $(SOFILE) i18n
 ### Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+	@echo CC $@
+	$(Q)$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
-	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+	$(Q)$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
 
 -include $(DEPFILE)
 
@@ -108,17 +109,21 @@ I18Nmsgs  = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLU
 I18Npot   = $(PODIR)/$(PLUGIN).pot
 
 %.mo: %.po
-	msgfmt -c -o $@ $<
+	@echo MO $@
+	$(Q)msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
+	@echo GT $@
+	$(Q)xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
 
 %.po: $(I18Npot)
-	msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
+	@echo PO $@
+	$(Q)msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
 	@touch $@
 
 $(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
-	install -D -m644 $< $@
+	@echo IN $@
+	$(Q)install -D -m644 $< $@
 
 .PHONY: i18n
 i18n: $(I18Nmo) $(I18Npot)
@@ -128,11 +133,13 @@ install-i18n: $(I18Nmsgs)
 ### Targets:
 
 $(SOFILE): $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
-	@$(STRIP) $@
+	@echo LD $@
+	$(Q)$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
+	$(Q)$(STRIP) $@
 
 install-lib: $(SOFILE)
-	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
+	@echo IN $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
+	$(Q)install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
 
 install-conf:
 	@mkdir -p $(DESTDIR)$(CFGDIR)/plugins/$(PLUGIN)
@@ -153,4 +160,4 @@ clean:
 
 .PHONY: cppcheck
 cppcheck:
-	@cppcheck --language=c++ --enable=all -v -f $(OBJS:%.o=%.c)
+	$(Q)cppcheck --language=c++ --enable=all -v -f $(OBJS:%.o=%.c)

device.c

@@ -19,8 +19,9 @@ cMutex cSatipDevice::mutexS = cMutex();
 
 cSatipDevice::cSatipDevice(unsigned int indexP)
 : deviceIndexM(indexP),
-  isPacketDeliveredM(false),
+  bytesDeliveredM(0),
   isOpenDvrM(false),
+  checkTsBufferM(false),
   deviceNameM(*cString::sprintf("%s %d", *DeviceType(), deviceIndexM)),
   channelM(),
   createdM(0),
@@ -107,12 +108,8 @@ cString cSatipDevice::GetSatipStatus(void)
          bool live = (device == cDevice::ActualDevice());
          bool lock = device->HasLock();
          const cChannel *channel = device->GetCurrentlyTunedTransponder();
-#if defined(APIVERSNUM) && APIVERSNUM >= 20301
          LOCK_TIMERS_READ;
          for (const cTimer *timer = Timers->First(); timer; timer = Timers->Next(timer)) {
-#else
-         for (cTimer *timer = Timers.First(); timer; timer = Timers.Next(timer)) {
-#endif
              if (timer->Recording()) {
                 cRecordControl *control = cRecordControls::GetRecordControl(timer);
                 if (control && control->Device() == device)
@@ -141,20 +138,14 @@ cString cSatipDevice::GetSatipStatus(void)
 cString cSatipDevice::GetGeneralInformation(void)
 {
   debug16("%s [device %u]", __PRETTY_FUNCTION__, deviceIndexM);
-#if defined(APIVERSNUM) && APIVERSNUM >= 20301
   LOCK_CHANNELS_READ;
-#endif
   return cString::sprintf("SAT>IP device: %d\nCardIndex: %d\nStream: %s\nSignal: %s\nStream bitrate: %s\n%sChannel: %s\n",
                           deviceIndexM, CardIndex(),
                           pTunerM ? *pTunerM->GetInformation() : "",
                           pTunerM ? *pTunerM->GetSignalStatus() : "",
                           pTunerM ? *pTunerM->GetTunerStatistic() : "",
                           *GetBufferStatistic(),
-#if defined(APIVERSNUM) && APIVERSNUM >= 20301
                           *Channels->GetByNumber(cDevice::CurrentChannel())->ToText());
-#else
-                          *Channels.GetByNumber(cDevice::CurrentChannel())->ToText());
-#endif
 }
 
 cString cSatipDevice::GetPidsInformation(void)
@@ -225,6 +216,21 @@ bool cSatipDevice::AvoidRecording(void) const
   return SatipConfig.IsOperatingModeLow();
 }
 
+bool cSatipDevice::SignalStats(int &Valid, double *Strength, double *Cnr, double *BerPre, double *BerPost, double *Per, int *Status) const
+{
+  debug16("%s [device %u]", __PRETTY_FUNCTION__, deviceIndexM);
+  Valid = DTV_STAT_VALID_NONE;
+  if (Strength && pTunerM) {
+     *Strength =  pTunerM->SignalStrengthDBm();
+     Valid |= DTV_STAT_VALID_STRENGTH;
+     }
+  if (Status) {
+     *Status = HasLock() ? (DTV_STAT_HAS_SIGNAL | DTV_STAT_HAS_CARRIER | DTV_STAT_HAS_VITERBI | DTV_STAT_HAS_SYNC | DTV_STAT_HAS_LOCK) : DTV_STAT_HAS_NONE;
+     Valid |= DTV_STAT_VALID_STATUS;
+     }
+  return Valid != DTV_STAT_VALID_NONE;
+}
+
 int cSatipDevice::SignalStrength(void) const
 {
   debug16("%s [device %u]", __PRETTY_FUNCTION__, deviceIndexM);
@@ -419,7 +425,7 @@ void cSatipDevice::CloseFilter(int handleP)
 bool cSatipDevice::OpenDvr(void)
 {
   debug9("%s [device %u]", __PRETTY_FUNCTION__, deviceIndexM);
-  isPacketDeliveredM = false;
+  bytesDeliveredM = 0;
   tsBufferM->Clear();
   if (pTunerM)
      pTunerM->Open();
@@ -505,13 +511,17 @@ bool cSatipDevice::IsIdle(void)
   return !Receiving();
 }
 
-uchar *cSatipDevice::GetData(int *availableP)
+uchar *cSatipDevice::GetData(int *availableP, bool checkTsBuffer)
 {
   debug16("%s [device %u]", __PRETTY_FUNCTION__, deviceIndexM);
   if (isOpenDvrM && tsBufferM) {
      int count = 0;
-     if (isPacketDeliveredM)
-        SkipData(TS_SIZE);
+     if (bytesDeliveredM) {
+        tsBufferM->Del(bytesDeliveredM);
+        bytesDeliveredM = 0;
+        }
+     if (checkTsBuffer && tsBufferM->Available() < TS_SIZE)
+        return NULL;
      uchar *p = tsBufferM->Get(count);
      if (p && count >= TS_SIZE) {
         if (*p != TS_SYNC_BYTE) {
@@ -525,7 +535,7 @@ uchar *cSatipDevice::GetData(int *availableP)
            info("Skipped %d bytes to sync on TS packet", count);
            return NULL;
            }
-        isPacketDeliveredM = true;
+        bytesDeliveredM = TS_SIZE;
         if (availableP)
            *availableP = count;
         // Update pid statistics
@@ -539,8 +549,7 @@ uchar *cSatipDevice::GetData(int *availableP)
 void cSatipDevice::SkipData(int countP)
 {
   debug16("%s [device %u]", __PRETTY_FUNCTION__, deviceIndexM);
-  tsBufferM->Del(countP);
-  isPacketDeliveredM = false;
+  bytesDeliveredM = countP;
   // Update buffer statistics
   AddBufferStatistic(countP, tsBufferM->Available());
 }
@@ -554,11 +563,12 @@ bool cSatipDevice::GetTSPacket(uchar *&dataP)
      if (cCamSlot *cs = CamSlot()) {
         if (cs->WantsTsData()) {
            int available;
-           dataP = GetData(&available);
-           if (dataP) {
-              dataP = cs->Decrypt(dataP, available);
-              SkipData(available);
-              }
+           dataP = GetData(&available, checkTsBufferM);
+           if (!dataP)
+              available = 0;
+           dataP = cs->Decrypt(dataP, available);
+           SkipData(available);
+           checkTsBufferM = dataP != NULL;
            return true;
            }
         }

device.h

@@ -32,8 +32,9 @@ private:
     eTuningTimeoutMs = 1000  // in milliseconds
   };
   unsigned int deviceIndexM;
-  bool isPacketDeliveredM;
+  int bytesDeliveredM;
   bool isOpenDvrM;
+  bool checkTsBufferM;
   cString deviceNameM;
   cChannel channelM;
   cRingBufferLinear *tsBufferM;
@@ -64,6 +65,7 @@ public:
   virtual cString DeviceType(void) const;
   virtual cString DeviceName(void) const;
   virtual bool AvoidRecording(void) const;
+  virtual bool SignalStats(int &Valid, double *Strength = NULL, double *Cnr = NULL, double *BerPre = NULL, double *BerPost = NULL, double *Per = NULL, int *Status = NULL) const;
   virtual int SignalStrength(void) const;
   virtual int SignalQuality(void) const;
 
@@ -83,7 +85,7 @@ protected:
 
   // for recording
 private:
-  uchar *GetData(int *availableP = NULL);
+  uchar *GetData(int *availableP = NULL, bool checkTsBuffer = false);
   void SkipData(int countP);
 
 protected:
@@ -99,7 +101,7 @@ public:
 
   // for transponder lock
 public:
-  virtual bool HasLock(int timeoutMsP) const;
+  virtual bool HasLock(int timeoutMsP = 0) const;
 
   // for common interface
 public:

po/ca_ES.po

@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2017 Rolf Ahrenberg
+# Copyright (C) 2007-2018 Rolf Ahrenberg
 # This file is distributed under the same license as the satip package.
 # Gabriel Bonich, 2014-2017
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 2.2.5\n"
+"Project-Id-Version: vdr-satip 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2017-08-15 08:15+0300\n"
-"PO-Revision-Date: 2017-08-15 08:15+0300\n"
+"POT-Creation-Date: 2018-04-15 04:15+0300+0300\n"
+"PO-Revision-Date: 2018-04-15 04:15+0300+0300\n"
 "Last-Translator: Gabriel Bonich <gbonich@gmail.com>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
 "Language: ca\n"

po/de_DE.po

@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2017 Rolf Ahrenberg
+# Copyright (C) 2007-2018 Rolf Ahrenberg
 # This file is distributed under the same license as the satip package.
 # Frank Neumann, 2014-2017
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 2.2.5\n"
+"Project-Id-Version: vdr-satip 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2017-08-15 08:15+0300\n"
-"PO-Revision-Date: 2017-08-15 08:15+0300\n"
+"POT-Creation-Date: 2018-04-15 04:15+0300+0300\n"
+"PO-Revision-Date: 2018-04-15 04:15+0300+0300\n"
 "Last-Translator: Frank Neumann <fnu@yavdr.org>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
 "Language: de\n"

po/es_ES.po

@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2017 Rolf Ahrenberg
+# Copyright (C) 2007-2018 Rolf Ahrenberg
 # This file is distributed under the same license as the satip package.
 # Gabriel Bonich, 2014-2017
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 2.2.5\n"
+"Project-Id-Version: vdr-satip 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2017-08-15 08:15+0300\n"
-"PO-Revision-Date: 2017-08-15 08:15+0300\n"
+"POT-Creation-Date: 2018-04-15 04:15+0300+0300\n"
+"PO-Revision-Date: 2018-04-15 04:15+0300+0300\n"
 "Last-Translator: Gabriel Bonich <gbonich@gmail.com>\n"
 "Language-Team: Spanish <vdr@linuxtv.org>\n"
 "Language: es\n"

po/fi_FI.po

@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2017 Rolf Ahrenberg
+# Copyright (C) 2007-2018 Rolf Ahrenberg
 # This file is distributed under the same license as the satip package.
 # Rolf Ahrenberg, 2015-2017
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 2.2.5\n"
+"Project-Id-Version: vdr-satip 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2017-08-15 08:15+0300\n"
-"PO-Revision-Date: 2017-08-15 08:15+0300\n"
+"POT-Creation-Date: 2018-04-15 04:15+0300+0300\n"
+"PO-Revision-Date: 2018-04-15 04:15+0300+0300\n"
 "Last-Translator: Rolf Ahrenberg\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
 "Language: fi\n"

po/pl_PL.po

@@ -1,14 +1,14 @@
 # VDR plugin language source file.
-# Copyright (C) 2007-2017 Rolf Ahrenberg
+# Copyright (C) 2007-2018 Rolf Ahrenberg
 # This file is distributed under the same license as the vdr-satip package.
 # Tomasz Maciej Nowak, 2017
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 2.2.5\n"
+"Project-Id-Version: vdr-satip 2.4.0\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2017-08-15 08:15+0300\n"
-"PO-Revision-Date: 2017-08-15 08:15+0300\n"
+"POT-Creation-Date: 2018-04-15 04:15+0300+0300\n"
+"PO-Revision-Date: 2018-04-15 04:15+0300+0300\n"
 "Last-Translator: Tomasz Maciej Nowak <tomek_n@o2.pl>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
 "Language: pl_PL\n"

satip.c

@@ -20,15 +20,15 @@
 #warning "CURL version >= 7.36.0 is recommended"
 #endif
 
-#if defined(APIVERSNUM) && APIVERSNUM < 20200
-#error "VDR-2.2.0 API version or greater is required!"
+#if defined(APIVERSNUM) && APIVERSNUM < 20400
+#error "VDR-2.4.0 API version or greater is required!"
 #endif
 
 #ifndef GITVERSION
 #define GITVERSION ""
 #endif
 
-       const char VERSION[]     = "2.2.5" GITVERSION;
+       const char VERSION[]     = "2.4.0" GITVERSION;
 static const char DESCRIPTION[] = trNOOP("SAT>IP Devices");
 
 class cPluginSatip : public cPlugin {

tuner.c

@@ -40,6 +40,7 @@ cSatipTuner::cSatipTuner(cSatipDeviceIf &deviceP, unsigned int packetLenP)
   externalStateM(),
   timeoutM(eMinKeepAliveIntervalMs),
   hasLockM(false),
+  signalStrengthDBmM(0.0),
   signalStrengthM(-1),
   signalQualityM(-1),
   frontendIdM(-1),
@@ -135,6 +136,7 @@ void cSatipTuner::Action(void)
                   // Quirk for devices without valid reception data
                   if (currentServerM.IsQuirk(cSatipServer::eSatipQuirkForceLock)) {
                      hasLockM = true;
+                     signalStrengthDBmM = eDefaultSignalStrengthDBm;
                      signalStrengthM = eDefaultSignalStrength;
                      signalQualityM = eDefaultSignalQuality;
                      }
@@ -264,6 +266,7 @@ bool cSatipTuner::Disconnect(void)
 
   // Reset signal parameters
   hasLockM = false;
+  signalStrengthDBmM = 0.0;
   signalStrengthM = -1;
   signalQualityM = -1;
   frontendIdM = -1;
@@ -333,8 +336,9 @@ void cSatipTuner::ProcessApplicationData(u_char *bufferP, int lengthP)
         // No signal corresponds to 0
         c = strstr(c, ",");
         value = min(atoi(++c), 255);
+        signalStrengthDBmM = (value >= 0) ? 40.0 * (value - 32) / 192.0 - 65.0 : 0.0;
         // Scale value to 0-100
-        signalStrengthM = (value >= 0) ? (value * 100 / 255) : -1;
+        signalStrengthM = (value >= 0) ? value * 100 / 255 : -1;
 
         // lock:
         // lock Set to one of the following values:
@@ -670,6 +674,12 @@ int cSatipTuner::SignalStrength(void)
   return signalStrengthM;
 }
 
+double cSatipTuner::SignalStrengthDBm(void)
+{
+  debug16("%s [device %d]", __PRETTY_FUNCTION__, deviceIdM);
+  return signalStrengthDBmM;
+}
+
 int cSatipTuner::SignalQuality(void)
 {
   debug16("%s [device %d]", __PRETTY_FUNCTION__, deviceIdM);

tuner.h

@@ -78,16 +78,17 @@ class cSatipTuner : public cThread, public cSatipTunerStatistics, public cSatipT
 {
 private:
   enum {
-    eDummyPid               = 100,
-    eDefaultSignalStrength  = 15,
-    eDefaultSignalQuality   = 224,
-    eSleepTimeoutMs         = 250,   // in milliseconds
-    eStatusUpdateTimeoutMs  = 1000,  // in milliseconds
-    ePidUpdateIntervalMs    = 250,   // in milliseconds
-    eConnectTimeoutMs       = 5000,  // in milliseconds
-    eIdleCheckTimeoutMs     = 15000, // in milliseconds
-    eTuningTimeoutMs        = 20000, // in milliseconds
-    eMinKeepAliveIntervalMs = 30000  // in milliseconds
+    eDummyPid                 = 100,
+    eDefaultSignalStrengthDBm = -25,
+    eDefaultSignalStrength    = 224,
+    eDefaultSignalQuality     = 15,
+    eSleepTimeoutMs           = 250,   // in milliseconds
+    eStatusUpdateTimeoutMs    = 1000,  // in milliseconds
+    ePidUpdateIntervalMs      = 250,   // in milliseconds
+    eConnectTimeoutMs         = 5000,  // in milliseconds
+    eIdleCheckTimeoutMs       = 15000, // in milliseconds
+    eTuningTimeoutMs          = 20000, // in milliseconds
+    eMinKeepAliveIntervalMs   = 30000  // in milliseconds
   };
   enum eTunerState { tsIdle, tsRelease, tsSet, tsTuned, tsLocked };
   enum eStateMode { smInternal, smExternal };
@@ -115,6 +116,7 @@ private:
   cVector<eTunerState> externalStateM;
   int timeoutM;
   bool hasLockM;
+  double signalStrengthDBmM;
   int signalStrengthM;
   int signalQualityM;
   int frontendIdM;
@@ -149,6 +151,7 @@ public:
   bool Close(void);
   int FrontendId(void);
   int SignalStrength(void);
+  double SignalStrengthDBm(void);
   int SignalQuality(void);
   bool HasLock(void);
   cString GetSignalStatus(void);