Skip to content

Fix001 #2

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 15, 2023
Merged

Fix001 #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4976fb5
Limit queue to ring buffer size
johandinox Sep 15, 2023
a601cba
Get frames as long as frames are in buffer
johandinox Sep 15, 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
11 changes: 8 additions & 3 deletions src/pyvcam/pvcmodule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ class Cam_Instance_T {
, hFileStreamToDisk_(cInvalidFileHandle)
, readIndex_(0)
, frameResidual_(0)
, buffer_frame_count_(0)
{
}

Expand Down Expand Up @@ -223,6 +224,7 @@ class Cam_Instance_T {
bool abortData_;
bool newData_;
bool seqMode_;
uns16 buffer_frame_count_;
std::mutex frameMutex_;
std::condition_variable conditionalVariable_;

Expand Down Expand Up @@ -287,8 +289,9 @@ void NewFrameHandler(FRAME_INFO *pFrameInfo, void *context)

// Pop from queue once maximal size is reached. No resets.
if (!camInstance.seqMode_){
if ((int)camInstance.frameQueue_.size() >= 400) {
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");
}
Expand Down Expand Up @@ -714,7 +717,7 @@ 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) {
Expand Down Expand Up @@ -957,7 +960,9 @@ pvc_get_frame(PyObject *self, PyObject *args)
//printf("New Data FPS: %f Cnt: %d\r\n", camInstance.fps_, frame.count);

// Toggle newData_ flag unless we are in sequence mode and another frame is available
camInstance.newData_ = camInstance.seqMode_ && !camInstance.frameQueue_.empty();
//camInstance.newData_ = camInstance.seqMode_ && !camInstance.frameQueue_.empty();
// Toggle newData_ flag unless another frame is available
camInstance.newData_ = !camInstance.frameQueue_.empty();

PyObject *frameDict = PyDict_New();
PyObject* roiDataList = PyList_New(0);
Expand Down