Merge branch 'develop'

jim-bcom · jim-bcom · commit f2f693d34771 · 2022-04-11T14:27:11.000+02:00
diff --git a/Assets/SolAR/Demos/Sample/Scenes/SolARHololens2SampleScene.unity b/Assets/SolAR/Demos/Sample/Scenes/SolARHololens2SampleScene.unity
@@ -1030,6 +1030,11 @@ PrefabInstance:
       propertyPath: gRpcDelayBetweenFramesInMs
       value: 20
       objectReference: {fileID: 0}
+    - target: {fileID: 747794893107280973, guid: e688a6d483c98df4ebcb4627f077e80c,
+        type: 3}
+      propertyPath: advancedGrpcSettings.imageCompression
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e688a6d483c98df4ebcb4627f077e80c, type: 3}
 --- !u!114 &287962944 stripped
diff --git a/Assets/SolAR/Prefab/SolArCloudHololens2.prefab b/Assets/SolAR/Prefab/SolArCloudHololens2.prefab
@@ -46,6 +46,7 @@ MonoBehaviour:
   frontendIp: http://192.168.137.1
   frontendBasePort: 5000
   solarScene: {fileID: 0}
+  pipelineMode: 0
   advancedGrpcSettings:
     channelPoolSize: 6
     useUniquePort: 0
diff --git a/Assets/SolAR/Scripts/SolARMappingAndRelocalizationGrpcProxyManager.cs b/Assets/SolAR/Scripts/SolARMappingAndRelocalizationGrpcProxyManager.cs
@@ -142,7 +142,7 @@ private byte[] convertToPNG(ImageLayout imLayout,
             }
 
             public void SetFrame(int sensorId, ulong timestamp, ImageLayout imLayout,
-                uint imWidth, uint imHeight, byte[] imData, double[] pose, bool compressionEnabled)
+                uint imWidth, uint imHeight, byte[] imData, double[] pose, ImageCompression imageCompression)
             {
 
                 // System.Diagnostics.Stopwatch stopWatch = new System.Diagnostics.Stopwatch();
@@ -165,7 +165,7 @@ public void SetFrame(int sensorId, ulong timestamp, ImageLayout imLayout,
                         Height = imHeight,
                         Data = ByteString.CopyFrom(imDataPng),
                         // Data = UnsafeByteOperations.UnsafeWrap(imDataPng),
-                        ImageCompression = compressionEnabled ? ImageCompression.Png : ImageCompression.None
+                        ImageCompression = imageCompression
                     },
                     Pose = new Matrix4x4
                     {
@@ -676,7 +676,7 @@ public RelocAndMappingResult RelocalizeAndMap(int sensorId, ulong timestamp, Ima
             );
         }
 
-        private byte[] convertToPNG(ImageLayout imLayout, uint imWidth, uint imHeight, byte[] imData)
+        private byte[] applyCompression(ImageLayout imLayout, uint imWidth, uint imHeight, byte[] imData, ImageCompression imageCompression)
         {
             GraphicsFormat format;
             switch (imLayout)
@@ -687,7 +687,14 @@ private byte[] convertToPNG(ImageLayout imLayout, uint imWidth, uint imHeight, b
                 default: throw new ArgumentException("Unkown image layout");
             }
 
-            return UnityEngine.ImageConversion.EncodeArrayToPNG(imData, format, imWidth, imHeight);
+            switch(imageCompression)
+            {
+                case ImageCompression.Png: return UnityEngine.ImageConversion.EncodeArrayToPNG(imData, format, imWidth, imHeight);
+                case ImageCompression.Jpg: return UnityEngine.ImageConversion.EncodeArrayToJPG(imData, format, imWidth, imHeight);
+                case ImageCompression.None: throw new ArgumentException("None should not be used here"); // return imData;
+                default: throw new ArgumentException("Unknown image compression");
+
+            }           
         }
 
         private RelocAndMappingResult RelocalizeAndMap(Frame frame)
@@ -710,8 +717,15 @@ private RelocAndMappingResult RelocalizeAndMap(Frame frame)
                             break;
                         }
                     case ImageCompression.Png:
+                    case ImageCompression.Jpg:
                         {
-                            frame.Image.Data = ByteString.CopyFrom(convertToPNG(frame.Image.Layout, frame.Image.Width, frame.Image.Height, frame.Image.Data.ToByteArray()));
+                            frame.Image.Data = ByteString.CopyFrom(
+                                applyCompression(
+                                    frame.Image.Layout, 
+                                    frame.Image.Width,
+                                    frame.Image.Height,
+                                    frame.Image.Data.ToByteArray(),
+                                    frame.Image.ImageCompression));
                             break;
                         }
                     default:
diff --git a/Assets/SolAR/Scripts/SolArCloudHololens2.cs b/Assets/SolAR/Scripts/SolArCloudHololens2.cs
@@ -70,8 +70,8 @@ public struct GrpcSettings
             public bool useUniquePort;
             [Tooltip("Delay in ms before sending each frame")]
             public int delayBetweenFramesInMs;
-            [Tooltip("Enable compression of frame image buffer in PNG to save bandwidth")]
-            public bool compressionEnabled;
+            [Tooltip("Select compression method of frame image buffer to save bandwidth")]
+            public SolARRpc.ImageCompression imageCompression;
         }
 
         [SerializeField]
@@ -80,7 +80,7 @@ public struct GrpcSettings
             channelPoolSize = 6,
             useUniquePort = false,
             delayBetweenFramesInMs = 20,
-            compressionEnabled = true
+            imageCompression = SolARRpc.ImageCompression.None
         };
 
 
@@ -744,7 +744,7 @@ private void handleDepth(
                             if (rpcAvailable)
                             {
                                 relocAndMappingFrameSender.SetFrame(0, ts, SolARRpc.ImageLayout.Grey16,
-                                    _width, _height, depthData, cam2WorldTransform, /* compression = */ false);
+                                    _width, _height, depthData, cam2WorldTransform, SolARRpc.ImageCompression.None);
                             }
                             NotifyOnDepthFrame(depthData, depthABData, ts, cam2WorldTransform, _width,
                                 _height, _fx, _fy, _pixelBufferSize);
@@ -808,7 +808,7 @@ SolARRpc.SolARMappingAndRelocalizationGrpcProxyManager.FrameSender relocAndMappi
 
                     byte[] vclBufferData = null;
 #if ENABLE_WINMD_SUPPORT
-			    vclBufferData = researchMode.GetVlcData(sensorType, out ts, out cam2WorldTransform, out _fx, out _fy, out _pixelBufferSize, out _width, out _height, /* flip = */ advancedGrpcSettings.compressionEnabled);
+			    vclBufferData = researchMode.GetVlcData(sensorType, out ts, out cam2WorldTransform, out _fx, out _fy, out _pixelBufferSize, out _width, out _height, /* flip = */ advancedGrpcSettings.imageCompression != SolARRpc.ImageCompression.None);
 #endif
                     if (vclBufferData != null)
                     {
@@ -827,7 +827,7 @@ SolARRpc.SolARMappingAndRelocalizationGrpcProxyManager.FrameSender relocAndMappi
                                      _height,
                                      vclBufferData,
                                      cam2WorldTransform,
-                                     advancedGrpcSettings.compressionEnabled);
+                                     advancedGrpcSettings.imageCompression);
                             }
                         }
                         else
@@ -878,7 +878,7 @@ private void handlePv(
                     double[] _PVtoWorldtransform = null;
                     byte[] frameTexture = null;
 #if ENABLE_WINMD_SUPPORT
-			    frameTexture = researchMode.GetPvData(out _timestamp, out _PVtoWorldtransform, out _fx, out _fy, out _pixelBufferSize, out _width, out _height, /* flip = */ advancedGrpcSettings.compressionEnabled);
+			    frameTexture = researchMode.GetPvData(out _timestamp, out _PVtoWorldtransform, out _fx, out _fy, out _pixelBufferSize, out _width, out _height, /* flip = */ advancedGrpcSettings.imageCompression != SolARRpc.ImageCompression.None);
 #endif
                     if (frameTexture != null)
                     {
@@ -890,7 +890,7 @@ private void handlePv(
                             {
                                 relocAndMappingFrameSender.SetFrame(/* sensor id PV */ 0, _timestamp,
                                     SolARRpc.ImageLayout.Rgb24, _width, _height, frameTexture,
-                                    _PVtoWorldtransform, advancedGrpcSettings.compressionEnabled);
+                                    _PVtoWorldtransform, advancedGrpcSettings.imageCompression);
                             }
                         }
                     }
diff --git a/Assets/SolAR/Scripts/deprecated/SolARStreamer2.cs b/Assets/SolAR/Scripts/deprecated/SolARStreamer2.cs
@@ -660,7 +660,7 @@ SolARRpc.SolARMappingAndRelocalizationGrpcProxyManager.FrameSender relocAndMappi
                              _height,
                              vclBufferData,
                              cam2WorldTransform,
-                             /* compression = */ false);
+                             SolARRpc.ImageCompression.None);
                     }
 
 
@@ -785,7 +785,7 @@ private void handlePv(SolarRpcClient.FrameSender frameSender,
                             _height,
                             frameTexture,
                             _PVtoWorldtransform,
-                            /* compression = */ false);
+                            SolARRpc.ImageCompression.None);
                     }
 
 
diff --git a/Assets/SolAR/Scripts/grpc/SolarMappingAndRelocalizationProxy.cs b/Assets/SolAR/Scripts/grpc/SolarMappingAndRelocalizationProxy.cs
@@ -58,21 +58,21 @@ static SolarMappingAndRelocalizationProxyReflection() {
             "Tl9PTkxZEAEqHwoKQ2FtZXJhVHlwZRIHCgNSR0IQABIICgRHUkFZEAEqRgoY",
             "UmVsb2NhbGl6YXRpb25Qb3NlU3RhdHVzEgsKB05PX1BPU0UQABIMCghORVdf",
             "UE9TRRABEg8KC0xBVEVTVF9QT1NFEAIqMgoLSW1hZ2VMYXlvdXQSCgoGUkdC",
-            "XzI0EAASCgoGR1JFWV84EAESCwoHR1JFWV8xNhACKiUKEEltYWdlQ29tcHJl",
-            "c3Npb24SCAoETk9ORRAAEgcKA1BORxABMsgECiJTb2xBUk1hcHBpbmdBbmRS",
-            "ZWxvY2FsaXphdGlvblByb3h5EkoKBEluaXQSJi5jb20uYmNvbS5zb2xhci5n",
-            "cHJjLlBpcGVsaW5lTW9kZVZhbHVlGhouY29tLmJjb20uc29sYXIuZ3ByYy5F",
-            "bXB0eRI/CgVTdGFydBIaLmNvbS5iY29tLnNvbGFyLmdwcmMuRW1wdHkaGi5j",
-            "b20uYmNvbS5zb2xhci5ncHJjLkVtcHR5Ej4KBFN0b3ASGi5jb20uYmNvbS5z",
-            "b2xhci5ncHJjLkVtcHR5GhouY29tLmJjb20uc29sYXIuZ3ByYy5FbXB0eRJY",
-            "ChNTZXRDYW1lcmFQYXJhbWV0ZXJzEiUuY29tLmJjb20uc29sYXIuZ3ByYy5D",
-            "YW1lcmFQYXJhbWV0ZXJzGhouY29tLmJjb20uc29sYXIuZ3ByYy5FbXB0eRJZ",
-            "ChBSZWxvY2FsaXplQW5kTWFwEhouY29tLmJjb20uc29sYXIuZ3ByYy5GcmFt",
-            "ZRopLmNvbS5iY29tLnNvbGFyLmdwcmMuUmVsb2NhbGl6YXRpb25SZXN1bHQS",
-            "VwoOR2V0M0RUcmFuc2Zvcm0SGi5jb20uYmNvbS5zb2xhci5ncHJjLkVtcHR5",
-            "GikuY29tLmJjb20uc29sYXIuZ3ByYy5SZWxvY2FsaXphdGlvblJlc3VsdBJH",
-            "CgtTZW5kTWVzc2FnZRIcLmNvbS5iY29tLnNvbGFyLmdwcmMuTWVzc2FnZRoa",
-            "LmNvbS5iY29tLnNvbGFyLmdwcmMuRW1wdHliBnByb3RvMw=="));
+            "XzI0EAASCgoGR1JFWV84EAESCwoHR1JFWV8xNhACKi4KEEltYWdlQ29tcHJl",
+            "c3Npb24SCAoETk9ORRAAEgcKA1BORxABEgcKA0pQRxACMsgECiJTb2xBUk1h",
+            "cHBpbmdBbmRSZWxvY2FsaXphdGlvblByb3h5EkoKBEluaXQSJi5jb20uYmNv",
+            "bS5zb2xhci5ncHJjLlBpcGVsaW5lTW9kZVZhbHVlGhouY29tLmJjb20uc29s",
+            "YXIuZ3ByYy5FbXB0eRI/CgVTdGFydBIaLmNvbS5iY29tLnNvbGFyLmdwcmMu",
+            "RW1wdHkaGi5jb20uYmNvbS5zb2xhci5ncHJjLkVtcHR5Ej4KBFN0b3ASGi5j",
+            "b20uYmNvbS5zb2xhci5ncHJjLkVtcHR5GhouY29tLmJjb20uc29sYXIuZ3By",
+            "Yy5FbXB0eRJYChNTZXRDYW1lcmFQYXJhbWV0ZXJzEiUuY29tLmJjb20uc29s",
+            "YXIuZ3ByYy5DYW1lcmFQYXJhbWV0ZXJzGhouY29tLmJjb20uc29sYXIuZ3By",
+            "Yy5FbXB0eRJZChBSZWxvY2FsaXplQW5kTWFwEhouY29tLmJjb20uc29sYXIu",
+            "Z3ByYy5GcmFtZRopLmNvbS5iY29tLnNvbGFyLmdwcmMuUmVsb2NhbGl6YXRp",
+            "b25SZXN1bHQSVwoOR2V0M0RUcmFuc2Zvcm0SGi5jb20uYmNvbS5zb2xhci5n",
+            "cHJjLkVtcHR5GikuY29tLmJjb20uc29sYXIuZ3ByYy5SZWxvY2FsaXphdGlv",
+            "blJlc3VsdBJHCgtTZW5kTWVzc2FnZRIcLmNvbS5iY29tLnNvbGFyLmdwcmMu",
+            "TWVzc2FnZRoaLmNvbS5iY29tLnNvbGFyLmdwcmMuRW1wdHliBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Com.Bcom.Solar.Gprc.PipelineMode), typeof(global::Com.Bcom.Solar.Gprc.CameraType), typeof(global::Com.Bcom.Solar.Gprc.RelocalizationPoseStatus), typeof(global::Com.Bcom.Solar.Gprc.ImageLayout), typeof(global::Com.Bcom.Solar.Gprc.ImageCompression), }, null, new pbr::GeneratedClrTypeInfo[] {
@@ -117,6 +117,7 @@ public enum ImageLayout {
   public enum ImageCompression {
     [pbr::OriginalName("NONE")] None = 0,
     [pbr::OriginalName("PNG")] Png = 1,
+    [pbr::OriginalName("JPG")] Jpg = 2,
   }
 
   #endregion
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -128,7 +128,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.2.0
+  bundleVersion: 0.3.0
   preloadedAssets:
   - {fileID: 0}
   - {fileID: 0}
@@ -255,6 +255,9 @@ PlayerSettings:
   - {fileID: 0}
   - {fileID: 0}
   - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 8098013011867456620, guid: 892250fbfc1442f49a66d62b6c348e31, type: 2}
+  - {fileID: 2256912601668067897, guid: bc86b981421586743bee1b33317fbc8a, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -745,7 +748,7 @@ PlayerSettings:
   m_RenderingPath: 1
   m_MobileRenderingPath: 1
   metroPackageName: SolARDemo
-  metroPackageVersion: 0.2.0.0
+  metroPackageVersion: 0.3.0.0
   metroCertificatePath: Assets\WSATestCertificate.pfx
   metroCertificatePassword: 
   metroCertificateSubject: DefaultCompany
@@ -781,6 +784,7 @@ PlayerSettings:
   metroSplashScreenUseBackgroundColor: 0
   platformCapabilities:
     WindowsStoreApps:
+      EnterpriseAuthentication: False
       OfflineMapsManagement: False
       HumanInterfaceDevice: False
       Location: False
@@ -792,7 +796,6 @@ PlayerSettings:
       PrivateNetworkClientServer: True
       InternetClientServer: True
       VideosLibrary: False
-      BackgroundMediaPlayback: False
       Objects3D: False
       RemoteSystem: False
       BlockedChatMessages: False
@@ -816,9 +819,9 @@ PlayerSettings:
       RecordedCallsFolder: False
       Contacts: False
       Proximity: False
-      InternetClient: True
       CodeGeneration: False
-      EnterpriseAuthentication: False
+      BackgroundMediaPlayback: False
+      InternetClient: True
   metroTargetDeviceFamilies:
     Desktop: False
     Holographic: True
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,5 +1,9 @@
 # Release Notes
 
+## v0.3.0
+
+* Add JPEG compression option
+
 ## v0.2.0
 
 * Add ability to select pipeline mode from relocation AND mapping to mapping only

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ private byte[] convertToPNG(ImageLayout imLayout,`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`public void SetFrame(int sensorId, ulong timestamp, ImageLayout imLayout,`
`145`		`- uint imWidth, uint imHeight, byte[] imData, double[] pose, bool compressionEnabled)`
	`145`	`+ uint imWidth, uint imHeight, byte[] imData, double[] pose, ImageCompression imageCompression)`
`146`	`146`	`{`
`147`	`147`
`148`	`148`	`// System.Diagnostics.Stopwatch stopWatch = new System.Diagnostics.Stopwatch();`
`@@ -165,7 +165,7 @@ public void SetFrame(int sensorId, ulong timestamp, ImageLayout imLayout,`
`165`	`165`	`Height = imHeight,`
`166`	`166`	`Data = ByteString.CopyFrom(imDataPng),`
`167`	`167`	`// Data = UnsafeByteOperations.UnsafeWrap(imDataPng),`
`168`		`- ImageCompression = compressionEnabled ? ImageCompression.Png : ImageCompression.None`
	`168`	`+ ImageCompression = imageCompression`
`169`	`169`	`},`
`170`	`170`	`Pose = new Matrix4x4`
`171`	`171`	`{`
`@@ -676,7 +676,7 @@ public RelocAndMappingResult RelocalizeAndMap(int sensorId, ulong timestamp, Ima`
`676`	`676`	`);`
`677`	`677`	`}`
`678`	`678`
`679`		`- private byte[] convertToPNG(ImageLayout imLayout, uint imWidth, uint imHeight, byte[] imData)`
	`679`	`+ private byte[] applyCompression(ImageLayout imLayout, uint imWidth, uint imHeight, byte[] imData, ImageCompression imageCompression)`
`680`	`680`	`{`
`681`	`681`	`GraphicsFormat format;`
`682`	`682`	`switch (imLayout)`
`@@ -687,7 +687,14 @@ private byte[] convertToPNG(ImageLayout imLayout, uint imWidth, uint imHeight, b`
`687`	`687`	`default: throw new ArgumentException("Unkown image layout");`
`688`	`688`	`}`
`689`	`689`
`690`		`- return UnityEngine.ImageConversion.EncodeArrayToPNG(imData, format, imWidth, imHeight);`
	`690`	`+ switch(imageCompression)`
	`691`	`+ {`
	`692`	`+ case ImageCompression.Png: return UnityEngine.ImageConversion.EncodeArrayToPNG(imData, format, imWidth, imHeight);`
	`693`	`+ case ImageCompression.Jpg: return UnityEngine.ImageConversion.EncodeArrayToJPG(imData, format, imWidth, imHeight);`
	`694`	`+ case ImageCompression.None: throw new ArgumentException("None should not be used here"); // return imData;`
	`695`	`+ default: throw new ArgumentException("Unknown image compression");`
	`696`	`+`
	`697`	`+ }`
`691`	`698`	`}`
`692`	`699`
`693`	`700`	`private RelocAndMappingResult RelocalizeAndMap(Frame frame)`
`@@ -710,8 +717,15 @@ private RelocAndMappingResult RelocalizeAndMap(Frame frame)`
`710`	`717`	`break;`
`711`	`718`	`}`
`712`	`719`	`case ImageCompression.Png:`
	`720`	`+ case ImageCompression.Jpg:`
`713`	`721`	`{`
`714`		`- frame.Image.Data = ByteString.CopyFrom(convertToPNG(frame.Image.Layout, frame.Image.Width, frame.Image.Height, frame.Image.Data.ToByteArray()));`
	`722`	`+ frame.Image.Data = ByteString.CopyFrom(`
	`723`	`+ applyCompression(`
	`724`	`+ frame.Image.Layout,`
	`725`	`+ frame.Image.Width,`
	`726`	`+ frame.Image.Height,`
	`727`	`+ frame.Image.Data.ToByteArray(),`
	`728`	`+ frame.Image.ImageCompression));`
`715`	`729`	`break;`
`716`	`730`	`}`
`717`	`731`	`default:`
Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,8 @@ public struct GrpcSettings`
`70`	`70`	`public bool useUniquePort;`
`71`	`71`	`[Tooltip("Delay in ms before sending each frame")]`
`72`	`72`	`public int delayBetweenFramesInMs;`
`73`		`- [Tooltip("Enable compression of frame image buffer in PNG to save bandwidth")]`
`74`		`- public bool compressionEnabled;`
	`73`	`+ [Tooltip("Select compression method of frame image buffer to save bandwidth")]`
	`74`	`+ public SolARRpc.ImageCompression imageCompression;`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`[SerializeField]`
`@@ -80,7 +80,7 @@ public struct GrpcSettings`
`80`	`80`	`channelPoolSize = 6,`
`81`	`81`	`useUniquePort = false,`
`82`	`82`	`delayBetweenFramesInMs = 20,`
`83`		`- compressionEnabled = true`
	`83`	`+ imageCompression = SolARRpc.ImageCompression.None`
`84`	`84`	`};`
`85`	`85`
`86`	`86`
`@@ -744,7 +744,7 @@ private void handleDepth(`
`744`	`744`	`if (rpcAvailable)`
`745`	`745`	`{`
`746`	`746`	`relocAndMappingFrameSender.SetFrame(0, ts, SolARRpc.ImageLayout.Grey16,`
`747`		`- _width, _height, depthData, cam2WorldTransform, /* compression = */ false);`
	`747`	`+ _width, _height, depthData, cam2WorldTransform, SolARRpc.ImageCompression.None);`
`748`	`748`	`}`
`749`	`749`	`NotifyOnDepthFrame(depthData, depthABData, ts, cam2WorldTransform, _width,`
`750`	`750`	`_height, _fx, _fy, _pixelBufferSize);`
`@@ -808,7 +808,7 @@ SolARRpc.SolARMappingAndRelocalizationGrpcProxyManager.FrameSender relocAndMappi`
`808`	`808`
`809`	`809`	`byte[] vclBufferData = null;`
`810`	`810`	`#if ENABLE_WINMD_SUPPORT`
`811`		`- vclBufferData = researchMode.GetVlcData(sensorType, out ts, out cam2WorldTransform, out _fx, out _fy, out _pixelBufferSize, out _width, out _height, /* flip = */ advancedGrpcSettings.compressionEnabled);`
	`811`	`+ vclBufferData = researchMode.GetVlcData(sensorType, out ts, out cam2WorldTransform, out _fx, out _fy, out _pixelBufferSize, out _width, out _height, /* flip = */ advancedGrpcSettings.imageCompression != SolARRpc.ImageCompression.None);`
`812`	`812`	`#endif`
`813`	`813`	`if (vclBufferData != null)`
`814`	`814`	`{`
`@@ -827,7 +827,7 @@ SolARRpc.SolARMappingAndRelocalizationGrpcProxyManager.FrameSender relocAndMappi`
`827`	`827`	`_height,`
`828`	`828`	`vclBufferData,`
`829`	`829`	`cam2WorldTransform,`
`830`		`- advancedGrpcSettings.compressionEnabled);`
	`830`	`+ advancedGrpcSettings.imageCompression);`
`831`	`831`	`}`
`832`	`832`	`}`
`833`	`833`	`else`
`@@ -878,7 +878,7 @@ private void handlePv(`
`878`	`878`	`double[] _PVtoWorldtransform = null;`
`879`	`879`	`byte[] frameTexture = null;`
`880`	`880`	`#if ENABLE_WINMD_SUPPORT`
`881`		`- frameTexture = researchMode.GetPvData(out _timestamp, out _PVtoWorldtransform, out _fx, out _fy, out _pixelBufferSize, out _width, out _height, /* flip = */ advancedGrpcSettings.compressionEnabled);`
	`881`	`+ frameTexture = researchMode.GetPvData(out _timestamp, out _PVtoWorldtransform, out _fx, out _fy, out _pixelBufferSize, out _width, out _height, /* flip = */ advancedGrpcSettings.imageCompression != SolARRpc.ImageCompression.None);`
`882`	`882`	`#endif`
`883`	`883`	`if (frameTexture != null)`
`884`	`884`	`{`
`@@ -890,7 +890,7 @@ private void handlePv(`
`890`	`890`	`{`
`891`	`891`	`relocAndMappingFrameSender.SetFrame(/* sensor id PV */ 0, _timestamp,`
`892`	`892`	`SolARRpc.ImageLayout.Rgb24, _width, _height, frameTexture,`
`893`		`- _PVtoWorldtransform, advancedGrpcSettings.compressionEnabled);`
	`893`	`+ _PVtoWorldtransform, advancedGrpcSettings.imageCompression);`
`894`	`894`	`}`
`895`	`895`	`}`
`896`	`896`	`}`
Original file line number	Diff line number	Diff line change
`@@ -660,7 +660,7 @@ SolARRpc.SolARMappingAndRelocalizationGrpcProxyManager.FrameSender relocAndMappi`
`660`	`660`	`_height,`
`661`	`661`	`vclBufferData,`
`662`	`662`	`cam2WorldTransform,`
`663`		`- /* compression = */ false);`
	`663`	`+ SolARRpc.ImageCompression.None);`
`664`	`664`	`}`
`665`	`665`
`666`	`666`
`@@ -785,7 +785,7 @@ private void handlePv(SolarRpcClient.FrameSender frameSender,`
`785`	`785`	`_height,`
`786`	`786`	`frameTexture,`
`787`	`787`	`_PVtoWorldtransform,`
`788`		`- /* compression = */ false);`
	`788`	`+ SolARRpc.ImageCompression.None);`
`789`	`789`	`}`
`790`	`790`
`791`	`791`