Remove references to stream_audio.
This binary only worked with qemu/vsoc.
Bug: 144111429
Test: Run launch_cvd -vm_manager=qemu_cli
Change-Id: I7c6bc9727be7834db47dc98a0d91831b6e9b089b
diff --git a/host/commands/assemble_cvd/flags.cc b/host/commands/assemble_cvd/flags.cc
index 5ae5a91..989c4fb 100644
--- a/host/commands/assemble_cvd/flags.cc
+++ b/host/commands/assemble_cvd/flags.cc
@@ -113,11 +113,6 @@
DEFINE_string(vnc_server_binary,
vsoc::DefaultHostArtifactsPath("bin/vnc_server"),
"Location of the vnc server binary.");
-DEFINE_bool(start_stream_audio, false,
- "Whether to start the stream audio process.");
-DEFINE_string(stream_audio_binary,
- vsoc::DefaultHostArtifactsPath("bin/stream_audio"),
- "Location of the stream_audio binary.");
DEFINE_string(virtual_usb_manager_binary,
vsoc::DefaultHostArtifactsPath("bin/virtual_usb_manager"),
"Location of the virtual usb manager binary.");
@@ -129,8 +124,6 @@
"Location of the ivshmem server binary.");
DEFINE_int32(vnc_server_port, GetPerInstanceDefault(6444),
"The port on which the vnc server should listen");
-DEFINE_int32(stream_audio_port, GetPerInstanceDefault(7444),
- "The port on which stream_audio should listen.");
DEFINE_string(socket_forward_proxy_binary,
vsoc::DefaultHostArtifactsPath("bin/socket_forward_proxy"),
"Location of the socket_forward_proxy binary.");
@@ -487,10 +480,6 @@
tmp_config_obj.set_vnc_server_binary(FLAGS_vnc_server_binary);
tmp_config_obj.set_vnc_server_port(FLAGS_vnc_server_port);
- tmp_config_obj.set_enable_stream_audio(FLAGS_start_stream_audio);
- tmp_config_obj.set_stream_audio_binary(FLAGS_stream_audio_binary);
- tmp_config_obj.set_stream_audio_port(FLAGS_stream_audio_port);
-
tmp_config_obj.set_restart_subprocesses(FLAGS_restart_subprocesses);
tmp_config_obj.set_run_adb_connector(FLAGS_run_adb_connector);
tmp_config_obj.set_adb_connector_binary(FLAGS_adb_connector_binary);
diff --git a/host/commands/run_cvd/launch.cc b/host/commands/run_cvd/launch.cc
index 2ce9ac0..dae835a 100644
--- a/host/commands/run_cvd/launch.cc
+++ b/host/commands/run_cvd/launch.cc
@@ -267,17 +267,6 @@
return false;
}
-void LaunchStreamAudioIfEnabled(const vsoc::CuttlefishConfig& config,
- cvd::ProcessMonitor* process_monitor,
- std::function<bool(MonitorEntry*)> callback) {
- if (config.enable_stream_audio()) {
- auto port_options = "-port=" + std::to_string(config.stream_audio_port());
- cvd::Command stream_audio(config.stream_audio_binary());
- stream_audio.AddParameter(port_options);
- process_monitor->StartSubprocess(std::move(stream_audio), callback);
- }
-}
-
void LaunchAdbConnectorIfEnabled(cvd::ProcessMonitor* process_monitor,
const vsoc::CuttlefishConfig& config,
cvd::SharedFD adbd_events_pipe) {
diff --git a/host/commands/run_cvd/launch.h b/host/commands/run_cvd/launch.h
index 23fccc7..4db6e12 100644
--- a/host/commands/run_cvd/launch.h
+++ b/host/commands/run_cvd/launch.h
@@ -19,9 +19,6 @@
bool LaunchVNCServerIfEnabled(const vsoc::CuttlefishConfig& config,
cvd::ProcessMonitor* process_monitor,
std::function<bool(cvd::MonitorEntry*)> callback);
-void LaunchStreamAudioIfEnabled(const vsoc::CuttlefishConfig& config,
- cvd::ProcessMonitor* process_monitor,
- std::function<bool(cvd::MonitorEntry*)> callback);
void LaunchAdbConnectorIfEnabled(cvd::ProcessMonitor* process_monitor,
const vsoc::CuttlefishConfig& config,
cvd::SharedFD adbd_events_pipe);
diff --git a/host/commands/run_cvd/main.cc b/host/commands/run_cvd/main.cc
index b9e0c67..a3c458f 100644
--- a/host/commands/run_cvd/main.cc
+++ b/host/commands/run_cvd/main.cc
@@ -472,8 +472,6 @@
// Start other host processes
LaunchSocketVsockProxyIfEnabled(&process_monitor, *config);
- LaunchStreamAudioIfEnabled(*config, &process_monitor,
- GetOnSubprocessExitCallback(*config));
LaunchAdbConnectorIfEnabled(&process_monitor, *config, adbd_events_pipe);
ServerLoop(launcher_monitor_socket, &process_monitor); // Should not return
diff --git a/host/libs/config/cuttlefish_config.cpp b/host/libs/config/cuttlefish_config.cpp
index ab0a9b6..6f66fb3 100644
--- a/host/libs/config/cuttlefish_config.cpp
+++ b/host/libs/config/cuttlefish_config.cpp
@@ -134,10 +134,6 @@
const char* kVncServerBinary = "vnc_server_binary";
const char* kVncServerPort = "vnc_server_port";
-const char* kEnableStreamAudio = "enable_stream_audio";
-const char* kStreamAudioBinary = "stream_audio_binary";
-const char* kStreamAudioPort = "stream_audio_port";
-
const char* kRestartSubprocesses = "restart_subprocesses";
const char* kRunAdbConnector = "run_adb_connector";
const char* kAdbConnectorBinary = "adb_connector_binary";
@@ -705,31 +701,6 @@
(*dictionary_)[kVncServerPort] = vnc_server_port;
}
-bool CuttlefishConfig::enable_stream_audio() const {
- return (*dictionary_)[kEnableStreamAudio].asBool();
-}
-
-void CuttlefishConfig::set_enable_stream_audio(bool enable_stream_audio) {
- (*dictionary_)[kEnableStreamAudio] = enable_stream_audio;
-}
-
-std::string CuttlefishConfig::stream_audio_binary() const {
- return (*dictionary_)[kStreamAudioBinary].asString();
-}
-
-void CuttlefishConfig::set_stream_audio_binary(
- const std::string& stream_audio_binary) {
- (*dictionary_)[kStreamAudioBinary] = stream_audio_binary;
-}
-
-int CuttlefishConfig::stream_audio_port() const {
- return (*dictionary_)[kStreamAudioPort].asInt();
-}
-
-void CuttlefishConfig::set_stream_audio_port(int stream_audio_port) {
- (*dictionary_)[kStreamAudioPort] = stream_audio_port;
-}
-
bool CuttlefishConfig::restart_subprocesses() const {
return (*dictionary_)[kRestartSubprocesses].asBool();
}
diff --git a/host/libs/config/cuttlefish_config.h b/host/libs/config/cuttlefish_config.h
index ad59df0..4ec49e7 100644
--- a/host/libs/config/cuttlefish_config.h
+++ b/host/libs/config/cuttlefish_config.h
@@ -275,15 +275,6 @@
void set_vnc_server_binary(const std::string& vnc_server_binary);
std::string vnc_server_binary() const;
- void set_enable_stream_audio(bool enable_stream_audio);
- bool enable_stream_audio() const;
-
- void set_stream_audio_port(int stream_audio_port);
- int stream_audio_port() const;
-
- void set_stream_audio_binary(const std::string& stream_audio_binary);
- std::string stream_audio_binary() const;
-
void set_restart_subprocesses(bool restart_subprocesses);
bool restart_subprocesses() const;
