fix build with latest WebRTC

mpromonet · Jan 28, 2024 · cba0a80 · cba0a80
1 parent 0454bc1
commit cba0a80
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -125,7 +125,7 @@ if (NOT EXISTS ${WEBRTCOBJS}/${CMAKE_STATIC_LIBRARY_PREFIX}webrtc${CMAKE_STATIC_
     SET (SHELLCOMMAND cmd /c )
   endif()
   EXECUTE_PROCESS(WORKING_DIRECTORY ${WEBRTCROOT}/src/out/${CMAKE_BUILD_TYPE} COMMAND ${SHELLCOMMAND} gn gen .)  
-  SET(NINJA_TARGET webrtc rtc_json jsoncpp builtin_video_decoder_factory builtin_video_encoder_factory peerconnection p2p_server_utils task_queue default_task_queue_factory)
+  SET(NINJA_TARGET webrtc rtc_json jsoncpp builtin_video_decoder_factory builtin_video_encoder_factory p2p_server_utils task_queue default_task_queue_factory)
   EXECUTE_PROCESS(WORKING_DIRECTORY ${WEBRTCROOT}/src/out/${CMAKE_BUILD_TYPE} COMMAND ${SHELLCOMMAND} ninja -l10 ${NINJA_TARGET})
 endif() 
 

diff --git a/config.json b/config.json
@@ -14,7 +14,6 @@
         "Bedford Hills": {"video": "rtsp://73.114.177.111/axis-media/media.amp"},
         "Pocapaglia": {"video": "rtsp://176.65.94.105/axis-media/media.amp"},
         "Norwich": {"video": "rtsp://37.157.51.30/axis-media/media.amp"},
-        "Montana": {"video": "rtsp://64.187.201.16/axis-media/media.amp"},
 
         "Great Falls": {"video": "rtsp://76.75.8.116/axis-media/media.amp", "position":"47.551039,-111.539400"},
         "Western Cape": {"video":"rtsp://196.21.92.82/axis-media/media.amp", "position":"-33.925840,18.423220"},
@@ -26,7 +25,7 @@
         "Vaison-La-Romaine": {"video":"rtsp://176.139.87.16/axis-media/media.amp", "position":"44.238960,5.074610" },
 
         "BigSky": {"video":"rtsp://76.75.8.120/axis-media/media.amp", "position":"45.284650,-111.368290"},
-        "Orlando": {"video":"rtsp://97.68.104.34/axis-media/media.amp", "position":"28.538340,-81.379240"},
-        "Wershofen": {"video":"rtsp://80.90.151.112/axis-media/media.amp", "position":"50.444820,6.813330"}        
+        "Orlando": {"video":"rtsp://97.68.104.34/axis-media/media.amp", "position":"28.538340,-81.379240"}
+
     }
 }
diff --git a/inc/PeerConnectionManager.h b/inc/PeerConnectionManager.h
@@ -159,7 +159,7 @@ class PeerConnectionManager {
 				for (const webrtc::RTCStats& stats : *report) {
 					Json::Value statsMembers;
 					for (auto & attribute : stats.Attributes()) {
-						statsMembers[attribute.name()] = attribute.ValueToString();
+						statsMembers[attribute.name()] = attribute.ToString();
 					}
 					m_report[stats.id()] = statsMembers;
 				}

diff --git a/src/main.cpp b/src/main.cpp
@@ -180,6 +180,7 @@ int main(int argc, char* argv[])
 				std::cout << "\t -T[username:password@]turn_address : start embeded TURN server (default:disabled)"				                         << std::endl;
 				std::cout << "\t -R Udp_port_min:Udp_port_min       : Set the webrtc udp port range (default:" << localWebrtcUdpPortRange << ")"         << std::endl;
 				std::cout << "\t -W webrtc_trials_fields            : Set the webrtc trials fields (default:" << webrtcTrialsFields << ")"               << std::endl;
+				std::cout << "\t -I icetransport                    : Set ice transport type (default:" << transportType << ")"                          << std::endl;
 #ifdef HAVE_SOUND				
 				std::cout << "\t -a[audio layer]                    : spefify audio capture layer to use (default:" << audioLayer << ")"                 << std::endl;
 #endif				
@@ -316,8 +317,8 @@ int main(int argc, char* argv[])
 					std::cout << "Failed to create TURN UDP server socket" << std::endl;
 				}
 
-				is.str(turnurl);
 				is.clear();
+				is.str(turnurl);
 				std::getline(is, addr, '@');
 				std::getline(is, addr, '@');
 				rtc::SocketAddress external_server_addr;