From e00b5337d2478342ec916202754a124e4c801957 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Fri, 21 Feb 2025 10:41:30 -0800
Subject: [PATCH] misc encoder cleanups

---
 system/loggerd/encoder/encoder.cc        | 1 -
 system/loggerd/encoder/encoder.h         | 2 +-
 system/loggerd/encoder/ffmpeg_encoder.cc | 2 +-
 system/loggerd/encoder/ffmpeg_encoder.h  | 2 +-
 system/loggerd/encoder/v4l_encoder.cc    | 2 +-
 system/loggerd/encoder/v4l_encoder.h     | 3 ++-
 system/loggerd/encoderd.cc               | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/system/loggerd/encoder/encoder.cc b/system/loggerd/encoder/encoder.cc
index 366a4b961e..b8f2f274d2 100644
--- a/system/loggerd/encoder/encoder.cc
+++ b/system/loggerd/encoder/encoder.cc
@@ -11,7 +11,6 @@ VideoEncoder::VideoEncoder(const EncoderInfo &encoder_info, int in_width, int in
 
 void VideoEncoder::publisher_publish(int segment_num, uint32_t idx, VisionIpcBufExtra &extra,
                                      unsigned int flags, kj::ArrayPtr<capnp::byte> header, kj::ArrayPtr<capnp::byte> dat) {
-  // broadcast packet
   MessageBuilder msg;
   auto event = msg.initEvent(true);
   auto edat = (event.*(encoder_info.init_encode_data_func))();
diff --git a/system/loggerd/encoder/encoder.h b/system/loggerd/encoder/encoder.h
index d94904f106..57146fafc3 100644
--- a/system/loggerd/encoder/encoder.h
+++ b/system/loggerd/encoder/encoder.h
@@ -24,7 +24,7 @@ public:
   VideoEncoder(const EncoderInfo &encoder_info, int in_width, int in_height);
   virtual ~VideoEncoder() {}
   virtual int encode_frame(VisionBuf* buf, VisionIpcBufExtra *extra) = 0;
-  virtual void encoder_open(const char* path) = 0;
+  virtual void encoder_open() = 0;
   virtual void encoder_close() = 0;
 
   void publisher_publish(int segment_num, uint32_t idx, VisionIpcBufExtra &extra, unsigned int flags, kj::ArrayPtr<capnp::byte> header, kj::ArrayPtr<capnp::byte> dat);
diff --git a/system/loggerd/encoder/ffmpeg_encoder.cc b/system/loggerd/encoder/ffmpeg_encoder.cc
index 02d5574225..4e6946363f 100644
--- a/system/loggerd/encoder/ffmpeg_encoder.cc
+++ b/system/loggerd/encoder/ffmpeg_encoder.cc
@@ -47,7 +47,7 @@ FfmpegEncoder::~FfmpegEncoder() {
   av_frame_free(&frame);
 }
 
-void FfmpegEncoder::encoder_open(const char* path) {
+void FfmpegEncoder::encoder_open() {
   auto codec_id = encoder_info.encode_type == cereal::EncodeIndex::Type::QCAMERA_H264
                       ? AV_CODEC_ID_H264
                       : AV_CODEC_ID_FFVHUFF;
diff --git a/system/loggerd/encoder/ffmpeg_encoder.h b/system/loggerd/encoder/ffmpeg_encoder.h
index 9e45a3d82d..cd5ac1e13a 100644
--- a/system/loggerd/encoder/ffmpeg_encoder.h
+++ b/system/loggerd/encoder/ffmpeg_encoder.h
@@ -19,7 +19,7 @@ public:
   FfmpegEncoder(const EncoderInfo &encoder_info, int in_width, int in_height);
   ~FfmpegEncoder();
   int encode_frame(VisionBuf* buf, VisionIpcBufExtra *extra);
-  void encoder_open(const char* path);
+  void encoder_open();
   void encoder_close();
 
 private:
diff --git a/system/loggerd/encoder/v4l_encoder.cc b/system/loggerd/encoder/v4l_encoder.cc
index a4697af27b..8bfca12301 100644
--- a/system/loggerd/encoder/v4l_encoder.cc
+++ b/system/loggerd/encoder/v4l_encoder.cc
@@ -275,7 +275,7 @@ V4LEncoder::V4LEncoder(const EncoderInfo &encoder_info, int in_width, int in_hei
   }
 }
 
-void V4LEncoder::encoder_open(const char* path) {
+void V4LEncoder::encoder_open() {
   dequeue_handler_thread = std::thread(V4LEncoder::dequeue_handler, this);
   this->is_open = true;
   this->counter = 0;
diff --git a/system/loggerd/encoder/v4l_encoder.h b/system/loggerd/encoder/v4l_encoder.h
index 9336bf3d8b..58011d60e1 100644
--- a/system/loggerd/encoder/v4l_encoder.h
+++ b/system/loggerd/encoder/v4l_encoder.h
@@ -11,8 +11,9 @@ public:
   V4LEncoder(const EncoderInfo &encoder_info, int in_width, int in_height);
   ~V4LEncoder();
   int encode_frame(VisionBuf* buf, VisionIpcBufExtra *extra);
-  void encoder_open(const char* path);
+  void encoder_open();
   void encoder_close();
+
 private:
   int fd;
 
diff --git a/system/loggerd/encoderd.cc b/system/loggerd/encoderd.cc
index c777e6eb7a..3237d13074 100644
--- a/system/loggerd/encoderd.cc
+++ b/system/loggerd/encoderd.cc
@@ -68,7 +68,7 @@ void encoder_thread(EncoderdState *s, const LogCameraInfo &cam_info) {
 
       for (const auto &encoder_info : cam_info.encoder_infos) {
         auto &e = encoders.emplace_back(new Encoder(encoder_info, buf_info.width, buf_info.height));
-        e->encoder_open(nullptr);
+        e->encoder_open();
       }
 
       // Only one thumbnail can be generated per camera stream
@@ -103,7 +103,7 @@ void encoder_thread(EncoderdState *s, const LogCameraInfo &cam_info) {
       if (cur_seg >= 0 && extra.frame_id >= ((cur_seg + 1) * frames_per_seg) + s->start_frame_id) {
         for (auto &e : encoders) {
           e->encoder_close();
-          e->encoder_open(NULL);
+          e->encoder_open();
         }
         ++cur_seg;
       }