CI: Use temporary deps release (DO NOT MERGE)

Sean-Der · Jan 1, 2024 · 0e15dc6 · 0e15dc6
1 parent 0e50077
commit 0e15dc6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 23 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@ if(CMAKE_HOST_SYSTEM_NAME MATCHES "(Darwin)" OR OBS_CMAKE_VERSION VERSION_GREATE
   include(helpers)
 
   option(ENABLE_UI "Enable building with UI (requires Qt)" ON)
-  option(ENABLE_SCRIPTING "Enable scripting support" ON)
+  option(ENABLE_SCRIPTING "Enable scripting support" OFF)
   option(ENABLE_HEVC "Enable HEVC encoders" ON)
 
   add_subdirectory(libobs)

diff --git a/build-aux/modules/40-usrsctp.json b/build-aux/modules/40-usrsctp.json
@@ -15,8 +15,7 @@
         {
             "type": "git",
             "url": "https://github.com/sctplab/usrsctp.git",
-            "tag": "0.9.5.0",
-            "commit": "07f871bda23943c43c9e74cc54f25130459de830"
+            "commit": "ebb18adac6501bad4501b1f6dccb67a1c85cc299"
         }
     ]
 }
diff --git a/build-aux/modules/50-libdatachannel.json b/build-aux/modules/50-libdatachannel.json
@@ -12,10 +12,9 @@
     "sources": [
         {
             "type": "git",
-            "url": "https://github.com/paullouisageneau/libdatachannel.git",
+            "url": "https://github.com/sean-der/libdatachannel.git",
             "disable-submodules": true,
-            "tag": "v0.19.0-alpha.4",
-            "commit": "709a66339451bb4c8d4e5ced78c67605ec09da31"
+            "commit": "0e02e5a65de4216da6d9fbc9f79cfac2258e61bc"
         }
     ]
 }
diff --git a/buildspec.json b/buildspec.json
@@ -1,14 +1,14 @@
 {
     "dependencies": {
         "prebuilt": {
-            "version": "2023-11-03",
-            "baseUrl": "https://github.com/obsproject/obs-deps/releases/download",
+            "version": "2023-11-31",
+            "baseUrl": "https://github.com/sean-der/obs-deps/releases/download",
             "label": "Pre-Built obs-deps",
             "hashes": {
-                "macos-universal": "90c2fc069847ec2768dcc867c1c63b112c615ed845a907dc44acab7a97181974",
-                "windows-x64": "d0825a6fb65822c993a3059edfba70d72d2e632ef74893588cf12b1f0d329ce6",
-                "windows-x86": "b69c864275189464483c240ef3f25ea16fba3050b136fe6c3db6e9ee63036683",
-                "linux-x86_64": "9217c6b70854a08575cc3debe85ed5496bb0d8a9de54a1f8148aa71ad71f98d6"
+                "macos-universal": "67d6c450ee4588873cab0eb0a8ce9e4705a20f727a544f4c80632f25885ae5c0",
+                "windows-x64": "609756aee1210eb29939392f61d6cca315a7345c77c48c5cf5b3bf215596bcf1",
+                "windows-x86": "11ddea7ad65d65d10d78061db4f8b6203c19293c3eb9955efbbae5538d498a1f",
+                "linux-x86_64": "e91230822021a01405d40c6b9660e949d2011d2ab4212df64ad6a758a2757fca"
             }
         },
         "qt6": {

diff --git a/plugins/obs-webrtc/whip-output.cpp b/plugins/obs-webrtc/whip-output.cpp
@@ -112,16 +112,14 @@ void WHIPOutput::ConfigureAudioTrack(std::string media_stream_id,
 
 	auto rtp_config = std::make_shared<rtc::RtpPacketizationConfig>(
 		ssrc, cname, audio_payload_type,
-		rtc::OpusRtpPacketizer::defaultClockRate);
+		rtc::OpusRtpPacketizer::DefaultClockRate);
 	auto packetizer = std::make_shared<rtc::OpusRtpPacketizer>(rtp_config);
 	audio_sr_reporter = std::make_shared<rtc::RtcpSrReporter>(rtp_config);
 	auto nack_responder = std::make_shared<rtc::RtcpNackResponder>();
 
-	auto opus_handler =
-		std::make_shared<rtc::OpusPacketizationHandler>(packetizer);
-	opus_handler->addToChain(audio_sr_reporter);
-	opus_handler->addToChain(nack_responder);
-	audio_track->setMediaHandler(opus_handler);
+	packetizer->addToChain(audio_sr_reporter);
+	packetizer->addToChain(nack_responder);
+	audio_track->setMediaHandler(packetizer);
 }
 
 void WHIPOutput::ConfigureVideoTrack(std::string media_stream_id,
@@ -148,11 +146,9 @@ void WHIPOutput::ConfigureVideoTrack(std::string media_stream_id,
 	video_sr_reporter = std::make_shared<rtc::RtcpSrReporter>(rtp_config);
 	auto nack_responder = std::make_shared<rtc::RtcpNackResponder>();
 
-	auto h264_handler =
-		std::make_shared<rtc::H264PacketizationHandler>(packetizer);
-	h264_handler->addToChain(video_sr_reporter);
-	h264_handler->addToChain(nack_responder);
-	video_track->setMediaHandler(h264_handler);
+	packetizer->addToChain(video_sr_reporter);
+	packetizer->addToChain(nack_responder);
+	video_track->setMediaHandler(packetizer);
 }
 
 /**