diff options
| -rw-r--r-- | src/camera/veyeimx287m.h | 12 | ||||
| -rw-r--r-- | src/image.cpp | 14 | ||||
| -rw-r--r-- | src/image.h | 2 | ||||
| -rw-r--r-- | src/protocols/httpserver.cpp | 4 |
4 files changed, 11 insertions, 21 deletions
diff --git a/src/camera/veyeimx287m.h b/src/camera/veyeimx287m.h index 1f293d6..4de51af 100644 --- a/src/camera/veyeimx287m.h +++ b/src/camera/veyeimx287m.h @@ -37,7 +37,7 @@ public: bool dequeueImageBuffer(size_t &image); // bool getImage(Image &image); - bool getImage(Image *image); + bool getImage(Image *image) override; bool init(); @@ -93,10 +93,12 @@ private: struct buffer { - unsigned int idx; - unsigned int padding[VIDEO_MAX_PLANES]; - unsigned int size[VIDEO_MAX_PLANES]; - void *mem[VIDEO_MAX_PLANES]; + unsigned int idx{std::numeric_limits<unsigned int>::max()}; + unsigned int padding[VIDEO_MAX_PLANES]{ + std::numeric_limits<unsigned int>::max()}; + unsigned int size[VIDEO_MAX_PLANES]{ + std::numeric_limits<unsigned int>::max()}; + void *mem[VIDEO_MAX_PLANES]{nullptr}; }; std::vector<buffer> buffers; diff --git a/src/image.cpp b/src/image.cpp index 37d0892..4af3e53 100644 --- a/src/image.cpp +++ b/src/image.cpp @@ -196,20 +196,6 @@ void Image::rotate() rot_elapsed_ns += t.nsecsElapsed(); } -Pixels Image::pixels() -{ - t.start(); - - Pixels result; - result.counters = counters; - - std::transform(rotated_cw.cbegin(), rotated_cw.cend(), result.pixels.begin(), process_column); - - pix_elapsed_ns += t.nsecsElapsed(); - - return result; -} - std::shared_ptr<Pixels> Image::sharedPixels() { t.start(); diff --git a/src/image.h b/src/image.h index 178f0ee..d5fd953 100644 --- a/src/image.h +++ b/src/image.h @@ -50,7 +50,7 @@ struct Image QElapsedTimer t; void rotate(); - Pixels pixels(); + std::shared_ptr<Pixels> sharedPixels(); void copyFromData(const void* src, size_t size); diff --git a/src/protocols/httpserver.cpp b/src/protocols/httpserver.cpp index 164ce54..f1b562e 100644 --- a/src/protocols/httpserver.cpp +++ b/src/protocols/httpserver.cpp @@ -30,10 +30,12 @@ HttpServer::HttpServer(std::shared_ptr<ICamera> camera, , INIT_FIELD(port) , m_server{std::make_shared<QHttpServer>()} { + // TODO: move these vars outside const auto apiPrefix = QStringLiteral("/v1"); const auto pixelsPath = apiPrefix + "/pixels"; qDebug().noquote() << Q_FUNC_INFO << ": pixelsPath: " << pixelsPath; + // TODO: get rid of lamdas, there should be a better way m_server->route(pixelsPath, [this]() { return GET_pixels(); }); m_server->route(apiPrefix + QStringLiteral("/sensor/params"), QHttpServerRequest::Method::Get, @@ -55,7 +57,7 @@ HttpServer::HttpServer(std::shared_ptr<ICamera> camera, QHttpServerResponse HttpServer::GET_image() { - static Image img; + Image img; if (!m_camera->getImage(&img)) { qCritical() << "cannot get image"; |