loggerd: remove 'enable' from struct LogCameraInfo (#25052)

remove enalbe
old-commit-hash: 568cc0f892d650bd5906b59e1ab169158a7a6bf7
This commit is contained in:
Dean Lee
2022-07-08 01:54:56 +08:00
committed by GitHub
parent 733cacdd8f
commit e9f2954ee5
3 changed files with 4 additions and 13 deletions
+2 -4
View File
@@ -124,10 +124,8 @@ void encoderd_thread() {
std::vector<std::thread> encoder_threads;
for (const auto &cam : cameras_logged) {
if (cam.enable) {
encoder_threads.push_back(std::thread(encoder_thread, &s, cam));
s.max_waiting++;
}
encoder_threads.push_back(std::thread(encoder_thread, &s, cam));
s.max_waiting++;
}
for (auto &t : encoder_threads) t.join();
}
+2 -4
View File
@@ -204,10 +204,8 @@ void loggerd_thread() {
// init encoders
s.last_camera_seen_tms = millis_since_boot();
for (const auto &cam : cameras_logged) {
if (cam.enable) {
s.max_waiting++;
if (cam.has_qcamera) { s.max_waiting++; }
}
s.max_waiting++;
if (cam.has_qcamera) { s.max_waiting++; }
}
uint64_t msg_count = 0, bytes_count = 0;
-5
View File
@@ -50,7 +50,6 @@ struct LogCameraInfo {
int bitrate;
bool is_h265;
bool has_qcamera;
bool enable;
bool record;
};
@@ -63,7 +62,6 @@ const LogCameraInfo cameras_logged[] = {
.bitrate = MAIN_BITRATE,
.is_h265 = true,
.has_qcamera = true,
.enable = true,
.record = true,
.frame_width = 1928,
.frame_height = 1208,
@@ -76,7 +74,6 @@ const LogCameraInfo cameras_logged[] = {
.bitrate = DCAM_BITRATE,
.is_h265 = true,
.has_qcamera = false,
.enable = true,
.record = Params().getBool("RecordFront"),
.frame_width = 1928,
.frame_height = 1208,
@@ -89,7 +86,6 @@ const LogCameraInfo cameras_logged[] = {
.bitrate = MAIN_BITRATE,
.is_h265 = true,
.has_qcamera = false,
.enable = true,
.record = true,
.frame_width = 1928,
.frame_height = 1208,
@@ -100,7 +96,6 @@ const LogCameraInfo qcam_info = {
.fps = MAIN_FPS,
.bitrate = 256000,
.is_h265 = false,
.enable = true,
.record = true,
.frame_width = 526,
.frame_height = 330,