Ensure transposed buffer data type

Author: glopesdev

OpenEphys.Onix/OpenEphys.Onix/AnalogInput.cs

@@ -35,7 +35,6 @@ public unsafe override IObservable<AnalogInputDataFrame> Generate()
         {
             var bufferSize = BufferSize;
             var dataType = DataType;
-            var depth = dataType == AnalogIODataType.Volts ? Depth.F32 : Depth.S16;
             return Observable.Using(
                 () => DeviceManager.ReserveDevice(DeviceName),
                 disposable => disposable.Subject.SelectMany(deviceInfo =>
@@ -48,6 +47,9 @@ public unsafe override IObservable<AnalogInputDataFrame> Generate()
                         var voltageScale = dataType == AnalogIODataType.Volts
                             ? CreateVoltageScale(bufferSize, ioDeviceInfo.VoltsPerDivision)
                             : null;
+                        var transposeBuffer = voltageScale != null
+                            ? new Mat(AnalogIO.ChannelCount, bufferSize, Depth.S16, 1)
+                            : null;
                         var analogDataBuffer = new short[AnalogIO.ChannelCount * bufferSize];
                         var hubSyncCounterBuffer = new ulong[bufferSize];
                         var clockBuffer = new ulong[bufferSize];
@@ -65,8 +67,9 @@ public unsafe override IObservable<AnalogInputDataFrame> Generate()
                                         analogDataBuffer,
                                         bufferSize,
                                         AnalogIO.ChannelCount,
-                                        depth,
-                                        voltageScale);
+                                        Depth.S16,
+                                        voltageScale,
+                                        transposeBuffer);
                                     observer.OnNext(new AnalogInputDataFrame(clockBuffer, hubSyncCounterBuffer, analogData));
                                     hubSyncCounterBuffer = new ulong[bufferSize];
                                     clockBuffer = new ulong[bufferSize];

OpenEphys.Onix/OpenEphys.Onix/BufferHelper.cs

@@ -8,8 +8,7 @@ public static Mat CopyTranspose<TBuffer>(
             TBuffer[] buffer,
             int sampleCount,
             int channelCount,
-            Depth depth,
-            Mat scale = null)
+            Depth depth)
             where TBuffer : unmanaged
         {
             using var bufferHeader = Mat.CreateMatHeader(
@@ -18,12 +17,34 @@ public static Mat CopyTranspose<TBuffer>(
                 channelCount,
                 depth,
                 channels: 1);
-            var data = new Mat(bufferHeader.Cols, bufferHeader.Rows, bufferHeader.Depth, 1);
+            var data = new Mat(bufferHeader.Cols, bufferHeader.Rows, depth, 1);
             CV.Transpose(bufferHeader, data);
-            if (scale != null)
+            return data;
+        }
+
+        public static Mat CopyTranspose<TBuffer>(
+            TBuffer[] buffer,
+            int sampleCount,
+            int channelCount,
+            Depth depth,
+            Mat scale,
+            Mat transposeBuffer)
+            where TBuffer : unmanaged
+        {
+            if (scale == null)
             {
-                CV.Mul(data, scale, data);
+                return CopyTranspose(buffer, sampleCount, channelCount, depth);
             }
+
+            using var bufferHeader = Mat.CreateMatHeader(
+                buffer,
+                sampleCount,
+                channelCount,
+                depth,
+                channels: 1);
+            var data = new Mat(bufferHeader.Cols, bufferHeader.Rows, scale.Depth, 1);
+            CV.Transpose(bufferHeader, transposeBuffer);
+            CV.Mul(transposeBuffer, scale, data);
             return data;
         }
     }