NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

qcam: Move static timestamp to MainWindow

Browse source 
The 'last' buffer timestamp is stored as a static. Rename the variable
to a more descritive 'lastBufferTime' and move it to the class instance.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Kieran Bingham 2019-07-04 11:26:43 +01:00
parent b817bcec6b
commit b3ad7b8654
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/qcam/main_window.cpp
View file

@ -144,6 +144,8 @@ int MainWindow::startCapture()
requests.push_back(request); requests.push_back(request);
} }
lastBufferTime_ = 0;
ret = camera_->start(); ret = camera_->start();
if (ret) { if (ret) {
std::cout << "Failed to start capture" << std::endl; std::cout << "Failed to start capture" << std::endl;
@ -187,16 +189,14 @@ void MainWindow::stopCapture()
void MainWindow::requestComplete(Request *request, void MainWindow::requestComplete(Request *request,
const std::map<Stream *, Buffer *> &buffers) const std::map<Stream *, Buffer *> &buffers)
{ {
static uint64_t last = 0;
if (request->status() == Request::RequestCancelled) if (request->status() == Request::RequestCancelled)
return; return;
Buffer *buffer = buffers.begin()->second; Buffer *buffer = buffers.begin()->second;
double fps = buffer->timestamp() - last; double fps = buffer->timestamp() - lastBufferTime_;
fps = last && fps ? 1000000000.0 / fps : 0.0; fps = lastBufferTime_ && fps ? 1000000000.0 / fps : 0.0;
last = buffer->timestamp(); lastBufferTime_ = buffer->timestamp();
std::cout << "seq: " << std::setw(6) << std::setfill('0') << buffer->sequence() std::cout << "seq: " << std::setw(6) << std::setfill('0') << buffer->sequence()
<< " buf: " << buffer->index() << " buf: " << buffer->index()

2
src/qcam/main_window.h
View file

@ -48,6 +48,8 @@ private:
bool isCapturing_; bool isCapturing_;
std::unique_ptr<CameraConfiguration> config_; std::unique_ptr<CameraConfiguration> config_;
uint64_t lastBufferTime_;
ViewFinder *viewfinder_; ViewFinder *viewfinder_;
}; };