eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

create single VSDev for lifetime, destroy application modes

Browse Source
This commit is contained in:
milek7
2019-04-09 20:46:06 +02:00
parent 7b2e6e94ed
commit 7b841ca5ac
3 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
widgets/cameraview.cpp
View File

@@ -1,5 +1,4 @@
#include "widgets/cameraview.h"
#include "extras/VS_Dev.h"
#include "stb/stb_image.h"
#include "Globals.h"
#include "Logs.h"
@@ -14,6 +13,20 @@ void cameraview_window_callback(ImGuiSizeCallbackData *data) {
data->DesiredSize.y = data->DesiredSize.x * 9.0f / 16.0f;
}
ui::cameraview_panel::~cameraview_panel() {
if (!exit_thread) {
exit_thread = true;
{
std::lock_guard<std::mutex> lock(mutex);
stbi_image_free(image_ptr);
image_ptr = nullptr;
}
cv.notify_all();
}
if (workthread.joinable())
workthread.join();
}
void ui::cameraview_panel::render()
{
if (!is_open && !exit_thread) {
@@ -81,11 +94,12 @@ void ui::cameraview_panel::render_contents()
void ui::cameraview_panel::workthread_func()
{
VSDev vsdev;
if (!device)
device = std::make_unique<VSDev>();
while (!exit_thread) {
uint8_t *buffer = nullptr;
size_t len = vsdev.GetFrameFromStream((char**)&buffer);
size_t len = device->GetFrameFromStream((char**)&buffer);
if (buffer) {
int w, h;
@@ -93,7 +107,7 @@ void ui::cameraview_panel::workthread_func()
if (!image)
ErrorLog(std::string(stbi_failure_reason()));
vsdev.FreeFrameBuffer((char*)buffer);
device->FreeFrameBuffer((char*)buffer);
std::unique_lock<std::mutex> lock(mutex);
if (image_ptr)