Silence "misleading-indentation" warning.

Configurable RTP receive buffer size

HISTORY

@@ -165,31 +165,3 @@ 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).

Makefile

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

device.c

@@ -19,9 +19,8 @@ cMutex cSatipDevice::mutexS = cMutex();
 
 cSatipDevice::cSatipDevice(unsigned int indexP)
 : deviceIndexM(indexP),
-  bytesDeliveredM(0),
+  isPacketDeliveredM(false),
   isOpenDvrM(false),
-  checkTsBufferM(false),
   deviceNameM(*cString::sprintf("%s %d", *DeviceType(), deviceIndexM)),
   channelM(),
   createdM(0),
@@ -108,8 +107,12 @@ 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)
@@ -138,14 +141,20 @@ 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)
@@ -216,21 +225,6 @@ 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);
@@ -425,7 +419,7 @@ void cSatipDevice::CloseFilter(int handleP)
 bool cSatipDevice::OpenDvr(void)
 {
   debug9("%s [device %u]", __PRETTY_FUNCTION__, deviceIndexM);
-  bytesDeliveredM = 0;
+  isPacketDeliveredM = false;
   tsBufferM->Clear();
   if (pTunerM)
      pTunerM->Open();
@@ -511,17 +505,13 @@ bool cSatipDevice::IsIdle(void)
   return !Receiving();
 }
 
-uchar *cSatipDevice::GetData(int *availableP, bool checkTsBuffer)
+uchar *cSatipDevice::GetData(int *availableP)
 {
   debug16("%s [device %u]", __PRETTY_FUNCTION__, deviceIndexM);
   if (isOpenDvrM && tsBufferM) {
      int count = 0;
-     if (bytesDeliveredM) {
+     if (isPacketDeliveredM)
-        tsBufferM->Del(bytesDeliveredM);
+        SkipData(TS_SIZE);
-        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) {
@@ -535,7 +525,7 @@ uchar *cSatipDevice::GetData(int *availableP, bool checkTsBuffer)
            info("Skipped %d bytes to sync on TS packet", count);
            return NULL;
            }
-        bytesDeliveredM = TS_SIZE;
+        isPacketDeliveredM = true;
         if (availableP)
            *availableP = count;
         // Update pid statistics
@@ -549,7 +539,8 @@ uchar *cSatipDevice::GetData(int *availableP, bool checkTsBuffer)
 void cSatipDevice::SkipData(int countP)
 {
   debug16("%s [device %u]", __PRETTY_FUNCTION__, deviceIndexM);
-  bytesDeliveredM = countP;
+  tsBufferM->Del(countP);
+  isPacketDeliveredM = false;
   // Update buffer statistics
   AddBufferStatistic(countP, tsBufferM->Available());
 }
@@ -563,12 +554,11 @@ bool cSatipDevice::GetTSPacket(uchar *&dataP)
      if (cCamSlot *cs = CamSlot()) {
         if (cs->WantsTsData()) {
            int available;
-           dataP = GetData(&available, checkTsBufferM);
+           dataP = GetData(&available);
-           if (!dataP)
+           if (dataP) {
-              available = 0;
+              dataP = cs->Decrypt(dataP, available);
-           dataP = cs->Decrypt(dataP, available);
+              SkipData(available);
-           SkipData(available);
+              }
-           checkTsBufferM = dataP != NULL;
            return true;
            }
         }

device.h

@@ -32,9 +32,8 @@ private:
     eTuningTimeoutMs = 1000  // in milliseconds
   };
   unsigned int deviceIndexM;
-  int bytesDeliveredM;
+  bool isPacketDeliveredM;
   bool isOpenDvrM;
-  bool checkTsBufferM;
   cString deviceNameM;
   cChannel channelM;
   cRingBufferLinear *tsBufferM;
@@ -65,7 +64,6 @@ 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;
 
@@ -85,7 +83,7 @@ protected:
 
   // for recording
 private:
-  uchar *GetData(int *availableP = NULL, bool checkTsBuffer = false);
+  uchar *GetData(int *availableP = NULL);
   void SkipData(int countP);
 
 protected:
@@ -101,7 +99,7 @@ public:
 
   // for transponder lock
 public:
-  virtual bool HasLock(int timeoutMsP = 0) const;
+  virtual bool HasLock(int timeoutMsP) const;
 
   // for common interface
 public:

po/ca_ES.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 2.3.1\n"
+"Project-Id-Version: vdr-satip 2.2.5\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"

po/de_DE.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 2.3.1\n"
+"Project-Id-Version: vdr-satip 2.2.5\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"

po/es_ES.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 2.3.1\n"
+"Project-Id-Version: vdr-satip 2.2.5\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"

po/fi_FI.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 2.3.1\n"
+"Project-Id-Version: vdr-satip 2.2.5\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"

po/pl_PL.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vdr-satip 2.3.1\n"
+"Project-Id-Version: vdr-satip 2.2.5\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"

satip.c

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

tuner.c

@@ -40,7 +40,6 @@ cSatipTuner::cSatipTuner(cSatipDeviceIf &deviceP, unsigned int packetLenP)
   externalStateM(),
   timeoutM(eMinKeepAliveIntervalMs),
   hasLockM(false),
-  signalStrengthDBmM(0.0),
   signalStrengthM(-1),
   signalQualityM(-1),
   frontendIdM(-1),
@@ -136,7 +135,6 @@ void cSatipTuner::Action(void)
                   // Quirk for devices without valid reception data
                   if (currentServerM.IsQuirk(cSatipServer::eSatipQuirkForceLock)) {
                      hasLockM = true;
-                     signalStrengthDBmM = eDefaultSignalStrengthDBm;
                      signalStrengthM = eDefaultSignalStrength;
                      signalQualityM = eDefaultSignalQuality;
                      }
@@ -266,7 +264,6 @@ bool cSatipTuner::Disconnect(void)
 
   // Reset signal parameters
   hasLockM = false;
-  signalStrengthDBmM = 0.0;
   signalStrengthM = -1;
   signalQualityM = -1;
   frontendIdM = -1;
@@ -336,9 +333,8 @@ 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:
@@ -674,12 +670,6 @@ 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,17 +78,16 @@ class cSatipTuner : public cThread, public cSatipTunerStatistics, public cSatipT
 {
 private:
   enum {
-    eDummyPid                 = 100,
+    eDummyPid               = 100,
-    eDefaultSignalStrengthDBm = -25,
+    eDefaultSignalStrength  = 15,
-    eDefaultSignalStrength    = 224,
+    eDefaultSignalQuality   = 224,
-    eDefaultSignalQuality     = 15,
+    eSleepTimeoutMs         = 250,   // in milliseconds
-    eSleepTimeoutMs           = 250,   // in milliseconds
+    eStatusUpdateTimeoutMs  = 1000,  // in milliseconds
-    eStatusUpdateTimeoutMs    = 1000,  // in milliseconds
+    ePidUpdateIntervalMs    = 250,   // in milliseconds
-    ePidUpdateIntervalMs      = 250,   // in milliseconds
+    eConnectTimeoutMs       = 5000,  // in milliseconds
-    eConnectTimeoutMs         = 5000,  // in milliseconds
+    eIdleCheckTimeoutMs     = 15000, // in milliseconds
-    eIdleCheckTimeoutMs       = 15000, // in milliseconds
+    eTuningTimeoutMs        = 20000, // in milliseconds
-    eTuningTimeoutMs          = 20000, // in milliseconds
+    eMinKeepAliveIntervalMs = 30000  // in milliseconds
-    eMinKeepAliveIntervalMs   = 30000  // in milliseconds
   };
   enum eTunerState { tsIdle, tsRelease, tsSet, tsTuned, tsLocked };
   enum eStateMode { smInternal, smExternal };
@@ -116,7 +115,6 @@ private:
   cVector<eTunerState> externalStateM;
   int timeoutM;
   bool hasLockM;
-  double signalStrengthDBmM;
   int signalStrengthM;
   int signalQualityM;
   int frontendIdM;
@@ -151,7 +149,6 @@ public:
   bool Close(void);
   int FrontendId(void);
   int SignalStrength(void);
-  double SignalStrengthDBm(void);
   int SignalQuality(void);
   bool HasLock(void);
   cString GetSignalStatus(void);