Merge pull request #458 from taste1981/quic_v12

Enable webtransport for native client

Author: taste1981

build_overrides/build.gni

@@ -70,6 +70,11 @@ declare_args() {
   # Includes tests.
   owt_include_tests = false
 
+  # Include quic support
+  owt_use_quic = false
+  owt_quic_header_root = ""
+  owt_quic_lib_root = ""
+
   # Some non-Chromium builds don't support building java targets.
   enable_java_templates = true
 }

talk/owt/BUILD.gn

@@ -171,6 +171,14 @@ static_library("owt_sdk_base") {
   } else {
     defines += [ "OWT_USE_H265" ]
   }
+  
+  if (owt_use_quic) {
+    defines += [ "OWT_ENABLE_QUIC" ]
+    if (owt_quic_header_root != "") {
+      include_dirs += [ owt_quic_header_root ]
+    }
+  }
+  
   if (is_win || is_linux) {
     # Custom audio/video input and output.
     # When rebasing libwebrtc to a new version, custom audio/video input/output
@@ -313,6 +321,17 @@ static_library("owt_sdk_conf") {
   if (is_clang) {
     configs -= [ "//build/config/clang:find_bad_constructs" ]
   }
+
+  if (owt_use_quic) {
+    defines = [ "OWT_ENABLE_QUIC" ]
+    if (owt_quic_header_root != "") {
+      sources += [
+        "sdk/conference/conferencewebtransportchannel.cc",
+        "sdk/conference/conferencewebtransportchannel.h",
+      ]
+      include_dirs += [ owt_quic_header_root ]
+    }
+  }
 }
 if (is_ios) {
   static_library("owt_sdk_objc") {

talk/owt/include/sio_message.h

@@ -5,6 +5,7 @@
 //
 #ifndef __SIO_MESSAGE_H__
 #define __SIO_MESSAGE_H__
+
 #include <string>
 #include <memory>
 #include <vector>
@@ -14,6 +15,8 @@
 namespace sio
 {
     using namespace std;
+    using std::string;
+    using std::vector;
 
     class message
     {

talk/owt/sdk/base/stream.cc

@@ -82,15 +82,27 @@ Stream::Stream()
       renderer_impl_(nullptr),
       audio_renderer_impl_(nullptr),
       d3d9_renderer_impl_(nullptr),
+#ifdef OWT_ENABLE_QUIC
+      source_(AudioSourceInfo::kUnknown,
+              VideoSourceInfo::kUnknown,
+              DataSourceInfo::kUnknown),
+#else
       source_(AudioSourceInfo::kUnknown, VideoSourceInfo::kUnknown),
+#endif
       ended_(false),
       id_("") {}
 Stream::Stream(const std::string& id)
     : media_stream_(nullptr),
       renderer_impl_(nullptr),
       audio_renderer_impl_(nullptr),
       d3d9_renderer_impl_(nullptr),
+#ifdef OWT_ENABLE_QUIC
+      source_(AudioSourceInfo::kUnknown,
+              VideoSourceInfo::kUnknown,
+              DataSourceInfo::kUnknown),
+#else
       source_(AudioSourceInfo::kUnknown, VideoSourceInfo::kUnknown),
+#endif
       ended_(false),
       id_(id) {}
 #elif defined(WEBRTC_LINUX)
@@ -439,6 +451,21 @@ std::shared_ptr<LocalStream> LocalStream::Create(
 }
 #endif
 
+#ifdef OWT_ENABLE_QUIC
+LocalStream::LocalStream(std::shared_ptr<QuicStream> quic_stream) {
+  quic_stream_ = quic_stream;
+  has_data_ = true;
+}
+
+std::shared_ptr<LocalStream> LocalStream::Create(
+    std::shared_ptr<QuicStream> writable_stream,
+    int& error_code) {
+  std::shared_ptr<LocalStream> stream(new LocalStream(writable_stream));
+  error_code = 0;
+  return stream;
+}
+#endif
+
 LocalStream::LocalStream(const LocalCameraStreamParameters& parameters,
                          int& error_code) {
   if (!parameters.AudioEnabled() && !parameters.VideoEnabled()) {
@@ -654,6 +681,7 @@ LocalStream::LocalStream(
   media_stream_->AddRef();
 }
 #endif
+
 RemoteStream::RemoteStream(MediaStreamInterface* media_stream,
                            const std::string& from)
     : origin_(from) {
@@ -662,6 +690,7 @@ RemoteStream::RemoteStream(MediaStreamInterface* media_stream,
   media_stream_ = media_stream;
   media_stream_->AddRef();
 }
+
 RemoteStream::RemoteStream(
     const std::string& id,
     const std::string& from,
@@ -671,14 +700,63 @@ RemoteStream::RemoteStream(
       origin_(from),
       subscription_capabilities_(subscription_capabilities),
       publication_settings_(publication_settings) {}
+
 std::string RemoteStream::Origin() {
   return origin_;
 }
+
+RemoteStream::RemoteStream(const std::string& id, const std::string& from)
+    :Stream(id),
+     origin_(from) {
+}
+
 void RemoteStream::MediaStream(MediaStreamInterface* media_stream) {
   Stream::MediaStream(media_stream);
 }
 MediaStreamInterface* RemoteStream::MediaStream() {
   return media_stream_;
 }
+
+#ifdef OWT_ENABLE_QUIC
+QuicStream::QuicStream(owt::quic::QuicTransportStreamInterface* quic_stream,
+           const std::string& session_id)
+    : quic_stream_(quic_stream), session_id_(session_id), can_read_(true),
+      can_write_(true), fin_read_(false) {
+}
+
+QuicStream::~QuicStream() {
+  if (quic_stream_) {
+    delete quic_stream_;
+    quic_stream_ = nullptr;
+  }
+}
+
+size_t QuicStream::Write(uint8_t* data, size_t length) {
+  if (quic_stream_ && !fin_read_ && data != nullptr && length > 0) {
+    return quic_stream_->Write(data, length);
+  }
+  return 0;
+}
+
+size_t QuicStream::Read(uint8_t* data, size_t length) {
+  if (quic_stream_ && data != nullptr && length > 0 && !fin_read_) {
+    return quic_stream_->Read(data, length);
+  } else {
+    return 0;
+  }
+}
+
+size_t QuicStream::ReadableBytes() const {
+  if (quic_stream_ && !fin_read_) {
+    return quic_stream_->ReadableBytes();
+  } else {
+    return 0;
+  }
+}
+
+std::shared_ptr<owt::base::QuicStream> LocalStream::Stream() {
+  return quic_stream_;
+}
+#endif
 }  // namespace base
 }  // namespace owt