- put references to RtpDump to #ifdef USE_RTPDUMP where possible

src/engine/helper/HL_Rtp.cpp

@@ -7,8 +7,11 @@
 #include "HL_Exception.h"
 #include "HL_String.h"
 
-#include "jrtplib/src/rtprawpacket.h"
-#include "jrtplib/src/rtpipv4address.h"
+#if defined(USE_RTP_DUMP)
+# include "jrtplib/src/rtprawpacket.h"
+# include "jrtplib/src/rtpipv4address.h"
+#endif
+
 #if !defined(TARGET_WIN)
 # include <alloca.h>
 #endif
@@ -97,6 +100,7 @@ int RtpHelper::findPayloadLength(const void* buffer, size_t length)
         return -1;
 }
 
+#if defined(USE_RTPDUMP)
 RtpDump::RtpDump(const char *filename)
     :mFilename(filename)
 {}
@@ -172,6 +176,8 @@ void RtpDump::flush()
     }
     fclose(f);
 }
+#endif
+
 
 // -------------- MediaStreamId --------------------
 bool MediaStreamId::operator < (const MediaStreamId& right) const
@@ -206,7 +212,10 @@ void writeToJson(const MediaStreamId& id, std::ostringstream& oss)
     oss << "  \"src\": \"" << id.mSource.toStdString() << "\"," << std::endl
         << "  \"dst\": \"" << id.mDestination.toStdString() << "\"," << std::endl
         << "  \"ssrc\": \"" << StringHelper::toHex(id.mSSRC) << "\"," << std::endl
-        << "  \"link_id\": \"" << id.mLinkId.toString() << "\"" << std::endl;
+#if !defined(USE_NULL_UUID)
+        << "  \"link_id\": \"" << id.mLinkId.toString() << "\"" << std::endl
+#endif
+        ;
 }
 
 std::string MediaStreamId::getDetectDescription() const

src/engine/helper/HL_Rtp.h

@@ -6,8 +6,15 @@
 #ifndef __HL_RTP_H
 #define __HL_RTP_H
 
-#include "jrtplib/src/rtppacket.h"
-#include "HL_Uuid.h"
+#if defined(USE_RTPDUMP)
+# include "jrtplib/src/rtppacket.h"
+#endif
+
+#if !defined(USE_NULL_UUID)
+# include "HL_Uuid.h"
+#endif
+
+
 #include "HL_InternetAddress.h"
 
 #include <vector>
@@ -42,6 +49,7 @@ public:
     static int findPayloadLength(const void* buffer, size_t length);
 };
 
+#if defined(USE_RTPDUMP)
 class RtpDump
 {
 protected:
@@ -66,6 +74,7 @@ public:
     void add(const void* data, size_t len);
     void flush();
 };
+#endif
 
 struct MediaStreamId
 {
@@ -73,7 +82,9 @@ struct MediaStreamId
     InternetAddress mDestination;
     uint32_t mSSRC = 0;
     bool mSsrcIsId = true;
+#if !defined(USE_NULL_UUID)
     Uuid mLinkId;
+#endif
     bool operator < (const MediaStreamId& s2) const;
     bool operator == (const MediaStreamId& right) const;