Enable OWT build with MSDK on Windows. (#664)

Author: jianjunz

talk/owt/BUILD.gn

@@ -58,11 +58,14 @@ if (is_android) {
   }
 }
 
-config("owt_symbols") {
+config("owt_common") {
   defines = [ "OWT_LIBRARY_IMPL" ]
   if (is_component_build) {
     defines += [ "OWT_ENABLE_SYMBOL_EXPORT" ]
   }
+  if (owt_msdk_header_root != "") {
+    defines += [ "OWT_USE_MSDK" ]
+  }
 }
 
 static_library("owt_deps") {
@@ -212,7 +215,7 @@ static_library("owt_sdk_base") {
     "//third_party",
   ]
 
-  configs += [ ":owt_symbols" ]
+  configs += [ ":owt_common" ]
 
   defines = [ "USE_BUILTIN_SW_CODECS" ]
 
@@ -287,6 +290,8 @@ static_library("owt_sdk_base") {
         "sdk/base/win/d3d11_allocator.h",
         "sdk/base/win/d3d_allocator.cc",
         "sdk/base/win/d3d_allocator.h",
+        "sdk/base/win/mediacapabilities.cc",
+        "sdk/base/win/mediacapabilities.h",
         "sdk/base/win/msdkvideobase.cc",
         "sdk/base/win/msdkvideobase.h",
         "sdk/base/win/msdkvideodecoder.cc",
@@ -297,11 +302,16 @@ static_library("owt_sdk_base") {
         "sdk/base/win/msdkvideoencoder.h",
         "sdk/base/win/msdkvideoencoderfactory.cc",
         "sdk/base/win/msdkvideoencoderfactory.h",
+        "sdk/base/win/sysmem_allocator.cc",
         "sdk/base/win/sysmem_allocator.h",
+        "sdk/base/win/vp9ratecontrol.cc",
         "sdk/base/win/vp9ratecontrol.h",
         "sdk/base/win/vpedefs.h",
       ]
-      public_deps += [ "//third_party/libvpx" ]
+      public_deps += [
+        "//third_party/libvpx",
+        "//third_party/libvpx:libvpxrc",
+      ]
       include_dirs += [
         "//third_party/libvpx/source/config",
         "//third_party/libvpx/source/config/$current_os/$cpu_arch_full",
@@ -313,7 +323,6 @@ static_library("owt_sdk_base") {
   if (is_linux) {
     if (owt_msdk_header_root != "") {
       include_dirs += [ owt_msdk_header_root ]
-      defines += [ "OWT_USE_MSDK" ]
       sources += [
         "sdk/base/linux/displayutils.cc",
         "sdk/base/linux/displayutils.h",
@@ -324,7 +333,6 @@ static_library("owt_sdk_base") {
         "sdk/base/linux/xwindownativeframe.h",
         "sdk/base/windowcapturer.cc",
       ]
-      defines += [ "OWT_USE_MSDK" ]
     }
     sources += [
       "sdk/base/linux/videorenderlinux.cc",
@@ -380,7 +388,7 @@ static_library("owt_sdk_p2p") {
   if (is_clang) {
     configs -= [ "//build/config/clang:find_bad_constructs" ]
   }
-  configs += [ ":owt_symbols" ]
+  configs += [ ":owt_common" ]
   if (owt_cloud_gaming) {
     defines = [ "OWT_CLOUD_GAMING" ]
   }
@@ -423,6 +431,7 @@ static_library("owt_sdk_conf") {
       include_dirs += [ owt_quic_header_root ]
     }
   }
+  configs += [ ":owt_common" ]
 }
 if (is_ios) {
   static_library("owt_sdk_objc") {

talk/owt/docs/cpp/cpp.md

@@ -9,13 +9,15 @@ bug fixes and known issues.
 # 2 Supported platforms {#section2}
 Open WebRTC Toolkit Client SDK for Windows supports Windows 8 and later versions.
 # 3 Getting started {#section3}
-Application on Open WebRTC Toolkit Client SDK for Windows should be built with Microsoft Visual Studio\* 2017 or 2019. Running time library for linking should be `Multi-threaded Debug (/MTd)` for debug version or `Multi-threaded (/MT)` for release version. Supported platform is x64.
+Application on Open WebRTC Toolkit Client SDK for Windows should be built with Microsoft Visual Studio\* 2022. Running time library for linking should be `Multi-threaded Debug (/MTd)` for debug version or `Multi-threaded (/MT)` for release version. Supported platform is x64.
 The release package includes one sample application to get you started quickly with the SDK. The following two static libraries are provided in the SDK for only x64, along with their headers:
 - owt-debug.lib - this library includes all the WebRTC features for debug usages.
 - owt-release.lib - this library includes all the WebRTC features for release usages.
 owt-debug.lib|owt-release references libraries in Windows SDK for DXVA support. Your application must statically link
 mfuuid.lib, mf.lib, mfplat.lib, d3d9.lib, dxgi.lib, d3d11.lib, dcomp.lib and dxva2.lib to build. Depending on your signaling
-channel implementation, you can optionally link sioclient.lib or sioclient_tls.lib if neccessary.
+channel implementation, you can optionally link sioclient.lib or sioclient_tls.lib if necessary. When building your app with
+OWT, please define WEBRTC_WIN for Windows build. If the OWT lib was built with Intel Media SDK (msdk_root is specified for
+build-win.py, or owt_msdk_header_root is defined in GN args), your app needs to define OWT_USE_MSDK as well.
 # 4 Socket.IO {#section4}
 Socket.IO cpp client is an open source project hosted on [Github](https://github.com/socketio/socket.io-client-cpp). Please follow official guide on GitHub to build and link it. The version works with OWT is b1216ee428dd7d1e72368da9b12aa43bfc487c93.
 The Socket.IO TLS feature is determined at compile time and cannot be switched at runtime. If you are using secure connections, link your application statically with sioclient_tls.lib; otherwise, link it with sioclient.lib. Please be noted the SDK library is linking to OpenSSL 1.1.1, so sioclient_tls.lib must be compiled using the same OpenSSL version.

talk/owt/sdk/base/customizedvideodecoderproxy.cc

@@ -7,6 +7,17 @@
 namespace owt {
 namespace base {
 
+std::unordered_map<webrtc::VideoCodecType, owt::base::VideoCodec>
+    video_codec_map = {
+        {webrtc::VideoCodecType::kVideoCodecH264, owt::base::VideoCodec::kH264},
+#ifdef WEBRTC_USE_H265
+        {webrtc::VideoCodecType::kVideoCodecH265, owt::base::VideoCodec::kH265},
+#endif
+        {webrtc::VideoCodecType::kVideoCodecVP8, owt::base::VideoCodec::kVp8},
+        {webrtc::VideoCodecType::kVideoCodecVP9, owt::base::VideoCodec::kVp9},
+        {webrtc::VideoCodecType::kVideoCodecAV1, owt::base::VideoCodec::kAv1},
+};
+
 CustomizedVideoDecoderProxy::CustomizedVideoDecoderProxy(VideoCodecType type,
   VideoDecoderInterface* external_video_decoder)
   : codec_type_(type),decoded_image_callback_(nullptr), external_decoder_(external_video_decoder) {}
@@ -22,25 +33,9 @@ bool CustomizedVideoDecoderProxy::Configure(const Settings& codec_settings) {
   RTC_CHECK(codec_settings.codec_type() == codec_type_)
       << "Unsupported codec type" << codec_settings.codec_type() << " for "
       << codec_type_;
-  if (external_decoder_) {
-    if (codec_type_ == kVideoCodecH264 &&
-        external_decoder_->InitDecodeContext(VideoCodec::kH264)) {
-      return true;
-#ifdef WEBRTC_USE_H265
-    } else if (codec_type_ == kVideoCodecH265 &&
-               external_decoder_->InitDecodeContext(VideoCodec::kH265)) {
-      return true;
-#endif
-    } else if (codec_type_ == kVideoCodecVP8 &&
-               external_decoder_->InitDecodeContext(VideoCodec::kVp8)) {
-      return true;
-    } else if (codec_type_ == kVideoCodecVP9 &&
-               external_decoder_->InitDecodeContext(VideoCodec::kVp9)) {
-      return true;
-    } else if (codec_type_ == kVideoCodecAV1 &&
-               external_decoder_->InitDecodeContext(VideoCodec::kAv1)) {
-      return true;
-    }
+  RTC_DCHECK(video_codec_map.contains(codec_type_));
+  if (!external_decoder_ ||
+      !external_decoder_->InitDecodeContext(video_codec_map[codec_type_])) {
     return false;
   }
   return true;

talk/owt/sdk/base/peerconnectiondependencyfactory.cc

@@ -205,7 +205,7 @@ void PeerConnectionDependencyFactory::
         GlobalConfiguration::GetCustomizedVideoDecoder()));
   } else if (render_hardware_acceleration_enabled_) {
 #ifdef OWT_USE_MSDK
-    decoder_factory.reset(new MSDKVideoDecoderFactory());
+    decoder_factory.reset(new MSDKVideoDecoderFactory(nullptr));
 #else
     decoder_factory = webrtc::CreateBuiltinVideoDecoderFactory();
 #endif

talk/owt/sdk/base/win/base_allocator.cc

@@ -183,8 +183,14 @@ mfxStatus BaseFrameAllocator::AllocFrames(mfxFrameAllocRequest *request, mfxFram
     return sts;
 }
 
-mfxStatus BaseFrameAllocator::FreeFrames(mfxFrameAllocResponse *response)
-{
+bool IsSame(const mfxFrameAllocResponse& lhs,
+            const mfxFrameAllocResponse& rhs) {
+    return rhs.mids != 0 && lhs.mids != 0 && rhs.mids[0] == lhs.mids[0] &&
+           rhs.NumFrameActual == lhs.NumFrameActual;
+}
+
+mfxStatus
+BaseFrameAllocator::FreeFrames(mfxFrameAllocResponse * response) {
     std::lock_guard<std::mutex> lock(mtx);
 
     if (response == 0)
@@ -194,7 +200,8 @@ mfxStatus BaseFrameAllocator::FreeFrames(mfxFrameAllocResponse *response)
 
     // check whether response is an external decoder response
     std::list<UniqueResponse>::iterator i =
-        std::find_if( m_ExtResponses.begin(), m_ExtResponses.end(), std::bind1st(IsSame(), *response));
+        std::find_if(m_ExtResponses.begin(), m_ExtResponses.end(),
+                     std::bind(IsSame, *response, std::placeholders::_1));
 
     if (i != m_ExtResponses.end())
     {
@@ -208,7 +215,8 @@ mfxStatus BaseFrameAllocator::FreeFrames(mfxFrameAllocResponse *response)
 
     // if not found so far, then search in internal responses
     std::list<mfxFrameAllocResponse>::iterator i2 =
-        std::find_if(m_responses.begin(), m_responses.end(), std::bind1st(IsSame(), *response));
+        std::find_if(m_responses.begin(), m_responses.end(),
+                     std::bind(IsSame, *response, std::placeholders::_1));
 
     if (i2 != m_responses.end())
     {

talk/owt/sdk/base/win/base_allocator.h

@@ -182,16 +182,6 @@ class BaseFrameAllocator : public MFXFrameAllocator {
   std::list<mfxFrameAllocResponse> m_responses;
   std::list<UniqueResponse> m_ExtResponses;
 
-  struct IsSame : public std::binary_function<mfxFrameAllocResponse,
-                                              mfxFrameAllocResponse,
-                                              bool> {
-    bool operator()(const mfxFrameAllocResponse& l,
-                    const mfxFrameAllocResponse& r) const {
-      return r.mids != 0 && l.mids != 0 && r.mids[0] == l.mids[0] &&
-             r.NumFrameActual == l.NumFrameActual;
-    }
-  };
-
   // checks if request is supported
   virtual mfxStatus CheckRequestType(mfxFrameAllocRequest* request);