Merge branch 'commaai:master' into PA-dev2

Edison-CBS · Sep 22, 2024 · 2ed6fd0 · 2ed6fd0
2 parents 3524a89 + d5039bc
commit 2ed6fd0
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 4 deletions.
diff --git a/system/camerad/cameras/spectra.cc b/system/camerad/cameras/spectra.cc
@@ -711,8 +711,7 @@ void SpectraCamera::configISP() {
   LOGD("acquire isp dev");
 
   // config ISP
-  // TODO: unclear where this 15 comes from
-  alloc_w_mmu_hdl(m->video0_fd, 15*ALIGNED_SIZE(buf0_size, buf0_alignment), (uint32_t*)&buf0_handle, buf0_alignment,
+  alloc_w_mmu_hdl(m->video0_fd, FRAME_BUF_COUNT*ALIGNED_SIZE(buf0_size, buf0_alignment), (uint32_t*)&buf0_handle, buf0_alignment,
                   CAM_MEM_FLAG_HW_READ_WRITE | CAM_MEM_FLAG_KMD_ACCESS | CAM_MEM_FLAG_UMD_ACCESS | CAM_MEM_FLAG_CMD_BUF_TYPE,
                   m->device_iommu, m->cdm_iommu);
   config_isp(0, 0, 1, 0);

diff --git a/system/camerad/cameras/spectra.h b/system/camerad/cameras/spectra.h
@@ -1,6 +1,8 @@
 #pragma once
 
+#include <functional>
 #include <memory>
+#include <optional>
 #include <utility>
 
 #include "media/cam_req_mgr.h"

diff --git a/system/camerad/sensors/ar0231.cc b/system/camerad/sensors/ar0231.cc
@@ -1,4 +1,5 @@
 #include <cassert>
+#include <cmath>
 
 #include "common/swaglog.h"
 #include "system/camerad/sensors/sensor.h"

diff --git a/system/camerad/sensors/os04c10.cc b/system/camerad/sensors/os04c10.cc
@@ -1,3 +1,5 @@
+#include <cmath>
+
 #include "system/camerad/sensors/sensor.h"
 
 namespace {

diff --git a/system/camerad/sensors/ox03c10.cc b/system/camerad/sensors/ox03c10.cc
@@ -1,3 +1,5 @@
+#include <cmath>
+
 #include "system/camerad/sensors/sensor.h"
 
 namespace {

diff --git a/system/loggerd/encoderd.cc b/system/loggerd/encoderd.cc
@@ -59,7 +59,7 @@ void encoder_thread(EncoderdState *s, const LogCameraInfo &cam_info) {
 
     // init encoders
     if (encoders.empty()) {
-      VisionBuf buf_info = vipc_client.buffers[0];
+      const VisionBuf &buf_info = vipc_client.buffers[0];
       LOGW("encoder %s init %zux%zu", cam_info.thread_name, buf_info.width, buf_info.height);
       assert(buf_info.width > 0 && buf_info.height > 0);
 

diff --git a/system/loggerd/logger.cc b/system/loggerd/logger.cc
@@ -40,7 +40,7 @@ kj::Array<capnp::word> logger_build_init_data() {
   init.setOsVersion(util::read_file("/VERSION"));
 
   // log params
-  auto params = Params(util::getenv("PARAMS_COPY_PATH", ""));
+  Params params(util::getenv("PARAMS_COPY_PATH", ""));
   std::map<std::string, std::string> params_map = params.readAll();
 
   init.setGitCommit(params_map["GitCommit"]);