fixing udp id sequence

mocap-ca · Nov 7, 2022 · a9f103b · a9f103b
1 parent 0f1f357
commit a9f103b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/plugins/mobu/device.cpp b/plugins/mobu/device.cpp
@@ -413,11 +413,13 @@ void Open3D_Device::DeviceIONotify(kDeviceIOs  pAction, FBDeviceNotifyInfo &pDev
 
 				size_t sentSz = 0;
 
+				mIdSeq++;
+
 				std::vector<char> fragData;
 				UdpFragmenter frag(buf.data(), bucketSize, 512);
 				for (int i = 0; i < frag.mFrames; i++)
 				{
-					frag.makeFragment(mIdSeq++, i, fragData);
+					frag.makeFragment(mIdSeq, i, fragData);
 					sentSz+= sendto(mNetworkSocket, fragData.data(), fragData.size(), 0,
 						(struct sockaddr*)&dest_addr,
 						(int)sizeof(struct sockaddr_in));

diff --git a/src/o3ds/o3ds.h b/src/o3ds/o3ds.h
@@ -3,8 +3,8 @@
 
 
 #define O3DS_VERSION_MAJOR 0
-#define O3DS_VERSION_MINOR 20
-#define O3DS_VERSION       "0.20"
+#define O3DS_VERSION_MINOR 21
+#define O3DS_VERSION       "0.21"
 
 namespace O3DS
 {

diff --git a/src/o3ds/udp_fragment.cpp b/src/o3ds/udp_fragment.cpp
@@ -142,12 +142,13 @@ bool UdpMapper::addFragment(const char* data, size_t sz)
 
 	uint32_t* heading = (uint32_t*)data;
 
-	uint32_t id = heading[0];
+	uint32_t frameId = heading[0];
+	uint32_t fragmentId = heading[1];
 
-	if (id > 40)
-		return false;
+	//if (fragmentId > 40)
+    // return false;
 
-	this->getCombiner(id).addFragment(data, sz);
+	this->getCombiner(frameId).addFragment(data, sz);
 }
 
 bool UdpMapper::getFrame(std::vector<char> &out)