Skip to content

Fix001 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johandinox merged 2 commits into from
Sep 18, 2023
Merged

Fix001 #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2a3707
Fix issue #3
johandinox Sep 18, 2023
ff08aba
Fix issue #4
johandinox Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/pyvcam/pvcmodule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,12 @@ void NewFrameHandler(FRAME_INFO *pFrameInfo, void *context)
if ((int)camInstance.frameQueue_.size() >= camInstance.buffer_frame_count_) {
//printf("Queue size: %zd",camInstance.frameQueue_.size());
//printf("Buffer size: %zd",camInstance.buffer_frame_count_);
camInstance.frameQueue_.pop();
printf("Lost frame\n");
int n_dropped = 0;
while ((int)camInstance.frameQueue_.size() >= camInstance.buffer_frame_count_) {
camInstance.frameQueue_.pop();
n_dropped++;
}
printf("Dropped %d frame(s)\n", n_dropped);
}
}

Expand Down Expand Up @@ -691,6 +695,8 @@ pvc_start_live(PyObject *self, PyObject *args)
std::lock_guard<std::mutex> lock(g_camInstanceMutex);
try {
Cam_Instance_T& camInstance = g_camInstanceMap.at(hCam);
camInstance.buffer_frame_count_ = buffer_frame_count;
camInstance.setAcquisitiontMode(false);

if (!check_meta_data_enabled(hCam, camInstance.metaDataEnabled_)) {
PyErr_SetString(PyExc_MemoryError, "Unable to query meta data enabled.");
Expand All @@ -717,8 +723,6 @@ pvc_start_live(PyObject *self, PyObject *args)
PyErr_SetString(PyExc_RuntimeError, g_msg);
return NULL;
}
camInstance.buffer_frame_count_ = buffer_frame_count;
camInstance.setAcquisitiontMode(false);
}
catch (const std::out_of_range& oor) {
PyErr_SetString(PyExc_KeyError, oor.what());
Expand Down