update webrtc sdk

Author: mpromonet

.github/workflows/cpp-macos.yml

@@ -15,8 +15,7 @@ jobs:
     - run: git fetch --prune --unshallow --tags
 
     - name: pkg
-      run: | 
-          brew install p7zip openssl rtmpdump && brew link --force openssl
+      run: brew install p7zip openssl rtmpdump && brew link --force openssl
 
     - name: depot_tools
       run: |

CMakeLists.txt

@@ -4,7 +4,7 @@ project (webrtc-streamer)
 set (WEBRTCROOT "${CMAKE_CURRENT_SOURCE_DIR}/../webrtc" CACHE STRING "WEBRTC root directory")
 set (WEBRTCDESKTOPCAPTURE "ON" CACHE STRING "WEBRTC Desktop capture")
 set (WEBRTCCHROMEBRANDED "ON" CACHE STRING "WEBRTC Chrome branded")
-set (WEBRTCVERSION "a02f9fcedaf3ec73b05cc79c9e645a0ed0cceab0" CACHE STRING "WEBRTC version")
+set (WEBRTCVERSION "cc24329a5ad386e2736a476f3fc72995cdb2bae3" CACHE STRING "WEBRTC version")
 set (WEBRTCSTREAMERRESSOURCE "./html" CACHE STRING "WEBRTC ressource directory")
 
 if(NOT CMAKE_BUILD_TYPE)
@@ -200,7 +200,7 @@ MESSAGE("WEBRTCSTREAMERRESSOURCE = ${WEBRTCSTREAMERRESSOURCE}")
 FILE(GLOB_RECURSE WEBRTJSONCPPCOBJS ${WEBRTCOBJS}/third_party/jsoncpp/jsoncpp/*${CMAKE_C_OUTPUT_EXTENSION} ${WEBRTCOBJS}/rtc_base/rtc_json/*${CMAKE_C_OUTPUT_EXTENSION})
 FILE(GLOB_RECURSE WEBRTP2POBJ ${WEBRTCOBJS}/p2p/p2p_server_utils/*${CMAKE_C_OUTPUT_EXTENSION})
 SET (WEBRTCEXTRAOBJS ${WEBRTJSONCPPCOBJS} ${WEBRTP2POBJ} ${WEBRTCCOMOBJ})	
-FILE(GLOB SOURCE src/*.cpp ${WEBRTCROOT}/src/rtc_base/third_party/base64/base64.cc)
+FILE(GLOB SOURCE src/*.cpp)
 add_executable (${CMAKE_PROJECT_NAME} ${SOURCE} ${WEBRTCEXTRAOBJS})
 target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE inc) 
 

inc/VideoDecoder.h

@@ -17,7 +17,7 @@
 #include "api/environment/environment_factory.h"
 #include "modules/video_coding/include/video_error_codes.h"
 #include "modules/video_coding/h264_sprop_parameter_sets.h"
-#include "rtc_base/third_party/base64/base64.h"
+#include "rtc_base/base64.h"
 
 #include "SessionSink.h"
 #include "VideoScaler.h"
@@ -67,8 +67,14 @@ class VideoDecoder : public webrtc::VideoSourceInterface<webrtc::VideoFrame>, pu
             {
                 value.erase(pos);
             }
-            webrtc::Base64::DecodeFromArray(value.data(), value.size(), webrtc::Base64::DO_STRICT, &binary, nullptr);
-            binary.insert(binary.begin(), H26X_marker, H26X_marker+sizeof(H26X_marker));
+            std::optional<std::string> binaryResult = webrtc::Base64Decode(value);
+            if (!binaryResult) {
+                RTC_LOG(LS_ERROR) << "Cannot decode:" << value;
+            } else {
+                const std::string& decodedString = binaryResult.value();
+                binary.assign(decodedString.begin(), decodedString.end());        
+                binary.insert(binary.begin(), H26X_marker, H26X_marker+sizeof(H26X_marker));
+            }
 
             return binary;
         }