sort private functions (#38)

Author: aler9

camera.cpp

@@ -46,22 +46,6 @@ namespace controls = libcamera::controls;
 namespace formats = libcamera::formats;
 namespace properties = libcamera::properties;
 
-static const char *heap_positions[] = {
-    "/dev/dma_heap/vidbuf_cached",
-    "/dev/dma_heap/linux,cma",
-};
-
-// https://github.com/raspberrypi/rpicam-apps/blob/6de1ab6a899df35f929b2a15c0831780bd8e750e/core/dma_heaps.cpp
-static int create_dma_allocator() {
-    for (unsigned int i = 0; i < sizeof(heap_positions) / sizeof(const char *); i++) {
-        int fd = open(heap_positions[i], O_RDWR | O_CLOEXEC, 0);
-        if (fd >= 0) {
-            return fd;
-        }
-    }
-    return -1;
-}
-
 static char errbuf[256];
 
 static void set_error(const char *format, ...) {
@@ -74,6 +58,22 @@ const char *camera_get_error() {
     return errbuf;
 }
 
+// https://github.com/raspberrypi/rpicam-apps/blob/6de1ab6a899df35f929b2a15c0831780bd8e750e/core/dma_heaps.cpp
+static int create_dma_allocator() {
+    static const char *heap_positions[] = {
+        "/dev/dma_heap/vidbuf_cached",
+        "/dev/dma_heap/linux,cma",
+    };
+
+    for (unsigned int i = 0; i < sizeof(heap_positions) / sizeof(const char *); i++) {
+        int fd = open(heap_positions[i], O_RDWR | O_CLOEXEC, 0);
+        if (fd >= 0) {
+            return fd;
+        }
+    }
+    return -1;
+}
+
 // https://github.com/raspberrypi/libcamera-apps/blob/dd97618a25523c2c4aa58f87af5f23e49aa6069c/core/libcamera_app.cpp#L42
 static PixelFormat mode_to_pixel_format(sensor_mode_t *mode) {
     static std::vector<std::pair<std::pair<int, bool>, PixelFormat>> table = {
@@ -94,21 +94,6 @@ static PixelFormat mode_to_pixel_format(sensor_mode_t *mode) {
     return formats::SBGGR12_CSI2P;
 }
 
-struct CameraPriv {
-    const parameters_t *params;
-    camera_frame_cb frame_cb;
-    camera_error_cb error_cb;
-    std::unique_ptr<CameraManager> camera_manager;
-    std::shared_ptr<Camera> camera;
-    Stream *video_stream;
-    std::vector<std::unique_ptr<Request>> requests;
-    std::mutex ctrls_mutex;
-    std::unique_ptr<ControlList> ctrls;
-    std::vector<std::unique_ptr<FrameBuffer>> frame_buffers;
-    std::map<FrameBuffer *, uint8_t *> mapped_buffers;
-    bool in_error;
-};
-
 static int get_v4l2_colorspace(std::optional<ColorSpace> const &cs) {
     if (cs == ColorSpace::Rec709) {
         return V4L2_COLORSPACE_REC709;
@@ -133,6 +118,21 @@ static void set_hdr(bool hdr) {
     }
 }
 
+struct CameraPriv {
+    const parameters_t *params;
+    camera_frame_cb frame_cb;
+    camera_error_cb error_cb;
+    std::unique_ptr<CameraManager> camera_manager;
+    std::shared_ptr<Camera> camera;
+    Stream *video_stream;
+    std::vector<std::unique_ptr<Request>> requests;
+    std::mutex ctrls_mutex;
+    std::unique_ptr<ControlList> ctrls;
+    std::vector<std::unique_ptr<FrameBuffer>> frame_buffers;
+    std::map<FrameBuffer *, uint8_t *> mapped_buffers;
+    bool in_error;
+};
+
 bool camera_create(
     const parameters_t *params,
     camera_frame_cb frame_cb,

encoder.c

@@ -29,12 +29,6 @@ typedef void (*encode_cb)(void *enc, uint8_t *mapped_buffer, int buffer_fd, size
 
 typedef void (*reload_params_cb)(void *enc, const parameters_t *params);
 
-typedef struct {
-    void *implementation;
-    encode_cb encode;
-    reload_params_cb reload_params;
-} encoder_priv_t;
-
 static bool supports_hardware_h264() {
     int fd = open(ENCODER_HARD_H264_DEVICE, O_RDWR, 0);
     if (fd < 0) {
@@ -57,6 +51,12 @@ static bool supports_hardware_h264() {
     return false;
 }
 
+typedef struct {
+    void *implementation;
+    encode_cb encode;
+    reload_params_cb reload_params;
+} encoder_priv_t;
+
 bool encoder_create(const parameters_t *params, int stride, int colorspace, encoder_output_cb output_cb, encoder_t **enc) {
     *enc = malloc(sizeof(encoder_priv_t));
     encoder_priv_t *encp = (encoder_priv_t *)(*enc);