Adding support for Streamlabs Desktop Virtual Webcam

Streamlabs Desktop has the same issue in opencv#19746. This fixes it using opencv#23460 method. Add getMatInblob function e
LaurentBerger · Sep 8, 2023 · fc18451 · fc18451
1 parent 8ad5eb5
commit fc18451
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 2 deletions.
diff --git a/modules/dnn/include/opencv2/dnn/all_layers.hpp b/modules/dnn/include/opencv2/dnn/all_layers.hpp
@@ -1101,6 +1101,13 @@ CV__DNN_INLINE_NS_BEGIN
         static Ptr<LayerNormLayer> create(const LayerParams& params);
     };
 
+    class CV_EXPORTS ExpandLayer : public Layer
+    {
+    public:
+
+        static Ptr<ExpandLayer> create(const LayerParams& params);
+    };
+
 //! @}
 //! @}
 CV__DNN_INLINE_NS_END

diff --git a/modules/dnn/include/opencv2/dnn/dnn.hpp b/modules/dnn/include/opencv2/dnn/dnn.hpp
@@ -1266,6 +1266,7 @@ CV__DNN_INLINE_NS_BEGIN
      */
     CV_EXPORTS_W void imagesFromBlob(const cv::Mat& blob_, OutputArrayOfArrays images_);
 
+
     /** @brief Convert all weights of Caffe network to half precision floating point.
      * @param src Path to origin model from Caffe framework contains single
      *            precision floating point weights (usually has `.caffemodel` extension).

diff --git a/modules/dnn/src/dnn_utils.cpp b/modules/dnn/src/dnn_utils.cpp
@@ -260,5 +260,6 @@ void imagesFromBlob(const cv::Mat& blob_, OutputArrayOfArrays images_)
 }
 
 
+
 CV__DNN_INLINE_NS_END
 }}  // namespace cv::dnn
diff --git a/modules/dnn/src/init.cpp b/modules/dnn/src/init.cpp
@@ -227,6 +227,9 @@ void initializeLayerFactory()
     CV_DNN_REGISTER_LAYER_CLASS(PermuteInt8,      PermuteLayer);
     CV_DNN_REGISTER_LAYER_CLASS(ReorgInt8,        ReorgLayer);
     CV_DNN_REGISTER_LAYER_CLASS(ShuffleChannelInt8, ShuffleChannelLayer);
+
+    CV_DNN_REGISTER_LAYER_CLASS(Expand, ExpandLayer);
+
 }
 
 CV__DNN_INLINE_NS_END

diff --git a/modules/dnn/src/onnx/onnx_importer.cpp b/modules/dnn/src/onnx/onnx_importer.cpp
@@ -2396,7 +2396,28 @@ void ONNXImporter::parseExpand(LayerParams& layerParams, const opencv_onnx::Node
             inpShape = shape(blob);
         }
     }
+//// NEW
+    LayerParams constParams;
+    constParams.name = layerParams.name + "/const";
+    CV_Assert(layer_id.find(constParams.name) == layer_id.end());
+    constParams.type = "Const";
 
+    Mat inp = Mat::ones(targetShape.size(), &targetShape[0], CV_32F);
+    constParams.blobs.push_back(inp);
+
+    opencv_onnx::NodeProto proto;
+    proto.add_output(constParams.name);
+    addLayer(constParams, proto);
+
+    layerParams.type = "Expand";
+    node_proto.set_input(0, constParams.name);
+    node_proto.set_input(1, input0);
+    //        CV_Error(Error::StsNotImplemented, "Unsupported Expand op");
+    addLayer(layerParams, node_proto);
+    return;
+    /// <summary>
+    /// END NEW
+    /// </summary>
     String srcName = input0;
     // Unsqueeze and repeat along new axis
     if (targetShape.size() > inpShape.size())
@@ -2498,7 +2519,24 @@ void ONNXImporter::parseExpand(LayerParams& layerParams, const opencv_onnx::Node
         layerParams.type = "Identity";
     }
     else
-        CV_Error(Error::StsNotImplemented, "Unsupported Expand op");
+    {
+        LayerParams constParams;
+        constParams.name = layerParams.name + "/const";
+        CV_Assert(layer_id.find(constParams.name) == layer_id.end());
+        constParams.type = "Const";
+
+        Mat inp = Mat::ones(targetShape.size(), &targetShape[0], CV_32F);
+        constParams.blobs.push_back(inp);
+
+        opencv_onnx::NodeProto proto;
+        proto.add_output(constParams.name);
+        addLayer(constParams, proto);
+
+        layerParams.type = "Expand";
+        node_proto.set_input(0, constParams.name);
+        node_proto.set_input(1, srcName);
+        //        CV_Error(Error::StsNotImplemented, "Unsupported Expand op");
+    }
     addLayer(layerParams, node_proto);
 }
 

diff --git a/modules/videoio/src/cap_dshow.cpp b/modules/videoio/src/cap_dshow.cpp
@@ -2771,7 +2771,7 @@ int videoInput::start(int deviceID, videoDevice *VD){
     if(customSize){
         DebugPrintOut("SETUP: Default Format is set to %ix%i\n", currentWidth, currentHeight);
 
-        if (strcmp("OBS Virtual Camera", VD->nDeviceName) == 0)
+        if (strcmp("OBS Virtual Camera", VD->nDeviceName) == 0 || strcmp("Streamlabs Desktop Virtual Webcam", VD->nDeviceName) == 0)
         {
             // OBS Virtual Camera always returns S_OK on SetFormat(), even if it doesn't support
             // the actual format. So we have to choose a format that it supports manually, e.g. NV12.