Optimize read frames

bparks13 · bparks13 · commit 4da3b2f7f079 · 2025-07-01T15:51:14.000-04:00
- Remove excess GenericScopedLock calls, these are handled internally by the Array
- Remove extra calls to port controllers to process frames
- Stop acquiring data before clearing individual device arrays to prevent any data being added after clearing the arrays
diff --git a/Source/Devices/AnalogIO.cpp b/Source/Devices/AnalogIO.cpp
@@ -199,20 +199,17 @@ void AnalogIO::stopAcquisition()
 {
 	while (!frameArray.isEmpty())
 	{
-		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 		oni_destroy_frame(frameArray.removeAndReturn(0));
 	}
 }
 
 void AnalogIO::addFrame(oni_frame_t* frame)
 {
-	const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 	frameArray.add(frame);
 }
 
 int AnalogIO::getNumberOfFrames()
 {
-	const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 	return frameArray.size();
 }
 
@@ -224,7 +221,6 @@ void AnalogIO::addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers)
 
 void AnalogIO::processFrame(uint64_t eventWord)
 {
-	const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 	oni_frame_t* frame = frameArray.removeAndReturn(0);
 
 	int16_t* dataPtr = (int16_t*)frame->data;
diff --git a/Source/Devices/Bno055.cpp b/Source/Devices/Bno055.cpp
@@ -157,7 +157,6 @@ void Bno055::stopAcquisition()
 {
 	while (!frameArray.isEmpty())
 	{
-		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 		oni_destroy_frame(frameArray.removeAndReturn(0));
 	}
 
@@ -167,7 +166,6 @@ void Bno055::stopAcquisition()
 
 void Bno055::addFrame(oni_frame_t* frame)
 {
-	const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 	frameArray.add(frame);
 }
 
@@ -181,7 +179,6 @@ void Bno055::processFrames()
 {
 	while (!frameArray.isEmpty())
 	{
-		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 		oni_frame_t* frame = frameArray.removeAndReturn(0);
 
 		int16_t* dataPtr = ((int16_t*)frame->data) + 4;
diff --git a/Source/Devices/DigitalIO.cpp b/Source/Devices/DigitalIO.cpp
@@ -70,7 +70,6 @@ void DigitalIO::stopAcquisition()
 {
 	while (!frameArray.isEmpty())
 	{
-		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 		oni_destroy_frame(frameArray.removeAndReturn(0));
 	}
 }
@@ -91,22 +90,18 @@ EventChannel::Settings DigitalIO::getEventChannelSettings(DataStream* stream)
 
 void DigitalIO::addFrame(oni_frame_t* frame)
 {
-	const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 	frameArray.add(frame);
 }
 
 int DigitalIO::getNumberOfWords()
 {
-	const GenericScopedLock<CriticalSection> frameLock(eventWords.getLock());
 	return eventWords.size();
 }
 
 void DigitalIO::processFrames()
 {
 	while (!frameArray.isEmpty())
 	{
-		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
-		const GenericScopedLock<CriticalSection> digitalInputsLock(eventWords.getLock());
 		oni_frame_t* frame = frameArray.removeAndReturn(0);
 
 		uint16_t* dataPtr = (uint16_t*)frame->data;
@@ -126,8 +121,6 @@ void DigitalIO::processFrames()
 
 uint64_t DigitalIO::getEventWord()
 {
-	const GenericScopedLock<CriticalSection> digitalInputsLock(eventWords.getLock());
-
 	if (eventWords.size() != 0)
 		return eventWords.removeAndReturn(0);
 
@@ -136,7 +129,5 @@ uint64_t DigitalIO::getEventWord()
 
 bool DigitalIO::hasEventWord()
 {
-	const GenericScopedLock<CriticalSection> digitalInputsLock(eventWords.getLock());
-
 	return eventWords.size() > 0;
 }
diff --git a/Source/Devices/HarpSyncInput.cpp b/Source/Devices/HarpSyncInput.cpp
@@ -76,14 +76,12 @@ void HarpSyncInput::stopAcquisition()
 {
 	while (!frameArray.isEmpty())
 	{
-		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 		oni_destroy_frame(frameArray.removeAndReturn(0));
 	}
 }
 
 void HarpSyncInput::addFrame(oni_frame_t* frame)
 {
-	const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 	frameArray.add(frame);
 }
 
@@ -97,7 +95,6 @@ void HarpSyncInput::processFrames()
 {
 	while (!frameArray.isEmpty())
 	{
-		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 		oni_frame_t* frame = frameArray.removeAndReturn(0);
 
 		uint32_t* dataPtr = (uint32_t*)frame->data;
diff --git a/Source/Devices/MemoryMonitor.cpp b/Source/Devices/MemoryMonitor.cpp
@@ -126,14 +126,12 @@ void MemoryMonitor::stopAcquisition()
 {
 	while (!frameArray.isEmpty())
 	{
-		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 		oni_destroy_frame(frameArray.removeAndReturn(0));
 	}
 }
 
 void MemoryMonitor::addFrame(oni_frame_t* frame)
 {
-	const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 	frameArray.add(frame);
 }
 
@@ -152,7 +150,6 @@ void MemoryMonitor::processFrames()
 {
 	while (!frameArray.isEmpty())
 	{
-		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 		oni_frame_t* frame = frameArray.removeAndReturn(0);
 
 		uint32_t* dataPtr = (uint32_t*)frame->data;
diff --git a/Source/Devices/Neuropixels1e.cpp b/Source/Devices/Neuropixels1e.cpp
@@ -268,7 +268,6 @@ void Neuropixels1e::stopAcquisition()
 
 	while (!frameArray.isEmpty())
 	{
-		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 		oni_destroy_frame(frameArray.removeAndReturn(0));
 	}
 }
@@ -288,7 +287,6 @@ void Neuropixels1e::addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers)
 
 void Neuropixels1e::addFrame(oni_frame_t* frame)
 {
-	const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 	frameArray.add(frame);
 }
 
@@ -299,7 +297,6 @@ void Neuropixels1e::processFrames()
 
 	while (!frameArray.isEmpty())
 	{
-		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 		oni_frame_t* frame = frameArray.removeAndReturn(0);
 
 		uint16_t* dataPtr = (uint16_t*)frame->data;
diff --git a/Source/Devices/Neuropixels1f.cpp b/Source/Devices/Neuropixels1f.cpp
@@ -223,7 +223,6 @@ void Neuropixels1f::stopAcquisition()
 
 	while (!frameArray.isEmpty())
 	{
-		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 		oni_destroy_frame(frameArray.removeAndReturn(0));
 	}
 }
@@ -243,7 +242,6 @@ void Neuropixels1f::addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers)
 
 void Neuropixels1f::addFrame(oni_frame_t* frame)
 {
-	const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 	frameArray.add(frame);
 }
 
@@ -254,7 +252,6 @@ void Neuropixels1f::processFrames()
 
 	while (!frameArray.isEmpty())
 	{
-		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 		oni_frame_t* frame = frameArray.removeAndReturn(0);
 
 		uint16_t* dataPtr = (uint16_t*)frame->data;
diff --git a/Source/Devices/Neuropixels2e.cpp b/Source/Devices/Neuropixels2e.cpp
@@ -493,14 +493,12 @@ void Neuropixels2e::stopAcquisition()
 
 	while (!frameArray.isEmpty())
 	{
-		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 		oni_destroy_frame(frameArray.removeAndReturn(0));
 	}
 }
 
 void Neuropixels2e::addFrame(oni_frame_t* frame)
 {
-	const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 	frameArray.add(frame);
 }
 
@@ -527,7 +525,6 @@ void Neuropixels2e::processFrames()
 {
 	while (!frameArray.isEmpty())
 	{
-		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 		oni_frame_t* frame = frameArray.removeAndReturn(0);
 
 		uint16_t* dataPtr = (uint16_t*)frame->data;
diff --git a/Source/Devices/PortController.cpp b/Source/Devices/PortController.cpp
@@ -46,22 +46,19 @@ void PortController::stopAcquisition()
 {
 	while (!frameArray.isEmpty())
 	{
-		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 		oni_destroy_frame(frameArray.removeAndReturn(0));
 	}
 }
 
 void PortController::addFrame(oni_frame_t* frame)
 {
-	const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 	frameArray.add(frame);
 }
 
 void PortController::processFrames()
 {
 	while (!frameArray.isEmpty())
 	{
-		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 		oni_frame_t* frame = frameArray.removeAndReturn(0);
 
 		int8_t* dataPtr = (int8_t*)frame->data;
diff --git a/Source/OnixSource.cpp b/Source/OnixSource.cpp
@@ -1051,14 +1051,14 @@ bool OnixSource::stopAcquisition()
 	if (!portA->getErrorFlag() && !portB->getErrorFlag())
 		waitForThreadToExit(2000);
 
+	oni_size_t reg = 0;
+	context->setOption(ONI_OPT_RUNNING, reg);
+
 	for (const auto& source : enabledSources)
 	{
 		source->stopAcquisition();
 	}
 
-	oni_size_t reg = 0;
-	context->setOption(ONI_OPT_RUNNING, reg);
-
 	for (auto buffers : sourceBuffers)
 		buffers->clear();
 
@@ -1093,8 +1093,5 @@ bool OnixSource::updateBuffer()
 		if (threadShouldExit()) return true;
 	}
 
-	portA->processFrames();
-	portB->processFrames();
-
 	return !portA->getErrorFlag() && !portB->getErrorFlag();
 }

Original file line number	Diff line number	Diff line change
`@@ -199,20 +199,17 @@ void AnalogIO::stopAcquisition()`
`199`	`199`	`{`
`200`	`200`	`while (!frameArray.isEmpty())`
`201`	`201`	`{`
`202`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`203`	`202`	`oni_destroy_frame(frameArray.removeAndReturn(0));`
`204`	`203`	`}`
`205`	`204`	`}`
`206`	`205`
`207`	`206`	`void AnalogIO::addFrame(oni_frame_t* frame)`
`208`	`207`	`{`
`209`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`210`	`208`	`frameArray.add(frame);`
`211`	`209`	`}`
`212`	`210`
`213`	`211`	`int AnalogIO::getNumberOfFrames()`
`214`	`212`	`{`
`215`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`216`	`213`	`return frameArray.size();`
`217`	`214`	`}`
`218`	`215`
`@@ -224,7 +221,6 @@ void AnalogIO::addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers)`
`224`	`221`
`225`	`222`	`void AnalogIO::processFrame(uint64_t eventWord)`
`226`	`223`	`{`
`227`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`228`	`224`	`oni_frame_t* frame = frameArray.removeAndReturn(0);`
`229`	`225`
`230`	`226`	`int16_t* dataPtr = (int16_t*)frame->data;`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,6 @@ void Bno055::stopAcquisition()`
`157`	`157`	`{`
`158`	`158`	`while (!frameArray.isEmpty())`
`159`	`159`	`{`
`160`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`161`	`160`	`oni_destroy_frame(frameArray.removeAndReturn(0));`
`162`	`161`	`}`
`163`	`162`
`@@ -167,7 +166,6 @@ void Bno055::stopAcquisition()`
`167`	`166`
`168`	`167`	`void Bno055::addFrame(oni_frame_t* frame)`
`169`	`168`	`{`
`170`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`171`	`169`	`frameArray.add(frame);`
`172`	`170`	`}`
`173`	`171`
`@@ -181,7 +179,6 @@ void Bno055::processFrames()`
`181`	`179`	`{`
`182`	`180`	`while (!frameArray.isEmpty())`
`183`	`181`	`{`
`184`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`185`	`182`	`oni_frame_t* frame = frameArray.removeAndReturn(0);`
`186`	`183`
`187`	`184`	`int16_t* dataPtr = ((int16_t*)frame->data) + 4;`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,6 @@ void DigitalIO::stopAcquisition()`
`70`	`70`	`{`
`71`	`71`	`while (!frameArray.isEmpty())`
`72`	`72`	`{`
`73`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`74`	`73`	`oni_destroy_frame(frameArray.removeAndReturn(0));`
`75`	`74`	`}`
`76`	`75`	`}`
`@@ -91,22 +90,18 @@ EventChannel::Settings DigitalIO::getEventChannelSettings(DataStream* stream)`
`91`	`90`
`92`	`91`	`void DigitalIO::addFrame(oni_frame_t* frame)`
`93`	`92`	`{`
`94`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`95`	`93`	`frameArray.add(frame);`
`96`	`94`	`}`
`97`	`95`
`98`	`96`	`int DigitalIO::getNumberOfWords()`
`99`	`97`	`{`
`100`		`- const GenericScopedLock<CriticalSection> frameLock(eventWords.getLock());`
`101`	`98`	`return eventWords.size();`
`102`	`99`	`}`
`103`	`100`
`104`	`101`	`void DigitalIO::processFrames()`
`105`	`102`	`{`
`106`	`103`	`while (!frameArray.isEmpty())`
`107`	`104`	`{`
`108`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`109`		`- const GenericScopedLock<CriticalSection> digitalInputsLock(eventWords.getLock());`
`110`	`105`	`oni_frame_t* frame = frameArray.removeAndReturn(0);`
`111`	`106`
`112`	`107`	`uint16_t* dataPtr = (uint16_t*)frame->data;`
`@@ -126,8 +121,6 @@ void DigitalIO::processFrames()`
`126`	`121`
`127`	`122`	`uint64_t DigitalIO::getEventWord()`
`128`	`123`	`{`
`129`		`- const GenericScopedLock<CriticalSection> digitalInputsLock(eventWords.getLock());`
`130`		`-`
`131`	`124`	`if (eventWords.size() != 0)`
`132`	`125`	`return eventWords.removeAndReturn(0);`
`133`	`126`
`@@ -136,7 +129,5 @@ uint64_t DigitalIO::getEventWord()`
`136`	`129`
`137`	`130`	`bool DigitalIO::hasEventWord()`
`138`	`131`	`{`
`139`		`- const GenericScopedLock<CriticalSection> digitalInputsLock(eventWords.getLock());`
`140`		`-`
`141`	`132`	`return eventWords.size() > 0;`
`142`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,14 +76,12 @@ void HarpSyncInput::stopAcquisition()`
`76`	`76`	`{`
`77`	`77`	`while (!frameArray.isEmpty())`
`78`	`78`	`{`
`79`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`80`	`79`	`oni_destroy_frame(frameArray.removeAndReturn(0));`
`81`	`80`	`}`
`82`	`81`	`}`
`83`	`82`
`84`	`83`	`void HarpSyncInput::addFrame(oni_frame_t* frame)`
`85`	`84`	`{`
`86`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`87`	`85`	`frameArray.add(frame);`
`88`	`86`	`}`
`89`	`87`
`@@ -97,7 +95,6 @@ void HarpSyncInput::processFrames()`
`97`	`95`	`{`
`98`	`96`	`while (!frameArray.isEmpty())`
`99`	`97`	`{`
`100`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`101`	`98`	`oni_frame_t* frame = frameArray.removeAndReturn(0);`
`102`	`99`
`103`	`100`	`uint32_t* dataPtr = (uint32_t*)frame->data;`
Original file line number	Diff line number	Diff line change
`@@ -126,14 +126,12 @@ void MemoryMonitor::stopAcquisition()`
`126`	`126`	`{`
`127`	`127`	`while (!frameArray.isEmpty())`
`128`	`128`	`{`
`129`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`130`	`129`	`oni_destroy_frame(frameArray.removeAndReturn(0));`
`131`	`130`	`}`
`132`	`131`	`}`
`133`	`132`
`134`	`133`	`void MemoryMonitor::addFrame(oni_frame_t* frame)`
`135`	`134`	`{`
`136`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`137`	`135`	`frameArray.add(frame);`
`138`	`136`	`}`
`139`	`137`
`@@ -152,7 +150,6 @@ void MemoryMonitor::processFrames()`
`152`	`150`	`{`
`153`	`151`	`while (!frameArray.isEmpty())`
`154`	`152`	`{`
`155`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`156`	`153`	`oni_frame_t* frame = frameArray.removeAndReturn(0);`
`157`	`154`
`158`	`155`	`uint32_t* dataPtr = (uint32_t*)frame->data;`
Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,6 @@ void Neuropixels1e::stopAcquisition()`
`268`	`268`
`269`	`269`	`while (!frameArray.isEmpty())`
`270`	`270`	`{`
`271`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`272`	`271`	`oni_destroy_frame(frameArray.removeAndReturn(0));`
`273`	`272`	`}`
`274`	`273`	`}`
`@@ -288,7 +287,6 @@ void Neuropixels1e::addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers)`
`288`	`287`
`289`	`288`	`void Neuropixels1e::addFrame(oni_frame_t* frame)`
`290`	`289`	`{`
`291`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`292`	`290`	`frameArray.add(frame);`
`293`	`291`	`}`
`294`	`292`
`@@ -299,7 +297,6 @@ void Neuropixels1e::processFrames()`
`299`	`297`
`300`	`298`	`while (!frameArray.isEmpty())`
`301`	`299`	`{`
`302`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`303`	`300`	`oni_frame_t* frame = frameArray.removeAndReturn(0);`
`304`	`301`
`305`	`302`	`uint16_t* dataPtr = (uint16_t*)frame->data;`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,6 @@ void Neuropixels1f::stopAcquisition()`
`223`	`223`
`224`	`224`	`while (!frameArray.isEmpty())`
`225`	`225`	`{`
`226`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`227`	`226`	`oni_destroy_frame(frameArray.removeAndReturn(0));`
`228`	`227`	`}`
`229`	`228`	`}`
`@@ -243,7 +242,6 @@ void Neuropixels1f::addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers)`
`243`	`242`
`244`	`243`	`void Neuropixels1f::addFrame(oni_frame_t* frame)`
`245`	`244`	`{`
`246`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`247`	`245`	`frameArray.add(frame);`
`248`	`246`	`}`
`249`	`247`
`@@ -254,7 +252,6 @@ void Neuropixels1f::processFrames()`
`254`	`252`
`255`	`253`	`while (!frameArray.isEmpty())`
`256`	`254`	`{`
`257`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`258`	`255`	`oni_frame_t* frame = frameArray.removeAndReturn(0);`
`259`	`256`
`260`	`257`	`uint16_t* dataPtr = (uint16_t*)frame->data;`
Original file line number	Diff line number	Diff line change
`@@ -493,14 +493,12 @@ void Neuropixels2e::stopAcquisition()`
`493`	`493`
`494`	`494`	`while (!frameArray.isEmpty())`
`495`	`495`	`{`
`496`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`497`	`496`	`oni_destroy_frame(frameArray.removeAndReturn(0));`
`498`	`497`	`}`
`499`	`498`	`}`
`500`	`499`
`501`	`500`	`void Neuropixels2e::addFrame(oni_frame_t* frame)`
`502`	`501`	`{`
`503`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`504`	`502`	`frameArray.add(frame);`
`505`	`503`	`}`
`506`	`504`
`@@ -527,7 +525,6 @@ void Neuropixels2e::processFrames()`
`527`	`525`	`{`
`528`	`526`	`while (!frameArray.isEmpty())`
`529`	`527`	`{`
`530`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`531`	`528`	`oni_frame_t* frame = frameArray.removeAndReturn(0);`
`532`	`529`
`533`	`530`	`uint16_t* dataPtr = (uint16_t*)frame->data;`
Original file line number	Diff line number	Diff line change
`@@ -46,22 +46,19 @@ void PortController::stopAcquisition()`
`46`	`46`	`{`
`47`	`47`	`while (!frameArray.isEmpty())`
`48`	`48`	`{`
`49`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`50`	`49`	`oni_destroy_frame(frameArray.removeAndReturn(0));`
`51`	`50`	`}`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`void PortController::addFrame(oni_frame_t* frame)`
`55`	`54`	`{`
`56`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`57`	`55`	`frameArray.add(frame);`
`58`	`56`	`}`
`59`	`57`
`60`	`58`	`void PortController::processFrames()`
`61`	`59`	`{`
`62`	`60`	`while (!frameArray.isEmpty())`
`63`	`61`	`{`
`64`		`- const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());`
`65`	`62`	`oni_frame_t* frame = frameArray.removeAndReturn(0);`
`66`	`63`
`67`	`64`	`int8_t* dataPtr = (int8_t*)frame->data;`
Original file line number	Diff line number	Diff line change
`@@ -1051,14 +1051,14 @@ bool OnixSource::stopAcquisition()`
`1051`	`1051`	`if (!portA->getErrorFlag() && !portB->getErrorFlag())`
`1052`	`1052`	`waitForThreadToExit(2000);`
`1053`	`1053`
	`1054`	`+ oni_size_t reg = 0;`
	`1055`	`+ context->setOption(ONI_OPT_RUNNING, reg);`
	`1056`	`+`
`1054`	`1057`	`for (const auto& source : enabledSources)`
`1055`	`1058`	`{`
`1056`	`1059`	`source->stopAcquisition();`
`1057`	`1060`	`}`
`1058`	`1061`
`1059`		`- oni_size_t reg = 0;`
`1060`		`- context->setOption(ONI_OPT_RUNNING, reg);`
`1061`		`-`
`1062`	`1062`	`for (auto buffers : sourceBuffers)`
`1063`	`1063`	`buffers->clear();`
`1064`	`1064`
`@@ -1093,8 +1093,5 @@ bool OnixSource::updateBuffer()`
`1093`	`1093`	`if (threadShouldExit()) return true;`
`1094`	`1094`	`}`
`1095`	`1095`
`1096`		`- portA->processFrames();`
`1097`		`- portB->processFrames();`
`1098`		`-`
`1099`	`1096`	`return !portA->getErrorFlag() && !portB->getErrorFlag();`
`1100`	`1097`	`}`