Merge pull request #107 from martim01/live555_2022_09

2022-7 and 2210-31
martim01 · Aug 3, 2023 · 5ff4b93 · 5ff4b93
2 parents 9f68d46 + 7fd9e83
commit 5ff4b93
Show file tree

Hide file tree

Showing 101 changed files with 4,354 additions and 3,192 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
-cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
 project(pamworkspace VERSION 1.5.4)
 
-SET(CMAKE_CXX_STANDARD 14)
+set(CMAKE_INSTALL_PREFIX "/usr/local")
 
 SET(NMOS OFF CACHE BOOL "set to ON to include NMOS")
 
@@ -15,7 +15,7 @@ SET(DIR_PTPMONKEY ${DIR_BASE}/ptpmonkey CACHE STRING "location of ptpmonkey")
 SET(DIR_SAPSERVER ${DIR_BASE}/sapserver CACHE STRING "location of sapserver")
 SET(DIR_LOG ${DIR_BASE}/log CACHE STRING "location of pml log")
 SET(DIR_DNSSD ${DIR_BASE}/dnssd CACHE STRING "location of pml dnssd")
-SET(DIR_RESTGOOSE ${DIR_BASE}/restgoose CACHE STRING "location of pml restgoose")
+SET(DIR_RESTGOOSE ${DIR_BASE}/Restgoose CACHE STRING "location of pml restgoose")
 
 #set the following to off so we build them rather than one of the sub projects
 SET(BUILD_DNSSD OFF)
@@ -124,6 +124,8 @@ else()
         unset(NMOS_TEMP_DIR2)
     else()
         message(STATUS "restgoose found - update to latest version")
+        execute_process(COMMAND git -C ${DIR_RESTGOOSE} checkout v3_7.10)
+        #execute_process(COMMAND git -C ${DIR_RESTGOOSE} pull)
         execute_process(COMMAND git -C ${DIR_RESTGOOSE} pull --no-rebase)
     endif()
     unset(NMOS_TEMP_DIR)
@@ -209,8 +211,6 @@ message(STATUS "Configure plugin fftdiff")
 add_subdirectory(plugins/fftdiff)
 message(STATUS "Configure plugin correlation")
 add_subdirectory(plugins/correlation)
-message(STATUS "Configure bob")
-add_subdirectory(plugins/bob)
 #Add new plugin projects above this line
 
 message(STATUS "Configure pam2")

diff --git a/InitialSetup/CMakeLists.txt b/InitialSetup/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.3.16 FATAL_ERROR)
 project(InitialSetup LANGUAGES CXX VERSION 1.0.0.0)
 
 execute_process(COMMAND ${CMAKE_COMMAND} -DNAMESPACE=${PROJECT_NAME} -DMAJOR=${PROJECT_VERSION_MAJOR} -DMINOR=${PROJECT_VERSION_MINOR} -DPATCH=${PROJECT_VERSION_PATCH} -P ${CMAKE_SOURCE_DIR}/version.cmake)
@@ -26,11 +26,11 @@ target_link_libraries(InitialSetup ${wxWidgets_LIBRARIES} pambase restgoose ssl)
 
 
 
-set_property(TARGET InitialSetup PROPERTY CXX_STANDARD 14)
+set_property(TARGET InitialSetup PROPERTY CXX_STANDARD 17)
 set_target_properties(InitialSetup PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../../bin/")
 
 
 #linux specific
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-install(TARGETS InitialSetup RUNTIME DESTINATION /usr/local/bin)
+install(TARGETS InitialSetup RUNTIME DESTINATION bin)
 endif()
diff --git a/documents/pam2.ini b/documents/pam2.ini
@@ -34,7 +34,7 @@ generators=White,Grey
 AoIP=0
 Device=0
 Reset=0
-Type=Soundcard
+Type=Disabled
 [Log]
 Level=2
 ScrollLock=0
@@ -48,19 +48,20 @@ _Options=0
 [Monitor]
 Source=0
 [Monitor Plugins]
-0000=meters
-0001=anglemeters
-0002=lissajou
-0003=fft
-0004=r128
-0005=spectogram
-0006=scope
-0007=aoipinfo
-0008=ptp
-0009=radar
-0010=polarscope
-0011=waveform
-0012=fftphase
+0000=r128
+0001=bob
+0002=aoipinfo
+0003=waveform
+0004=fftphase
+0005=radar
+0006=fft
+0007=scope
+0008=meters
+0009=polarscope
+0010=anglemeters
+0011=lissajou
+0012=spectogram
+0013=correlation
 [Monitor::Angle Meters]
 DisplayText_Current=1
 DisplayText_Peak=1
@@ -146,16 +147,20 @@ Channel_5=0
 Channel_6=1
 Channel_7=0
 Channel_8=1
-Destination=Disabled
+Destination=AoIP
 Device=0
 Enabled=0
 Latency=200
 Left=0
 Right=1
 Sequence=glits
 Source=Sequence
+[PTP Monkey]
+_Options=0
 [QoS]
 Interval=1000
+[R128]
+_Options=0
 [Server]
 ChannelMapping=St
 Channels=2
@@ -165,14 +170,14 @@ PacketTime=1000
 RTP_Port=5004
 RTSP_Address=192.168.1.123
 RTSP_Interface=eth0
-State=1
+State=0
 Stream=AlwaysOn
 [Session Info]
 Graph=kBit/s
 Type=Line Graph
 _Options=0
 [Settings]
-_Options=0
+_Options=7
 [Splash]
 Screen=Main
 [Startup]
@@ -190,7 +195,7 @@ Lock=0
 0008=bufferlog
 0009=LTC
 0010=lineup
-0011=InputAlign
+0011=car
 [Test::InputAlign]
 Channel=0
 [Test::Levels]
@@ -205,4 +210,4 @@ _Panel=3
 LTC_Format=2
 Sync=0
 [Version]
-pam2=1.6.0-05095fa.x
+pam2=1.6.1-9f68d46
diff --git a/dosetup/CMakeLists.txt b/dosetup/CMakeLists.txt
@@ -1,6 +1,7 @@
-cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
 project(dosetup LANGUAGES CXX VERSION 1.0.0.0)
 
+
 execute_process(COMMAND ${CMAKE_COMMAND} -DNAMESPACE=${PROJECT_NAME} -DMAJOR=${PROJECT_VERSION_MAJOR} -DMINOR=${PROJECT_VERSION_MINOR} -DPATCH=${PROJECT_VERSION_PATCH} -P ${CMAKE_SOURCE_DIR}/version.cmake)
 
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
@@ -21,12 +22,12 @@ target_link_libraries(dosetup pml_log)
 
 
 
-set_property(TARGET dosetup PROPERTY CXX_STANDARD 14)
+set_property(TARGET dosetup PROPERTY CXX_STANDARD 17)
 set_target_properties(dosetup PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../../bin/")
 
 
 #linux specific
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-install(TARGETS dosetup RUNTIME DESTINATION /usr/local/bin)
+install(TARGETS dosetup RUNTIME DESTINATION bin)
 endif()
 
diff --git a/external/live/liveMedia/RTPSource.cpp b/external/live/liveMedia/RTPSource.cpp
@@ -399,6 +399,13 @@ void RTPReceptionStats::reset() {
   fLastResetExtSeqNumReceived = fHighestExtSeqNumReceived;
 }
 
+
+void RTPReceptionStats::resetMinMax()
+{
+  fMinInterPacketGapUS = 0x7FFFFFFF;
+  fMaxInterPacketGapUS = 0;
+}
+
 Boolean seqNumLT(u_int16_t s1, u_int16_t s2) {
   // a 'less-than' on 16-bit sequence numbers
   int diff = s2-s1;

diff --git a/external/live/liveMedia/include/RTPSource.hh b/external/live/liveMedia/include/RTPSource.hh
@@ -214,11 +214,12 @@ public:
 
   unsigned minInterPacketGapUS() const { return fMinInterPacketGapUS; }
   unsigned maxInterPacketGapUS() const { return fMaxInterPacketGapUS; }
-  unsigned currentInterPacketGapUS() const { return fCurrentInterPacketGapUS; }
   struct timeval const& totalInterPacketGaps() const {
     return fTotalInterPacketGaps;
   }
 
+  void resetMinMax();
+
 protected:
   // called only by RTPReceptionStatsDB:
   friend class RTPReceptionStatsDB;

diff --git a/pam2/CMakeLists.txt b/pam2/CMakeLists.txt
@@ -1,5 +1,5 @@
-cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
-project(pam2 LANGUAGES CXX VERSION 1.6.1)
+cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
+project(pam2 LANGUAGES CXX VERSION 1.7.1)
 
 execute_process(COMMAND ${CMAKE_COMMAND} -DNAMESPACE=${PROJECT_NAME} -DMAJOR=${PROJECT_VERSION_MAJOR} -DMINOR=${PROJECT_VERSION_MINOR} -DPATCH=${PROJECT_VERSION_PATCH} -P ${CMAKE_SOURCE_DIR}/version.cmake)
 
@@ -73,21 +73,19 @@ target_link_libraries(pam2 optimized pamfft debug pamfftd)
 target_link_libraries(pam2 optimized pamlevel debug pamleveld)
 
 
+set_target_properties(pam2 PROPERTIES CXX_STANDARD 17)
 set_target_properties(pam2 PROPERTIES RUNTIME_OUTPUT_DIRECTORY "../../bin/")
 
 #linux specific
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-install(TARGETS pam2 RUNTIME DESTINATION /usr/local/bin)
+install(TARGETS pam2 RUNTIME DESTINATION bin)
 install(CODE "execute_process(COMMAND setcap cap_sys_time,cap_sys_admin,cap_net_bind_service+ep /usr/local/bin/pam2 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})")
-install(CODE "execute_process(COMMAND cp ${CMAKE_SOURCE_DIR}/documents/pam2.conf /etc/ld.so.conf.d/)")
+install(FILES ${CMAKE_SOURCE_DIR}/documents/pam2.conf DESTINATION "../../etc/ld.so.conf.d/")
 install(CODE "execute_process(COMMAND ldconfig)")
-install(CODE "execute_process(COMMAND mkdir -p ${DIR_PAM})")
-install(CODE "execute_process(COMMAND chown ${DIR_PAM} -Rv --reference=${DIR_PAM}/..)")
-install(CODE "execute_process(COMMAND cp -p ${CMAKE_SOURCE_DIR}/documents/audio_hats.xml ${DIR_PAM})")
-install(CODE "execute_process(COMMAND cp -p ${CMAKE_SOURCE_DIR}/documents/macaddress.xml ${DIR_PAM})")
-install(CODE "execute_process(COMMAND cp -p ${CMAKE_SOURCE_DIR}/documents/ppmtypes.xml ${DIR_PAM})")
-install(CODE "execute_process(COMMAND cp -p ${CMAKE_SOURCE_DIR}/documents/r128types.xml ${DIR_PAM})")
-install(CODE "execute_process(COMMAND cp -p ${CMAKE_SOURCE_DIR}/documents/pam2.ini ${DIR_PAM})")
-install(CODE "execute_process(COMMAND cp -rp ${CMAKE_SOURCE_DIR}/documents/help ${DIR_PAM})")
-install(CODE "execute_process(COMMAND cp -rp ${CMAKE_SOURCE_DIR}/documents/generator ${DIR_PAM})")
+install(FILES ${CMAKE_SOURCE_DIR}/documents/audio_hats.xml DESTINATION etc/pam2/)
+install(FILES  ${CMAKE_SOURCE_DIR}/documents/macaddress.xml DESTINATION etc/pam2/)
+install(FILES  ${CMAKE_SOURCE_DIR}/documents/ppmtypes.xml DESTINATION etc/pam2/)
+install(FILES  ${CMAKE_SOURCE_DIR}/documents/pam2.ini DESTINATION etc/pam2/)
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/documents/help DESTINATION etc/pam2/)
+install(DIRECTORY  ${CMAKE_SOURCE_DIR}/documents/generator DESTINATION /etc/pam2/)
 endif()
diff --git a/pam2/pam2Main.cpp b/pam2/pam2Main.cpp
@@ -297,7 +297,7 @@ pam2Dialog::pam2Dialog(wxWindow* parent,wxWindowID id) :
     m_ppnlLog = new pnlLog(m_pswpMain);
 
     pml::LogStream::AddOutput(std::make_unique<pml::LogOutput>());
-    pml::LogStream::SetOutputLevel(pml::LOG_TRACE);
+    pml::LogStream::SetOutputLevel(pml::LOG_DEBUG);
 
     wxImage img(16,16);
     img.SetRGB(wxRect(0,0,16,16),0,0,0);