line search

1 files changed, 68 insertions, 63 deletions

diff --git a/LibCamera.h b/LibCamera.h
index 2262ab2..89cf835 100644
--- a/LibCamera.h
+++ b/LibCamera.h
@@ -1,19 +1,25 @@
-#include <atomic>

-#include <iomanip>

-#include <iostream>

-#include <signal.h>

-#include <limits.h>

-#include <memory>

-#include <stdint.h>

-#include <string>

-#include <vector>

-#include <unordered_map>

-#include <queue>

-#include <sstream>

-#include <sys/mman.h>

-#include <unistd.h>

-#include <time.h>

-#include <mutex>

+#pragma once

+

+// #include <atomic>

+// #include <iomanip>

+// #include <iostream>

+// #include <signal.h>

+// #include <limits.h>

+// #include <memory>

+// #include <stdint.h>

+// #include <string>

+// #include <vector>

+// #include <unordered_map>

+// #include <queue>

+// #include <sstream>

+// #include <sys/mman.h>

+// #include <unistd.h>

+// #include <time.h>

+// #include <mutex>

+

+#ifdef signals

+#error ("don't include this file after any qt files")

+#endif

 

 #include <libcamera/controls.h>

 #include <libcamera/control_ids.h>

@@ -26,61 +32,60 @@
 #include <libcamera/stream.h>

 #include <libcamera/formats.h>

 #include <libcamera/transform.h>

+// using namespace libcamera;

 

-using namespace libcamera;

-

-typedef struct {

-    uint8_t *imageData;

-    uint32_t size;

-    uint64_t request;

-} LibcameraOutData;

+// typedef struct {

+//     uint8_t *imageData;

+//     uint32_t size;

+//     uint64_t request;

+// } LibcameraOutData;

 

-class LibCamera {

-    public:

-        LibCamera(){};

-        ~LibCamera(){};

+// class LibCamera {

+//     public:

+//         LibCamera(){};

+//         ~LibCamera(){};

         

-        int initCamera();

-        void configureStill(int width, int height, PixelFormat format, int buffercount, int rotation);

-        int startCamera();

-        int resetCamera(int width, int height, PixelFormat format, int buffercount, int rotation);

-        bool readFrame(LibcameraOutData *frameData);

-        void returnFrameBuffer(LibcameraOutData frameData);

+//         int initCamera();

+//         void configureStill(int width, int height, PixelFormat format, int buffercount, int rotation);

+//         int startCamera();

+//         int resetCamera(int width, int height, PixelFormat format, int buffercount, int rotation);

+//         bool readFrame(LibcameraOutData *frameData);

+//         void returnFrameBuffer(LibcameraOutData frameData);

 

-        void set(ControlList controls);

-        void stopCamera();

-        void closeCamera();

+//         void set(ControlList controls);

+//         void stopCamera();

+//         void closeCamera();

 

-        Stream *VideoStream(uint32_t *w, uint32_t *h, uint32_t *stride) const;

-        char * getCameraId();

+//         Stream *VideoStream(uint32_t *w, uint32_t *h, uint32_t *stride) const;

+//         char * getCameraId();

 

-    private:

-        int startCapture();

-        int queueRequest(Request *request);

-        void requestComplete(Request *request);

-        void processRequest(Request *request);

+//     private:

+//         int startCapture();

+//         int queueRequest(Request *request);

+//         void requestComplete(Request *request);

+//         void processRequest(Request *request);

 

-        void StreamDimensions(Stream const *stream, uint32_t *w, uint32_t *h, uint32_t *stride) const;

+//         void StreamDimensions(Stream const *stream, uint32_t *w, uint32_t *h, uint32_t *stride) const;

 

-        unsigned int cameraIndex_;

-	    uint64_t last_;

-        std::unique_ptr<CameraManager> cm;

-        std::shared_ptr<Camera> camera_;

-        bool camera_acquired_ = false;

-        bool camera_started_ = false;

-	    std::unique_ptr<CameraConfiguration> config_;

-        std::unique_ptr<FrameBufferAllocator> allocator_;

-        std::vector<std::unique_ptr<Request>> requests_;

-        // std::map<std::string, Stream *> stream_;

-        std::map<int, std::pair<void *, unsigned int>> mappedBuffers_;

+//         unsigned int cameraIndex_;

+// 	    uint64_t last_;

+//         std::unique_ptr<CameraManager> cm;

+//         std::shared_ptr<Camera> camera_;

+//         bool camera_acquired_ = false;

+//         bool camera_started_ = false;

+// 	    std::unique_ptr<CameraConfiguration> config_;

+//         std::unique_ptr<FrameBufferAllocator> allocator_;

+//         std::vector<std::unique_ptr<Request>> requests_;

+//         // std::map<std::string, Stream *> stream_;

+//         std::map<int, std::pair<void *, unsigned int>> mappedBuffers_;

 

-        std::queue<Request *> requestQueue;

+//         std::queue<Request *> requestQueue;

 

-        ControlList controls_;

-        std::mutex control_mutex_;

-        std::mutex camera_stop_mutex_;

-        std::mutex free_requests_mutex_;

+//         ControlList controls_;

+//         std::mutex control_mutex_;

+//         std::mutex camera_stop_mutex_;

+//         std::mutex free_requests_mutex_;

 

-        Stream *viewfinder_stream_ = nullptr;

-        std::string cameraId;

-};
\ No newline at end of file
+//         Stream *viewfinder_stream_ = nullptr;

+//         std::string cameraId;

+// };