Revert "store mic audio with toggle (commaai#35595)"

programanichiro · programanichiro · commit 21c3489f1312 · 2025-07-01T16:15:26.000+09:00
This reverts commit dcd56ae.
diff --git a/README.md b/README.md
@@ -103,7 +103,7 @@ By default, openpilot uploads the driving data to our servers. You can also acce
 openpilot is open source software: the user is free to disable data collection if they wish to do so.
 
 openpilot logs the road-facing cameras, CAN, GPS, IMU, magnetometer, thermal sensors, crashes, and operating system logs.
-The driver-facing camera and microphone are only logged if you explicitly opt-in in settings.
+The driver-facing camera is only logged if you explicitly opt-in in settings. The microphone is not recorded.
 
 By using openpilot, you agree to [our Privacy Policy](https://comma.ai/privacy). You understand that use of this software or its related services will generate certain types of user data, which may be logged and stored at the sole discretion of comma. By accepting this agreement, you grant an irrevocable, perpetual, worldwide right to comma for the use of this data.
 </details>
diff --git a/cereal/log.capnp b/cereal/log.capnp
@@ -2470,7 +2470,7 @@ struct DebugAlert {
 struct UserFlag {
 }
 
-struct SoundPressure @0xdc24138990726023 {
+struct Microphone {
   soundPressure @0 :Float32;
 
   # uncalibrated, A-weighted
@@ -2480,11 +2480,6 @@ struct SoundPressure @0xdc24138990726023 {
   filteredSoundPressureWeightedDbDEPRECATED @2 :Float32;
 }
 
-struct AudioData {
-  data @0 :Data;
-  sampleRate @1 :UInt32;
-}
-
 struct Touch {
   sec @0 :Int64;
   usec @1 :Int64;
@@ -2562,8 +2557,7 @@ struct Event {
     livestreamDriverEncodeIdx @119 :EncodeIndex;
 
     # microphone data
-    soundPressure @103 :SoundPressure;
-    rawAudioData @147 :AudioData;
+    microphone @103 :Microphone;
 
     # systems stuff
     androidLog @20 :AndroidLogEntry;
diff --git a/cereal/services.py b/cereal/services.py
@@ -73,8 +73,7 @@ def __init__(self, should_log: bool, frequency: float, decimation: Optional[int]
   "navThumbnail": (True, 0.),
   "qRoadEncodeIdx": (False, 20.),
   "userFlag": (True, 0., 1),
-  "soundPressure": (True, 10., 10),
-  "rawAudioData": (False, 20.),
+  "microphone": (True, 10., 10),
 
   # debug
   "uiDebug": (True, 0., 1),
diff --git a/common/params_keys.h b/common/params_keys.h
@@ -99,7 +99,6 @@ inline static std::unordered_map<std::string, uint32_t> keys = {
     {"PandaSomResetTriggered", CLEAR_ON_MANAGER_START | CLEAR_ON_OFFROAD_TRANSITION},
     {"PandaSignatures", CLEAR_ON_MANAGER_START},
     {"PrimeType", PERSISTENT},
-    {"RecordAudio", PERSISTENT},
     {"RecordFront", PERSISTENT},
     {"RecordFrontLock", PERSISTENT},  // for the internal fleet
     {"SecOCKey", PERSISTENT | DONT_LOG},
diff --git a/selfdrive/assets/icons/microphone.png b/selfdrive/assets/icons/microphone.png
diff --git a/selfdrive/ui/layouts/settings/toggles.py b/selfdrive/ui/layouts/settings/toggles.py
@@ -22,7 +22,6 @@
   "AlwaysOnDM": "Enable driver monitoring even when openpilot is not engaged.",
   'RecordFront': "Upload data from the driver facing camera and help improve the driver monitoring algorithm.",
   "IsMetric": "Display speed in km/h instead of mph.",
-  "RecordAudio": "Record and store microphone audio while driving. The audio will be included in the dashcam video in comma connect.",
 }
 
 
@@ -78,12 +77,6 @@ def __init__(self):
       toggle_item(
         "Use Metric System", DESCRIPTIONS["IsMetric"], self._params.get_bool("IsMetric"), icon="monitoring.png"
       ),
-      toggle_item(
-        "Record Microphone Audio",
-        DESCRIPTIONS["RecordAudio"],
-        self._params.get_bool("RecordAudio"),
-        icon="microphone.png",
-      ),
     ]
 
     self._scroller = Scroller(items, line_separator=True, spacing=0)
diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc
@@ -68,13 +68,6 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) {
       "../assets/icons/metric.png",
       false,
     },
-    {
-      "RecordAudio",
-      tr("Record Microphone Audio"),
-      tr("Record and store microphone audio while driving. The audio will be included in the dashcam video in comma connect."),
-      "../assets/icons/microphone.png",
-      true,
-    },
   };
 
 
diff --git a/selfdrive/ui/qt/sidebar.cc b/selfdrive/ui/qt/sidebar.cc
@@ -24,11 +24,10 @@ void Sidebar::drawMetric(QPainter &p, const QPair<QString, QString> &label, QCol
   p.drawText(rect.adjusted(22, 0, 0, 0), Qt::AlignCenter, label.first + "\n" + label.second);
 }
 
-Sidebar::Sidebar(QWidget *parent) : QFrame(parent), onroad(false), flag_pressed(false), settings_pressed(false), mic_indicator_pressed(false) {
+Sidebar::Sidebar(QWidget *parent) : QFrame(parent), onroad(false), flag_pressed(false), settings_pressed(false) {
   home_img = loadPixmap("../assets/images/button_home.png", home_btn.size());
   flag_img = loadPixmap("../assets/images/button_flag.png", home_btn.size());
   settings_img = loadPixmap("../assets/images/button_settings.png", settings_btn.size(), Qt::IgnoreAspectRatio);
-  mic_img = loadPixmap("../assets/icons/microphone.png", QSize(30, 30));
 
   connect(this, &Sidebar::valueChanged, [=] { update(); });
 
@@ -48,15 +47,12 @@ void Sidebar::mousePressEvent(QMouseEvent *event) {
   } else if (settings_btn.contains(event->pos())) {
     settings_pressed = true;
     update();
-  } else if (recording_audio && mic_indicator_btn.contains(event->pos())) {
-    mic_indicator_pressed = true;
-    update();
   }
 }
 
 void Sidebar::mouseReleaseEvent(QMouseEvent *event) {
-  if (flag_pressed || settings_pressed || mic_indicator_pressed) {
-    flag_pressed = settings_pressed = mic_indicator_pressed = false;
+  if (flag_pressed || settings_pressed) {
+    flag_pressed = settings_pressed = false;
     update();
   }
   if (onroad && home_btn.contains(event->pos())) {
@@ -65,8 +61,6 @@ void Sidebar::mouseReleaseEvent(QMouseEvent *event) {
     pm->send("userFlag", msg);
   } else if (settings_btn.contains(event->pos())) {
     emit openSettings();
-  } else if (recording_audio && mic_indicator_btn.contains(event->pos())) {
-    emit openSettings(2, "RecordAudio");
   }
 }
 
@@ -112,8 +106,6 @@ void Sidebar::updateState(const UIState &s) {
     pandaStatus = {{tr("NO"), tr("PANDA")}, danger_color};
   }
   setProperty("pandaStatus", QVariant::fromValue(pandaStatus));
-
-  setProperty("recordingAudio", s.scene.recording_audio);
 }
 
 void Sidebar::paintEvent(QPaintEvent *event) {
@@ -128,14 +120,6 @@ void Sidebar::paintEvent(QPaintEvent *event) {
   p.drawPixmap(settings_btn.x(), settings_btn.y(), settings_img);
   p.setOpacity(onroad && flag_pressed ? 0.65 : 1.0);
   p.drawPixmap(home_btn.x(), home_btn.y(), onroad ? flag_img : home_img);
-  if (recording_audio) {
-    p.setBrush(danger_color);
-    p.setOpacity(mic_indicator_pressed ? 0.65 : 1.0);
-    p.drawRoundedRect(mic_indicator_btn, mic_indicator_btn.height() / 2, mic_indicator_btn.height() / 2);
-    int icon_x = mic_indicator_btn.x() + (mic_indicator_btn.width() - mic_img.width()) / 2;
-    int icon_y = mic_indicator_btn.y() + (mic_indicator_btn.height() - mic_img.height()) / 2;
-    p.drawPixmap(icon_x, icon_y, mic_img);
-  }
   p.setOpacity(1.0);
 
   // network
diff --git a/selfdrive/ui/qt/sidebar.h b/selfdrive/ui/qt/sidebar.h
@@ -18,7 +18,6 @@ class Sidebar : public QFrame {
   Q_PROPERTY(ItemStatus tempStatus MEMBER temp_status NOTIFY valueChanged);
   Q_PROPERTY(QString netType MEMBER net_type NOTIFY valueChanged);
   Q_PROPERTY(int netStrength MEMBER net_strength NOTIFY valueChanged);
-  Q_PROPERTY(bool recordingAudio MEMBER recording_audio NOTIFY valueChanged);
 
 public:
   explicit Sidebar(QWidget* parent = 0);
@@ -37,8 +36,8 @@ public slots:
   void mouseReleaseEvent(QMouseEvent *event) override;
   void drawMetric(QPainter &p, const QPair<QString, QString> &label, QColor c, int y);
 
-  QPixmap home_img, flag_img, settings_img, mic_img;
-  bool onroad, recording_audio, flag_pressed, settings_pressed, mic_indicator_pressed;
+  QPixmap home_img, flag_img, settings_img;
+  bool onroad, flag_pressed, settings_pressed;
   const QMap<cereal::DeviceState::NetworkType, QString> network_type = {
     {cereal::DeviceState::NetworkType::NONE, tr("--")},
     {cereal::DeviceState::NetworkType::WIFI, tr("Wi-Fi")},
@@ -51,7 +50,6 @@ public slots:
 
   const QRect home_btn = QRect(60, 860, 180, 180);
   const QRect settings_btn = QRect(50, 35, 200, 117);
-  const QRect mic_indicator_btn = QRect(158, 252, 75, 40);
   const QColor good_color = QColor(255, 255, 255);
   const QColor warning_color = QColor(218, 202, 37);
   const QColor danger_color = QColor(201, 34, 49);
diff --git a/selfdrive/ui/soundd.py b/selfdrive/ui/soundd.py
@@ -135,7 +135,7 @@ def soundd_thread(self):
     # sounddevice must be imported after forking processes
     import sounddevice as sd
 
-    sm = messaging.SubMaster(['selfdriveState', 'soundPressure'])
+    sm = messaging.SubMaster(['selfdriveState', 'microphone'])
 
     with self.get_stream(sd) as stream:
       rk = Ratekeeper(20)
@@ -144,8 +144,8 @@ def soundd_thread(self):
       while True:
         sm.update(0)
 
-        if sm.updated['soundPressure'] and self.current_alert == AudibleAlert.none: # only update volume filter when not playing alert
-          self.spl_filter_weighted.update(sm["soundPressure"].soundPressureWeightedDb)
+        if sm.updated['microphone'] and self.current_alert == AudibleAlert.none: # only update volume filter when not playing alert
+          self.spl_filter_weighted.update(sm["microphone"].soundPressureWeightedDb)
           self.current_volume = self.calculate_volume(float(self.spl_filter_weighted.x))
 
         self.get_audible_alert(sm)
diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc
@@ -60,9 +60,6 @@ static void update_state(UIState *s) {
     scene.light_sensor = -1;
   }
   scene.started = sm["deviceState"].getDeviceState().getStarted() && scene.ignition;
-
-  auto params = Params();
-  scene.recording_audio = params.getBool("RecordAudio") && scene.started;
 }
 
 void ui_update_params(UIState *s) {
diff --git a/selfdrive/ui/ui.h b/selfdrive/ui/ui.h
@@ -58,7 +58,7 @@ typedef struct UIScene {
   cereal::LongitudinalPersonality personality;
 
   float light_sensor = -1;
-  bool started, ignition, is_metric, recording_audio;
+  bool started, ignition, is_metric;
   uint64_t started_frame;
 } UIScene;
 
diff --git a/system/loggerd/loggerd.cc b/system/loggerd/loggerd.cc
@@ -226,21 +226,19 @@ void loggerd_thread() {
   for (const auto& [_, it] : services) {
     const bool encoder = util::ends_with(it.name, "EncodeData");
     const bool livestream_encoder = util::starts_with(it.name, "livestream");
-    const bool record_audio = (it.name == "rawAudioData") && Params().getBool("RecordAudio");
-    if (it.should_log || (encoder && !livestream_encoder) || record_audio) {
-      LOGD("logging %s", it.name.c_str());
-
-      SubSocket * sock = SubSocket::create(ctx.get(), it.name);
-      assert(sock != NULL);
-      poller->registerSocket(sock);
-      service_state[sock] = {
-        .name = it.name,
-        .counter = 0,
-        .freq = it.decimation,
-        .encoder = encoder,
-        .user_flag = it.name == "userFlag",
-      };
-    }
+    if (!it.should_log && (!encoder || livestream_encoder)) continue;
+    LOGD("logging %s", it.name.c_str());
+
+    SubSocket * sock = SubSocket::create(ctx.get(), it.name);
+    assert(sock != NULL);
+    poller->registerSocket(sock);
+    service_state[sock] = {
+      .name = it.name,
+      .counter = 0,
+      .freq = it.decimation,
+      .encoder = encoder,
+      .user_flag = it.name == "userFlag",
+    };
   }
 
   LoggerdState s;
diff --git a/system/micd.py b/system/micd.py
@@ -9,10 +9,10 @@
 from openpilot.common.swaglog import cloudlog
 
 RATE = 10
-FFT_SAMPLES = 1600 # 100ms
+FFT_SAMPLES = 4096
 REFERENCE_SPL = 2e-5  # newtons/m^2
-SAMPLE_RATE = 16000
-SAMPLE_BUFFER = 800  # 50ms
+SAMPLE_RATE = 44100
+SAMPLE_BUFFER = 4096  # approx 100ms
 
 
 @cache
@@ -45,7 +45,7 @@ def apply_a_weighting(measurements: np.ndarray) -> np.ndarray:
 class Mic:
   def __init__(self):
     self.rk = Ratekeeper(RATE)
-    self.pm = messaging.PubMaster(['soundPressure', 'rawAudioData'])
+    self.pm = messaging.PubMaster(['microphone'])
 
     self.measurements = np.empty(0)
 
@@ -61,12 +61,12 @@ def update(self):
       sound_pressure_weighted = self.sound_pressure_weighted
       sound_pressure_level_weighted = self.sound_pressure_level_weighted
 
-    msg = messaging.new_message('soundPressure', valid=True)
-    msg.soundPressure.soundPressure = float(sound_pressure)
-    msg.soundPressure.soundPressureWeighted = float(sound_pressure_weighted)
-    msg.soundPressure.soundPressureWeightedDb = float(sound_pressure_level_weighted)
+    msg = messaging.new_message('microphone', valid=True)
+    msg.microphone.soundPressure = float(sound_pressure)
+    msg.microphone.soundPressureWeighted = float(sound_pressure_weighted)
+    msg.microphone.soundPressureWeightedDb = float(sound_pressure_level_weighted)
 
-    self.pm.send('soundPressure', msg)
+    self.pm.send('microphone', msg)
     self.rk.keep_time()
 
   def callback(self, indata, frames, time, status):
@@ -76,12 +76,6 @@ def callback(self, indata, frames, time, status):
 
     Logged A-weighted equivalents are rough approximations of the human-perceived loudness.
     """
-    msg = messaging.new_message('rawAudioData', valid=True)
-    audio_data_int_16 = (indata[:, 0] * 32767).astype(np.int16)
-    msg.rawAudioData.data = audio_data_int_16.tobytes()
-    msg.rawAudioData.sampleRate = SAMPLE_RATE
-    self.pm.send('rawAudioData', msg)
-
     with self.lock:
       self.measurements = np.concatenate((self.measurements, indata[:, 0]))
 
diff --git a/tools/scripts/extract_audio.py b/tools/scripts/extract_audio.py
