Added x unicode char to collate results script.

Author: sipsorcery

.github/workflows/peerconnection-test.yml

@@ -151,7 +151,7 @@ jobs:
           
       - name: Replace Peer Connection Test Results in README
         run: |
-          # Read the new content from DPeerConnection_test_results.md
+          # Read the new content from PeerConnection_test_results.md
           new_content="$(<PeerConnection_test_results.md)"
           
           # Use awk to replace content between the markers

README.md

@@ -24,7 +24,7 @@ Additional libraries/applications that currently have a Server implementation ar
   - [gstreamer](https://gstreamer.freedesktop.org/) `master` branch, commit ID `637b0d8dc25b660d3b05370e60a95249a5228a39` 20 Aug 2021 (gst-build commit ID `ebcca1e5ead27cab1eafc028332b1984c84b10b2` 26 Mar 2021).
   - [janus](https://janus.conf.meetecho.com/) version `0.10.7`, commit ID `04229be3eeceb28dbc57a70a57928aab223895a5`.
   - [kurento](https://www.kurento.org/) version `6.16.1~1.g907a859`.
-  - [libwebrtc](https://webrtc.googlesource.com/src/) `m90` branch, commit ID `a4da76a880d31f012038ac721ac4abc7ea3ffa2d`, commit date `Fri Apr 9 21:03:39 2021 -0700`.
+  - [libwebrtc](https://webrtc.googlesource.com/src/) `m132` branch, commit ID `f632fe9be9ce5cef5fcbfd42995271cb3fbb077d`, commit date `Tue Dec 10 09:27:33 2024 +0100`.
 
 ## Interoperability Tests
 

libwebrtc/Dockerfile

@@ -14,15 +14,15 @@ COPY --from=builder /src/webrtc-checkout/src /src/webrtc-checkout/src
 WORKDIR /src/libwebrtc-webrtc-echo
 COPY ["CMakeLists.txt", "fake_audio_capture_module.*", "HttpSimpleServer.*", "json.hpp", "libwebrtc-webrtc-echo.cpp", "PcFactory.*", "PcObserver.*", "./"]
 WORKDIR /src/libwebrtc-webrtc-echo/build
-#RUN cmake .. && make VERBOSE=1 && cp libwebrtc-webrtc-echo /
+RUN cmake .. && make VERBOSE=1 && cp libwebrtc-webrtc-echo /
 
-#FROM ubuntu:latest as final
+FROM ubuntu:latest as final
 
 # Install packages with the required runtime libraries.
-#RUN apt update && DEBIAN_FRONTEND="noninteractive" apt install -y \
-#   libevent-dev libx11-dev libglib2.0-dev libatomic1 --no-install-recommends
+RUN apt update && DEBIAN_FRONTEND="noninteractive" apt install -y \
+   libevent-dev libx11-dev libglib2.0-dev libatomic1 --no-install-recommends
 
-#COPY --from=appbuilder /libwebrtc-webrtc-echo /libwebrtc-webrtc-echo
+COPY --from=appbuilder /libwebrtc-webrtc-echo /libwebrtc-webrtc-echo
 
-#EXPOSE 8080
-#ENTRYPOINT ["/libwebrtc-webrtc-echo"]
+EXPOSE 8080
+ENTRYPOINT ["/libwebrtc-webrtc-echo"]

libwebrtc/PcFactory.cpp

@@ -38,6 +38,7 @@
 #include <api/video_codecs/video_encoder_factory.h>
 #include <media/engine/webrtc_media_engine.h>
 #include "api/enable_media.h"
+#include "fake_audio_capture_module.h"
 
 #include <iostream>
 #include <sstream>
@@ -53,11 +54,6 @@ PcFactory::PcFactory() :
   SignalingThread = rtc::Thread::Create();
   SignalingThread->Start();
 
-  _networkThread = rtc::Thread::CreateWithSocketServer();
-  _networkThread->Start();
-  _workerThread = rtc::Thread::Create();
-  _workerThread->Start();
-
   webrtc::AudioProcessing::Config apmConfig;
   apmConfig.gain_controller1.enabled = false;
   apmConfig.gain_controller2.enabled = false;
@@ -66,17 +62,11 @@ PcFactory::PcFactory() :
    webrtc::PeerConnectionFactoryDependencies _pcf_deps;
   _pcf_deps.task_queue_factory = webrtc::CreateDefaultTaskQueueFactory();
   _pcf_deps.signaling_thread = SignalingThread.get();
-  _pcf_deps.network_thread = _networkThread.get();
-  _pcf_deps.worker_thread = _workerThread.get();
   _pcf_deps.event_log_factory = std::make_unique<webrtc::RtcEventLogFactory>(_pcf_deps.task_queue_factory.get());
   _pcf_deps.audio_encoder_factory = webrtc::CreateBuiltinAudioEncoderFactory();
   _pcf_deps.audio_decoder_factory = webrtc::CreateBuiltinAudioDecoderFactory();
-  //_pcf_deps.adm = rtc::scoped_refptr<webrtc::AudioDeviceModule>(FakeAudioCaptureModule::Create());
-
-  webrtc::AudioProcessing::Config config;
-  config.gain_controller1.enabled = false;
-  config.gain_controller2.enabled = false;
-  _pcf_deps.audio_processing = std::move(apm);
+  _pcf_deps.adm = rtc::scoped_refptr<webrtc::AudioDeviceModule>(FakeAudioCaptureModule::Create());
+  _pcf_deps.audio_processing = apm; // Gets moved in EnableMedia.
 
   webrtc::EnableMedia(_pcf_deps);
 

libwebrtc/PcFactory.h

@@ -28,7 +28,6 @@
 #include "call/call_config.h"
 #include "pc/media_factory.h"
 #include "rtc_base/checks.h"
-//#include <pc/test/fake_audio_capture_module.h>
 
 #include <condition_variable>
 #include <memory>
@@ -40,11 +39,17 @@ class PcFactory {
   PcFactory();
   ~PcFactory();
   std::string CreatePeerConnection(const char* buffer, int length);
+
+  /* The thread logic is now tricky. I was not able to get even a basic peer connection
+  * example working on Windows in debug mode due to the failing thread checks, see
+  * https://groups.google.com/u/2/g/discuss-webrtc/c/HG9hzDP2djA
+// From peer_connection_interface.h line 1632 
+// If `network_thread` or `worker_thread` are null, the PeerConnectionFactory
+// will create the necessary thread internally. If `signaling_thread` is null,
+// the PeerConnectionFactory will use the thread on which this method is called
+// as the signaling thread, wrapping it in an rtc::Thread object if needed.
+  */
   std::unique_ptr<rtc::Thread> SignalingThread;
-  std::unique_ptr<rtc::Thread> _networkThread;
-  std::unique_ptr<rtc::Thread> _workerThread;
-  //rtc::scoped_refptr<webrtc::AudioDeviceModule> _fakeAudioCapture;
-  //rtc::scoped_refptr<webrtc::AudioDeviceModule> _fakeAudioModule;
 
 private:
   rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> _peerConnectionFactory;

libwebrtc/README.md

@@ -10,7 +10,7 @@ If the build fails:
 
 2. `docker run -it --init --rm libwebrtc-builder:m132`
 
-## Building end application docker image
+## Building echo application docker image
 
 The application image. It builds the application on an instance of the builder image and then copies the binary to a new ubuntu image and installs the required shared library packages.
 
@@ -22,7 +22,7 @@ If the build fails:
 
 2. `docker run -it --init --rm libwebrtc-webrtc-echo:m132`
 
-## Running docker image
+## Running echo application docker image
 
 `docker run -it --init --rm -p 8080:8080 libwebrtc-webrtc-echo:m132`
 
@@ -55,6 +55,8 @@ src> ninja -C out/Default
 
 Update Dec 2024 for version m132.
 
+NOTE: Only the clang build chain is now supported for the libwebrtc build. To use webrtc.lib with Visual Studio the clang build chain can be installed via the Visual Studio Installer and then selected as the option in the project settings.
+
 Install the Google depot tools as per https://webrtc.googlesource.com/src/+/main/docs/native-code/development/prerequisite-sw/.
 
 In the webrtc-checkout directory, e.g. c:\dev\webrtc-checkout: