Add Data Channel support

sdk/c/api/data_channel_interface.cc

@@ -1,13 +1,98 @@
 /*
- *  Copyright 2019 pixiv Inc. All Rights Reserved.
+ *  Copyright 2019 developerinabox. All Rights Reserved.
  *
  *  Use of this source code is governed by a license that can be
  *  found in the LICENSE.pixiv file in the root of the source tree.
  */
 
 #include "sdk/c/api/data_channel_interface.h"
 
+namespace webrtc {
+
+class DelegatingDataChannelObserver
+    : public DataChannelObserver {
+ public:
+  DelegatingDataChannelObserver(
+      void* context,
+      const struct WebrtcDataChannelObserverFunctions* functions) {
+    context_ = context;
+    functions_ = functions;
+  }
+
+  ~DelegatingDataChannelObserver() {
+    functions_->on_destruction(context_);
+  }
+
+  void OnStateChange() override {
+    functions_->on_state_change(context_);
+  }
+
+  void OnMessage(const DataBuffer& buffer) override {
+    auto * data = buffer.data.data();
+    functions_->on_message(context_, buffer.binary, data, buffer.size());
+  }
+
+  void OnBufferedAmountChange(uint64_t sent_data_size) override {
+    functions_->on_buffered_amount_change(context_, sent_data_size);
+  }
+
+ private:
+  void* context_;
+  const struct WebrtcDataChannelObserverFunctions* functions_;
+  };
+}
+
 RTC_EXPORT extern "C" void webrtcDataChannelInterfaceRelease(
     const WebrtcDataChannelInterface* channel) {
   rtc::ToCplusplus(channel)->Release();
 }
+
+RTC_EXPORT extern "C" RtcString* webrtcDataChannelLabel(
+    const WebrtcDataChannelInterface* channel) {
+  return rtc::ToC(new auto(rtc::ToCplusplus(channel)->label()));
+}
+
+RTC_EXPORT extern "C" int webrtcDataChannelStatus(
+    const WebrtcDataChannelInterface* channel) {
+      auto chan = rtc::ToCplusplus(channel);
+      return chan->state();
+}
+
+RTC_EXPORT extern "C" bool webrtcDataChannelSendText(
+    WebrtcDataChannelInterface* channel,
+    const char* text
+    ) {
+      auto chan = rtc::ToCplusplus(channel);
+      const auto db = webrtc::DataBuffer(text);
+      return chan->Send(db);
+}
+
+RTC_EXPORT extern "C" bool webrtcDataChannelSendData(
+    WebrtcDataChannelInterface* channel,
+    const char* data,
+    size_t len
+    ) {
+      auto chan = rtc::ToCplusplus(channel);
+      rtc::CopyOnWriteBuffer writeBuffer(data, len);
+      const auto db = webrtc::DataBuffer(writeBuffer, true);
+      return chan->Send(db);
+    }
+
+RTC_EXPORT extern "C" WebrtcDataChannelObserver* webrtcDataChannelRegisterObserver(
+    void* context,
+    WebrtcDataChannelInterface* channel,
+    const struct WebrtcDataChannelObserverFunctions* functions) {
+
+      auto chan = rtc::ToCplusplus(channel);
+      auto obs = new webrtc::DelegatingDataChannelObserver(context, functions);
+      chan->RegisterObserver(obs);
+      auto o = rtc::ToC(obs);
+      return o;
+}
+
+RTC_EXPORT extern "C" void webrtcDataChannelUnregisterObserver(
+    WebrtcDataChannelInterface* channel
+    ) {
+      auto chan = rtc::ToCplusplus(channel);
+      chan->UnregisterObserver();
+}

sdk/c/api/data_channel_interface.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019 pixiv Inc. All Rights Reserved.
+ *  Copyright 2020 developerinabox. All Rights Reserved.
  *
  *  Use of this source code is governed by a license that can be
  *  found in the LICENSE.pixiv file in the root of the source tree.
@@ -15,12 +15,43 @@
 
 extern "C" {
 #endif
-
 RTC_C_CLASS(webrtc::DataChannelInterface, WebrtcDataChannelInterface)
+RTC_C_CLASS(webrtc::DataChannelObserver, WebrtcDataChannelObserver)
+
+struct WebrtcDataChannelObserverFunctions {
+  void (*on_destruction)(void*);
+  void (*on_state_change)(void*);
+  void (*on_message)(void*, bool binary, const uint8_t* data, size_t len);
+  void (*on_buffered_amount_change)(void*, uint64_t);
+};
 
 RTC_EXPORT void webrtcDataChannelInterfaceRelease(
     const WebrtcDataChannelInterface* channel);
 
+RTC_EXPORT RtcString* webrtcDataChannelLabel(
+    const WebrtcDataChannelInterface* channel);
+
+RTC_EXPORT int webrtcDataChannelStatus(
+    const WebrtcDataChannelInterface* channel);
+
+RTC_EXPORT bool webrtcDataChannelSendText(
+    WebrtcDataChannelInterface* channel,
+    const char* text);
+
+RTC_EXPORT bool webrtcDataChannelSendData(
+    WebrtcDataChannelInterface* channel,
+    const char* data,
+    size_t len);
+
+RTC_EXPORT WebrtcDataChannelObserver* webrtcDataChannelRegisterObserver(
+    void* context,
+    WebrtcDataChannelInterface* channel,
+    const struct WebrtcDataChannelObserverFunctions* functions);
+
+RTC_EXPORT void webrtcDataChannelUnregisterObserver(
+    WebrtcDataChannelInterface* channel);
+
+
 #ifdef __cplusplus
 }
 #endif

sdk/c/api/jsep.cc

@@ -91,16 +91,25 @@ extern "C" void webrtcDeleteSessionDescriptionInterface(
   delete rtc::ToCplusplus(desc);
 }
 
-extern "C" bool webrtcIceCandidateInterfaceToString(
+extern "C" bool webrtcIceCandidateInterfaceResolve(
     const WebrtcIceCandidateInterface* candidate,
-    RtcString** out) {
-  if (!out) {
-    return false;
-  }
-
+    RtcString** sdpMid,
+    int* sdpMLineIndex,
+    RtcString** sdp
+    ) {
+
+  auto c = rtc::ToCplusplus(candidate);
+
+  auto i = c->sdp_mline_index();
+  sdpMLineIndex = &i;
+
+  auto g = new std::string();
+  *sdpMid = rtc::ToC(g);
+  g->assign(c->sdp_mid());
+
   auto s = new std::string();
-  *out = rtc::ToC(s);
-  return rtc::ToCplusplus(candidate)->ToString(s);
+  *sdp = rtc::ToC(s);
+  return c->ToString(s);
 }
 
 extern "C" WebrtcCreateSessionDescriptionObserver*

sdk/c/api/jsep.h

@@ -60,9 +60,11 @@ RTC_EXPORT void webrtcCreateSessionDescriptionObserverRelease(
 RTC_EXPORT void webrtcDeleteSessionDescriptionInterface(
     WebrtcSessionDescriptionInterface* desc);
 
-RTC_EXPORT bool webrtcIceCandidateInterfaceToString(
+RTC_EXPORT bool webrtcIceCandidateInterfaceResolve(
     const WebrtcIceCandidateInterface* candidate,
-    RtcString** out);
+    RtcString** sdpMid,
+    int* sdpMLineIndex,
+    RtcString** sdp);
 
 RTC_EXPORT WebrtcCreateSessionDescriptionObserver*
 webrtcNewCreateSessionDescriptionObserver(

sdk/c/api/peer_connection_interface.cc

@@ -324,6 +324,18 @@ webrtcPeerConnectionInterfaceAddTrack(WebrtcPeerConnectionInterface* connection,
   return cresult;
 }
 
+RTC_EXPORT extern "C" bool
+webrtcPeerConnectionInterfaceAddICECandidate(WebrtcPeerConnectionInterface* connection,
+                                      const char* sdpMid,
+                                      size_t sdpMLineIndex,
+                                      const char* sdp) {
+  webrtc::SdpParseError error;
+  webrtc::IceCandidateInterface * candidate = webrtc::CreateIceCandidate(sdpMid, sdpMLineIndex, sdp, &error);
+
+  return rtc::ToCplusplus(connection)
+                      ->AddIceCandidate(candidate);
+}
+
 RTC_EXPORT extern "C" void webrtcPeerConnectionInterfaceClose(
     WebrtcPeerConnectionInterface* connection) {
   rtc::ToCplusplus(connection)->Close();

sdk/c_headers_test.c

@@ -5,9 +5,6 @@
  *  found in the LICENSE.pixiv file in the root of the source tree.
  */
 
-#include "sdk/c/api/task_queue/queued_task.h"
-#include "sdk/c/api/task_queue/task_queue_base.h"
-#include "sdk/c/api/task_queue/task_queue_factory.h"
 #include "sdk/c/api/video/video_buffer.h"
 #include "sdk/c/api/video/video_frame.h"
 #include "sdk/c/api/video/video_rotation.h"

sdk/dotnet/unity/unity.msbuildproj

@@ -9,7 +9,7 @@
 <Project>
     <PropertyGroup>
         <BaseOutputPath>bin/</BaseOutputPath>
-        <Configuration>Debug</Configuration>
+        <Configuration>Release</Configuration>
         <OutputPath>$(BaseOutputPath)$(Configuration)/</OutputPath>
     </PropertyGroup>
     <Import Project="$(MSBuildToolsPath)/Microsoft.Common.targets" />
@@ -19,7 +19,7 @@
         <FullOutputPath>$([System.IO.Path]::GetFullPath('$(OutputPath)'))</FullOutputPath>
         <IsDebug Condition="'$(Configuration)' == Debug">true</IsDebug>
         <IsDebug Condition="'$(Configuration)' != Debug">false</IsDebug>
-        <Targets>Android;Ios;LinuxX64;MacX64;WinX64</Targets>
+        <Targets>LinuxX64</Targets>
         <ParsibleTargets>;$(Targets);</ParsibleTargets>
         <EscapedFullIntermediateOutputPath>"$(FullIntermediateOutputPath.Replace('\', '\\').Replace('"', '\"'))"</EscapedFullIntermediateOutputPath>
         <EscapedFullOutputPath>$(FullOutputPath.Replace('\', '\\').Replace('"', '\"'))</EscapedFullOutputPath>
@@ -28,7 +28,7 @@
         <EscapedOutputPath>"$(OutputPath.Replace('\', '\\').Replace('"', '\"'))"</EscapedOutputPath>
         <EscapedTargets>"$(Targets.Replace('\', '\\').Replace('"', '\"'))"</EscapedTargets>
     </PropertyGroup>
-    <Target Name="Build" DependsOnTargets="BuildAndroid;BuildIos;BuildLinuxX64;BuildMacX64;BuildWinX64">
+    <Target Name="Build" DependsOnTargets="BuildAndroid;BuildIos;BuildLinuxX64;BuildMacX64;BuildWinX64;BuildWinX86">
         <Exec Command="../../../tools_webrtc/unity/generate_licenses.py $(EscapedIntermediateOutputPath) $(EscapedOutputPath) $(EscapedTargets.Replace(';', '&quot; &quot;'))" />
         <Copy
             DestinationFolder="$(OutputPath)"
@@ -67,26 +67,33 @@
     </Target>
     <Target Condition="$(ParsibleTargets.Contains(';LinuxX64;'))" Name="BuildLinuxX64" DependsOnTargets="BuildExternal">
         <Exec
-            Command="gn gen &quot;--args=is_debug=$(IsDebug) rtc_enable_symbol_export=true target_os=\&quot;linux\&quot; target_cpu=\&quot;x64\&quot;&quot; --root=$(EscapedMSBuildThisFileDirectory)../../.. $(EscapedIntermediateOutputPath)linux_x64"
+            Command="gn gen &quot;--args=is_debug=$(IsDebug) rtc_use_dummy_audio_file_devices=true rtc_enable_symbol_export=true target_os=\&quot;linux\&quot; target_cpu=\&quot;x64\&quot;&quot; --root=$(EscapedMSBuildThisFileDirectory)../../.. $(EscapedIntermediateOutputPath)linux_x64"
             Condition="!Exists('$(IntermediateOutputPath)linux_x64/build.ninja')" />
         <Exec Command="ninja -C $(EscapedIntermediateOutputPath)linux_x64 :jingle_peerconnection_so" />
         <Copy DestinationFolder="$(OutputPath)Runtime" SourceFiles="$(IntermediateOutputPath)linux_x64/libjingle_peerconnection_so.so;$(MSBuildThisFileDirectory)Runtime/libjingle_peerconnection_so.so.meta" />
     </Target>
     <Target Condition="$(ParsibleTargets.Contains(';MacX64;'))" Name="BuildMacX64" DependsOnTargets="BuildExternal">
         <Exec
-            Command="gn gen &quot;--args=is_debug=$(IsDebug) rtc_enable_symbol_export=true target_os=\&quot;mac\&quot; target_cpu=\&quot;x64\&quot;&quot; --root=$(EscapedMSBuildThisFileDirectory)../../.. $(EscapedIntermediateOutputPath)mac_x64"
+            Command="gn gen &quot;--args=is_debug=$(IsDebug) rtc_use_dummy_audio_file_devices=true rtc_enable_symbol_export=true target_os=\&quot;mac\&quot; target_cpu=\&quot;x64\&quot;&quot; --root=$(EscapedMSBuildThisFileDirectory)../../.. $(EscapedIntermediateOutputPath)mac_x64"
             Condition="!Exists('$(IntermediateOutputPath)mac_x64/build.ninja')" />
         <Exec Command="ninja -C $(EscapedIntermediateOutputPath)mac_x64 :jingle_peerconnection_so" />
         <Copy DestinationFiles="$(OutputPath)Runtime/jingle_peerconnection_so.dylib" SourceFiles="$(IntermediateOutputPath)mac_x64/libjingle_peerconnection_so.dylib" />
         <Copy DestinationFolder="$(OutputPath)Runtime" SourceFiles="$(MSBuildThisFileDirectory)Runtime/jingle_peerconnection_so.dylib.meta" />
     </Target>
     <Target Condition="$(ParsibleTargets.Contains(';WinX64;'))" Name="BuildWinX64" DependsOnTargets="BuildExternal">
         <Exec
-            Command="gn gen &quot;--args=is_debug=$(IsDebug) rtc_enable_symbol_export=true target_os=\&quot;win\&quot; target_cpu=\&quot;x64\&quot;&quot; --root=$(EscapedMSBuildThisFileDirectory)../../.. $(EscapedIntermediateOutputPath)win_x64"
+            Command="gn gen &quot;--args=is_debug=$(IsDebug) rtc_use_dummy_audio_file_devices=true rtc_enable_symbol_export=true target_os=\&quot;win\&quot; target_cpu=\&quot;x64\&quot;&quot; --root=$(EscapedMSBuildThisFileDirectory)../../.. $(EscapedIntermediateOutputPath)win_x64"
             Condition="!Exists('$(IntermediateOutputPath)win_x64/build.ninja')" />
         <Exec Command="ninja -C $(EscapedIntermediateOutputPath)win_x64 :jingle_peerconnection_so" />
         <Copy DestinationFolder="$(OutputPath)Runtime" SourceFiles="$(IntermediateOutputPath)win_x64/jingle_peerconnection_so.dll;$(MSBuildThisFileDirectory)Runtime/jingle_peerconnection_so.dll.meta" />
     </Target>
+    <Target Condition="$(ParsibleTargets.Contains(';WinX86;'))" Name="BuildWinX86" DependsOnTargets="BuildExternal">
+        <Exec
+            Command="gn gen &quot;--args=is_debug=$(IsDebug) rtc_use_dummy_audio_file_devices=true rtc_enable_symbol_export=true target_os=\&quot;win\&quot; target_cpu=\&quot;x86\&quot;&quot; --root=$(EscapedMSBuildThisFileDirectory)../../.. $(EscapedIntermediateOutputPath)win_x86"
+            Condition="!Exists('$(IntermediateOutputPath)win_x86/build.ninja')" />
+        <Exec Command="ninja -C $(EscapedIntermediateOutputPath)win_x86 :jingle_peerconnection_so" />
+        <Copy DestinationFolder="$(OutputPath)Runtime/x86" SourceFiles="$(IntermediateOutputPath)win_x86/jingle_peerconnection_so.dll" />
+    </Target>
     <Target Name="Restore">
         <MSBuild
             Projects="../webrtc/webrtc.csproj"