feat: update libwebrtc m84 (#148)

* update libwebrtc m84 * fix compile error * fix agent image for build libwebrtc * change url for m84 * add unityvideodecoder for test * fix pip access * add envver of vs2017 path (cherry picked from commit 2786e3b) * invoke ci * fix lint * fix: fixed pack error on yamato (#144) * fixed pack error on yamato * fix build error on macos * fixed build error on macos * pip is not found Co-authored-by: Takashi KANNAN <[email protected]>
Unity-Technologies · Jul 30, 2020 · 142791e · 142791e
1 parent dee3c50
commit 142791e
Show file tree

Hide file tree

Showing 23 changed files with 152 additions and 28 deletions.
diff --git a/.yamato/meta/environments.yml b/.yamato/meta/environments.yml
@@ -2,4 +2,4 @@ upm:
   registry_url: https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
   package_version: stable
 webrtc_version:
-  name: M79
+  name: M84
diff --git a/.yamato/upm-ci-libwebrtc.yml b/.yamato/upm-ci-libwebrtc.yml
@@ -3,12 +3,12 @@
 platforms:
   - name: win
     type: Unity::VM
-    image: renderstreaming/win10:v0.2.5-499025
+    image: renderstreaming/win10:latest
     flavor: b1.xlarge
     build_command: BuildScripts~/build_libwebrtc_win.cmd
   - name: macos
     type: Unity::VM::osx
-    image: buildfarm/mac:stable
+    image: slough-ops/macos-10.14-xcode:stable
     flavor: m1.mac  
     build_command: BuildScripts~/build_libwebrtc_macos.sh
   - name: linux

diff --git a/.yamato/upm-ci-webrtc-packages.yml b/.yamato/upm-ci-webrtc-packages.yml
@@ -74,8 +74,6 @@ pack_{{ package.name }}:
     flavor: b1.large
   commands:
     - npm install upm-ci-utils@{{ upm.package_version }} -g --registry {{ upm.registry_url }}
-    - unzip -qq -o macos_plugin*
-    - rm macos_plugin*
     - upm-ci package pack  
   artifacts:
     {{ package.name }}_package:  
@@ -133,7 +131,7 @@ test_{{ package.name }}_{{ param.platform }}_{{ param.backend }}_{{ platform.nam
     - npm install upm-ci-utils@{{ upm.package_version }} -g --registry {{ upm.registry_url }}
     - git clone [email protected]:unity/utr.git
     - rm -Rf ./utr/.git
-    - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install --user unity-downloader-cli --extra-index-url https://artifactory.eu-cph-1.unityops.net/api/pypi/common-python/simple'" 
+    - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade --user'" 
     - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r ../com.unity.webrtc/ bokken@$BOKKEN_DEVICE_IP:~/com.unity.webrtc
     - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -pr ./utr/ bokken@$BOKKEN_DEVICE_IP:~/com.unity.webrtc/
     - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli -u {{ editor_mac_version }} -c editor --wait --published'
@@ -158,6 +156,79 @@ test_{{ package.name }}_{{ param.platform }}_{{ param.backend }}_{{ platform.nam
 {% endfor %}
 
 
+{% endif -%}
+{% endfor %}
+
+{% for platform in platforms %}
+{% if platform.name != "macos" -%}
+
+{% for editor in editors %}
+codecoverage_{{ package.name }}_{{ platform.name }}_{{ editor.version }}:
+  name: Codecoverage {{ package.packagename }} {{ platform.name }} {{ editor.version }}
+  agent:
+    type: {{ platform.type }}
+    image: {{ platform.image }}
+    flavor: {{ platform.flavor }}
+  commands:
+    - npm install upm-ci-utils@{{ upm.package_version }} -g --registry {{ upm.registry_url }}
+    - upm-ci package test -u {{ editor.version }} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;generateBadgeReport;assemblyFilters:-UnityEngine.*,+Unity.WebRTC"
+  triggers:
+    branches:
+      only:
+      - "/.*/"
+      except:
+      - "master"
+  artifacts:
+    {{ package.name }}_{{ editor.version }}_{{ platform.name }}_coverage_results: 
+      paths:
+        - "upm-ci~/test-results/**"
+  dependencies:
+    - .yamato/upm-ci-{{ package.name }}-packages.yml#pack_{{ package.name }}
+{% endfor %}
+
+{% else -%}
+
+{% for editor in editors %}
+codecoverage_{{ package.name }}_{{ platform.name }}_{{ editor.version }}:
+  name: Codecoverage {{ package.packagename }} {{ platform.name }} {{ editor.version }}
+  agent:
+    type: {{ platform.type }}
+    image: {{ platform.image }}
+    flavor: {{ platform.flavor }}
+  commands:
+    - |
+      cd ../
+      ls com.unity.webrtc/upm-ci~/packages/com.unity.webrtc-*.tgz | xargs tar xzvf
+      cp -rf package/ com.unity.webrtc
+      cd com.unity.webrtc
+    - brew install node
+    - npm install upm-ci-utils@{{ upm.package_version }} -g --registry {{ upm.registry_url }}
+    - git clone [email protected]:unity/utr.git
+    - rm -Rf ./utr/.git
+    - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade --user'" 
+    - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r ../com.unity.webrtc/ bokken@$BOKKEN_DEVICE_IP:~/com.unity.webrtc
+    - scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -pr ./utr/ bokken@$BOKKEN_DEVICE_IP:~/com.unity.webrtc/
+    - ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli -u {{ editor_mac_version }} -c editor --wait --published'
+    - |
+      ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/com.unity.webrtc/WebRTC~ && ~/com.unity.webrtc/utr/utr --suite=editor --suite=playmode --testproject=/Users/bokken/com.unity.webrtc/WebRTC~ --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/com.unity.webrtc/WebRTC~/test-results --extra-editor-arg="-enablePackageManagerTraces" --enable-code-coverage --coverage-results-path=/Users/bokken/com.unity.webrtc/WebRTC~/test-results --coverage-options="generateAdditionalMetrics;generateHtmlReport;generateBadgeReport;assemblyFilters:-UnityEngine.*,+Unity.WebRTC"'
+      UTR_RESULT=$?
+      mkdir -p upm-ci~/test-results/
+      scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/com.unity.webrtc/WebRTC~/test-results/ upm-ci~/test-results/
+      exit $UTR_RESULT
+  triggers:
+    branches:
+      only:
+      - "/.*/"
+      except:
+      - "master"
+  artifacts:
+    {{ package.name }}_{{ editor.version }}_{{ platform.name }}_coverage_results: 
+      paths:
+        - "upm-ci~/test-results/**"
+  dependencies:
+    - .yamato/upm-ci-{{ package.name }}-packages.yml#pack_{{ package.name }}
+{% endfor %}
+
 {% endif -%}
 {% endfor %}
 

diff --git a/BuildScripts~/build_libwebrtc_linux.sh b/BuildScripts~/build_libwebrtc_linux.sh
@@ -6,7 +6,7 @@ then
 fi
 
 export PATH="$(pwd)/depot_tools:$PATH"
-export WEBRTC_VERSION=m79
+export WEBRTC_VERSION=4147
 export OUTPUT_DIR="$(pwd)/out"
 export ARTIFACTS_DIR="$(pwd)/artifacts"
 

diff --git a/BuildScripts~/build_libwebrtc_macos.sh b/BuildScripts~/build_libwebrtc_macos.sh
@@ -6,7 +6,7 @@ then
 fi
 
 export PATH="$(pwd)/depot_tools:$PATH"
-export WEBRTC_VERSION=m79
+export WEBRTC_VERSION=4147
 export OUTPUT_DIR="$(pwd)/out"
 export ARTIFACTS_DIR="$(pwd)/artifacts"
 

diff --git a/BuildScripts~/build_libwebrtc_win.cmd b/BuildScripts~/build_libwebrtc_win.cmd
@@ -5,13 +5,14 @@ git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools
 )
 
 set PATH=%cd%\depot_tools;%PATH%
-set WEBRTC_VERSION=m79
+set WEBRTC_VERSION=4147
 set DEPOT_TOOLS_WIN_TOOLCHAIN=0
 set CPPFLAGS=/WX-
 set GYP_GENERATORS=ninja,msvs-ninja
 set GYP_MSVS_VERSION=2017
 set OUTPUT_DIR=out
 set ARTIFACTS_DIR=%cd%\artifacts
+set vs2017_install=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools
 
 cmd /k fetch.bat webrtc
 
@@ -26,7 +27,7 @@ REM add jsoncpp
 patch "src\BUILD.gn" < "BuildScripts~\add_jsoncpp.patch"
 
 REM install pywin32
-cmd /k %cd%\depot_tools\bootstrap-3_8_0_chromium_8_bin\python\bin\python.exe -m pip install pywin32
+cmd /k %cd%\depot_tools\bootstrap-3_8_0_chromium_8_bin\python\bin\python.exe -m pip install pywin32 --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
 
 cmd /k gn.bat gen %OUTPUT_DIR% --root="src" --args="is_debug=false is_clang=false target_cpu=\"x64\" rtc_include_tests=false rtc_build_examples=false rtc_use_h264=false symbol_level=0 enable_iterator_debugging=false"
 

diff --git a/BuildScripts~/build_plugin.cmd b/BuildScripts~/build_plugin.cmd
@@ -1,6 +1,6 @@
 @echo off
 
-set LIBWEBRTC_DOWNLOAD_URL=https://github.com/Unity-Technologies/com.unity.webrtc/releases/download/M79/webrtc-win.zip
+set LIBWEBRTC_DOWNLOAD_URL=https://github.com/Unity-Technologies/com.unity.webrtc/releases/download/M84/webrtc-win.zip
 set SOLUTION_DIR=%cd%\Plugin~
 
 echo -------------------

diff --git a/BuildScripts~/build_plugin.sh b/BuildScripts~/build_plugin.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export LIBWEBRTC_DOWNLOAD_URL=https://github.com/Unity-Technologies/com.unity.webrtc/releases/download/M79/webrtc-linux.zip
+export LIBWEBRTC_DOWNLOAD_URL=https://github.com/Unity-Technologies/com.unity.webrtc/releases/download/M84/webrtc-linux.zip
 export SOLUTION_DIR=$(pwd)/Plugin~
 
 # Download LibWebRTC 

diff --git a/BuildScripts~/build_plugin_mac.sh b/BuildScripts~/build_plugin_mac.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export LIBWEBRTC_DOWNLOAD_URL=https://github.com/Unity-Technologies/com.unity.webrtc/releases/download/M79/webrtc-mac.zip
+export LIBWEBRTC_DOWNLOAD_URL=https://github.com/Unity-Technologies/com.unity.webrtc/releases/download/M84/webrtc-mac.zip
 export SOLUTION_DIR=$(pwd)/Plugin~
 
 # Install cmake

diff --git a/Plugin~/WebRTCPlugin/Context.cpp b/Plugin~/WebRTCPlugin/Context.cpp
@@ -8,6 +8,7 @@
 #include "MediaStreamObserver.h"
 #include "SetSessionDescriptionObserver.h"
 #include "UnityVideoEncoderFactory.h"
+#include "UnityVideoDecoderFactory.h"
 
 namespace unity
 {
@@ -149,10 +150,14 @@ namespace webrtc
 #if defined(SUPPORT_METAL) && defined(SUPPORT_SOFTWARE_ENCODER)
         //Always use SoftwareEncoder on Mac for now.
         std::unique_ptr<webrtc::VideoEncoderFactory> videoEncoderFactory = webrtc::CreateBuiltinVideoEncoderFactory();
+        std::unique_ptr<webrtc::VideoDecoderFactory> videoDecoderFactory = webrtc::CreateBuiltinVideoDecoderFactory();
 #else
         std::unique_ptr<webrtc::VideoEncoderFactory> videoEncoderFactory =
             m_encoderType == UnityEncoderType::UnityEncoderHardware ?
             std::make_unique<UnityVideoEncoderFactory>(static_cast<IVideoEncoderObserver*>(this)) : webrtc::CreateBuiltinVideoEncoderFactory();
+        std::unique_ptr<webrtc::VideoDecoderFactory> videoDecoderFactory =
+            m_encoderType == UnityEncoderType::UnityEncoderHardware ?
+            std::make_unique<UnityVideoDecoderFactory>() : webrtc::CreateBuiltinVideoDecoderFactory();
 #endif
 
         m_peerConnectionFactory = webrtc::CreatePeerConnectionFactory(
@@ -163,7 +168,7 @@ namespace webrtc
                                 webrtc::CreateAudioEncoderFactory<webrtc::AudioEncoderOpus>(),
                                 webrtc::CreateAudioDecoderFactory<webrtc::AudioDecoderOpus>(),
                                 std::move(videoEncoderFactory),
-                                webrtc::CreateBuiltinVideoDecoderFactory(),
+                                std::move(videoDecoderFactory),
                                 nullptr,
                                 nullptr);
     }

diff --git a/Plugin~/WebRTCPlugin/DummyVideoEncoder.cpp b/Plugin~/WebRTCPlugin/DummyVideoEncoder.cpp
@@ -81,8 +81,7 @@ namespace webrtc
             m_setKeyFrame(m_encoderId);
         }
 
-        m_encodedImage.set_buffer(&frameDataBuffer[0], frameDataBuffer.capacity());
-        m_encodedImage.set_size(frameDataBuffer.size());
+        m_encodedImage.SetEncodedData(webrtc::EncodedImageBuffer::Create(&frameDataBuffer[0], frameDataBuffer.size()));
 
         m_fragHeader.VerifyAndAllocateFragmentationHeader(naluIndices.size());
         m_fragHeader.fragmentationVectorSize = static_cast<uint16_t>(naluIndices.size());

diff --git a/Plugin~/WebRTCPlugin/SetSessionDescriptionObserver.cpp b/Plugin~/WebRTCPlugin/SetSessionDescriptionObserver.cpp
@@ -35,7 +35,7 @@ namespace webrtc
         }
     }
 
-    void SetSessionDescriptionObserver::OnFailure(const std::string& error)
+    void SetSessionDescriptionObserver::OnFailure(webrtc::RTCError error)
     {
         for (auto delegate : m_vectorDelegateSetSDFailure)
         {

diff --git a/Plugin~/WebRTCPlugin/SetSessionDescriptionObserver.h b/Plugin~/WebRTCPlugin/SetSessionDescriptionObserver.h
@@ -14,7 +14,7 @@ namespace webrtc
         void RegisterDelegateOnFailure(DelegateSetSessionDescFailure onFailure);
 
         void OnSuccess() override;
-        void OnFailure(const std::string& error) override;
+        void OnFailure(webrtc::RTCError error) override;
     protected:
         explicit SetSessionDescriptionObserver(PeerConnectionObject * connection);
         ~SetSessionDescriptionObserver() = default;

diff --git a/Plugin~/WebRTCPlugin/UnityVideoDecoderFactory.cpp b/Plugin~/WebRTCPlugin/UnityVideoDecoderFactory.cpp
@@ -0,0 +1,23 @@
+#include "pch.h"
+#include "UnityVideoDecoderFactory.h"
+
+namespace unity
+{
+namespace webrtc
+{
+    UnityVideoDecoderFactory::UnityVideoDecoderFactory() : internal_decoder_factory_(new webrtc::InternalDecoderFactory())
+    {
+    }
+
+    std::vector<webrtc::SdpVideoFormat> UnityVideoDecoderFactory::GetSupportedFormats() const
+    {
+        return { webrtc::CreateH264Format(webrtc::H264::kProfileConstrainedBaseline, webrtc::H264::kLevel5_1, "1") };
+    }
+
+    std::unique_ptr<webrtc::VideoDecoder> UnityVideoDecoderFactory::CreateVideoDecoder(const webrtc::SdpVideoFormat & format)
+    {
+        return internal_decoder_factory_->CreateVideoDecoder(format);
+    }
+
+}  // namespace webrtc
+}  // namespace unity
diff --git a/Plugin~/WebRTCPlugin/UnityVideoDecoderFactory.h b/Plugin~/WebRTCPlugin/UnityVideoDecoderFactory.h
@@ -0,0 +1,20 @@
+#pragma once
+
+namespace unity
+{
+namespace webrtc
+{
+    namespace webrtc = ::webrtc;
+
+    // This class is only used for status testing.
+    class UnityVideoDecoderFactory : public webrtc::VideoDecoderFactory
+    {
+    public:
+        std::vector<webrtc::SdpVideoFormat> GetSupportedFormats() const override;
+        std::unique_ptr<webrtc::VideoDecoder> CreateVideoDecoder(const webrtc::SdpVideoFormat& format) override;
+        UnityVideoDecoderFactory();
+    private:
+        const std::unique_ptr<VideoDecoderFactory> internal_decoder_factory_;
+    };
+}
+}
diff --git a/Plugin~/WebRTCPlugin/UnityVideoEncoderFactory.cpp b/Plugin~/WebRTCPlugin/UnityVideoEncoderFactory.cpp
@@ -32,13 +32,7 @@ namespace webrtc
 
     std::vector<webrtc::SdpVideoFormat> UnityVideoEncoderFactory::GetHardwareEncoderFormats() const
     {
-        const absl::optional<std::string> profileLevelId =
-            webrtc::H264::ProfileLevelIdToString(webrtc::H264::ProfileLevelId(webrtc::H264::kProfileConstrainedBaseline, webrtc::H264::kLevel5_1));
-        return { webrtc::SdpVideoFormat(
-            cricket::kH264CodecName,
-            { {cricket::kH264FmtpProfileLevelId, *profileLevelId},
-              {cricket::kH264FmtpLevelAsymmetryAllowed, "1"},
-              {cricket::kH264FmtpPacketizationMode, "1"} }) };
+        return { webrtc::CreateH264Format(webrtc::H264::kProfileConstrainedBaseline, webrtc::H264::kLevel5_1, "1") };
     }
 
 

diff --git a/Plugin~/WebRTCPlugin/VideoCaptureTrackSource.cpp b/Plugin~/WebRTCPlugin/VideoCaptureTrackSource.cpp
@@ -13,6 +13,10 @@
 
 namespace {
 
+    // Minimum interval is 10k fps.
+    #define FPS_TO_INTERVAL(fps) \
+    (fps ? rtc::kNumNanosecsPerSec / fps : rtc::kNumNanosecsPerSec / 10000)
+
     const double kRoundingTruncation = 0.0005;
 
     // Default resolution. If no constraint is specified, this is the resolution we

diff --git a/Plugin~/WebRTCPlugin/VideoCapturer.cpp b/Plugin~/WebRTCPlugin/VideoCapturer.cpp
@@ -151,9 +151,7 @@ namespace cricket {
         apply_rotation_ = wants.rotation_applied;
 
         if (video_adapter()) {
-            video_adapter()->OnResolutionFramerateRequest(wants.target_pixel_count,
-                wants.max_pixel_count,
-                wants.max_framerate_fps);
+            video_adapter()->OnSinkWants(wants);
         }
     }
 

diff --git a/Plugin~/WebRTCPlugin/WebRTCPlugin.vcxproj b/Plugin~/WebRTCPlugin/WebRTCPlugin.vcxproj
@@ -218,6 +218,7 @@
     <ClInclude Include="pch.h" />
     <ClInclude Include="PeerConnectionObject.h" />
     <ClInclude Include="SetSessionDescriptionObserver.h" />
+    <ClInclude Include="UnityVideoDecoderFactory.h" />
     <ClInclude Include="UnityVideoEncoderFactory.h" />
     <ClInclude Include="VideoCapturer.h" />
     <ClInclude Include="VideoCaptureTrackSource.h" />
@@ -260,6 +261,7 @@
     </ClCompile>
     <ClCompile Include="PeerConnectionObject.cpp" />
     <ClCompile Include="SetSessionDescriptionObserver.cpp" />
+    <ClCompile Include="UnityVideoDecoderFactory.cpp" />
     <ClCompile Include="UnityVideoEncoderFactory.cpp" />
     <ClCompile Include="VideoCapturer.cpp" />
     <ClCompile Include="VideoCaptureTrackSource.cpp" />

diff --git a/Plugin~/WebRTCPlugin/WebRTCPlugin.vcxproj.filters b/Plugin~/WebRTCPlugin/WebRTCPlugin.vcxproj.filters
@@ -73,6 +73,7 @@
     <ClCompile Include="SetSessionDescriptionObserver.cpp" />
     <ClCompile Include="UnityRenderEvent.cpp" />
     <ClCompile Include="UnityVideoEncoderFactory.cpp" />
+    <ClCompile Include="UnityVideoDecoderFactory.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Context.h" />
@@ -174,6 +175,7 @@
     <ClInclude Include="SetSessionDescriptionObserver.h" />
     <ClInclude Include="NvVideoCapturer.h" />
     <ClInclude Include="UnityVideoEncoderFactory.h" />
+    <ClInclude Include="UnityVideoDecoderFactory.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="GraphicsDevice">

diff --git a/Plugin~/WebRTCPlugin/pch.h b/Plugin~/WebRTCPlugin/pch.h
@@ -40,6 +40,7 @@
 #endif
 
 #include "media/engine/internal_encoder_factory.h"
+#include "media/engine/internal_decoder_factory.h"
 #include "media/base/h264_profile_level_id.h"
 #include "media/base/adapted_video_track_source.h"
 #include "media/base/media_channel.h"

diff --git a/Plugin~/WebRTCPluginTest/WebRTCPluginTest.vcxproj b/Plugin~/WebRTCPluginTest/WebRTCPluginTest.vcxproj
@@ -84,6 +84,7 @@
     <ClInclude Include="..\WebRTCPlugin\pch.h" />
     <ClInclude Include="..\WebRTCPlugin\PeerConnectionObject.h" />
     <ClInclude Include="..\WebRTCPlugin\SetSessionDescriptionObserver.h" />
+    <ClInclude Include="..\WebRTCPlugin\UnityVideoDecoderFactory.h" />
     <ClInclude Include="..\WebRTCPlugin\UnityVideoEncoderFactory.h" />
     <ClInclude Include="..\WebRTCPlugin\VideoCapturer.h" />
     <ClInclude Include="..\WebRTCPlugin\VideoCaptureTrackSource.h" />
@@ -124,6 +125,7 @@
     <ClCompile Include="..\WebRTCPlugin\NvVideoCapturer.cpp" />
     <ClCompile Include="..\WebRTCPlugin\PeerConnectionObject.cpp" />
     <ClCompile Include="..\WebRTCPlugin\SetSessionDescriptionObserver.cpp" />
+    <ClCompile Include="..\WebRTCPlugin\UnityVideoDecoderFactory.cpp" />
     <ClCompile Include="..\WebRTCPlugin\UnityVideoEncoderFactory.cpp" />
     <ClCompile Include="..\WebRTCPlugin\VideoCapturer.cpp" />
     <ClCompile Include="..\WebRTCPlugin\VideoCaptureTrackSource.cpp" />
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,7 @@ namespace webrtc @@
             }
         }
-        void SetSessionDescriptionObserver::OnFailure(const std::string& error)
+        void SetSessionDescriptionObserver::OnFailure(webrtc::RTCError error)
         {
             for (auto delegate : m_vectorDelegateSetSDFailure)
             {
@@ Expand Down @@