Skip to content

Display and control your Android device

Add more audio sources

Romain Vimontbef2d8473b34
diff --git a/app/data/bash-completion/scrcpy b/app/data/bash-completion/scrcpy
index 8d149f97..9918918c 100644
--- a/app/data/bash-completion/scrcpy
+++ b/app/data/bash-completion/scrcpy
@@ -122,7 +122,7 @@ _scrcpy() {
return
;;
--audio-source)
- COMPREPLY=($(compgen -W 'output mic playback' -- "$cur"))
+ COMPREPLY=($(compgen -W 'output playback mic mic-unprocessed mic-camcorder mic-voice-recognition mic-voice-communication voice-call voice-call-uplink voice-call-downlink voice-performance' -- "$cur"))
return
;;
--camera-facing)
diff --git a/app/data/zsh-completion/_scrcpy b/app/data/zsh-completion/_scrcpy
index cccfcc6a..450fc8f5 100644
--- a/app/data/zsh-completion/_scrcpy
+++ b/app/data/zsh-completion/_scrcpy
@@ -16,7 +16,7 @@ arguments=(
'--audio-codec-options=[Set a list of comma-separated key\:type=value options for the device audio encoder]'
'--audio-dup=[Duplicate audio]'
'--audio-encoder=[Use a specific MediaCodec audio encoder]'
- '--audio-source=[Select the audio source]:source:(output mic playback)'
+ '--audio-source=[Select the audio source]:source:(output playback mic mic-unprocessed mic-camcorder mic-voice-recognition mic-voice-communication voice-call voice-call-uplink voice-call-downlink voice-performance)'
'--audio-output-buffer=[Configure the size of the SDL audio output buffer (in milliseconds)]'
{-b,--video-bit-rate=}'[Encode the video at the given bit-rate]'
'--camera-ar=[Select the camera size by its aspect ratio]'
diff --git a/app/scrcpy.1 b/app/scrcpy.1
index 5eea94f4..ffb66ab9 100644
--- a/app/scrcpy.1
+++ b/app/scrcpy.1
@@ -67,13 +67,19 @@ The available encoders can be listed by \fB\-\-list\-encoders\fR.
.TP
.BI "\-\-audio\-source " source
-Select the audio source (output, mic or playback).
-
-The "output" source forwards the whole audio output, and disables playback on the device.
-
-The "playback" source captures the audio playback (Android apps can opt-out, so the whole output is not necessarily captured).
-
-The "mic" source captures the microphone.
+Select the audio source. Possible values are:
+
+ - "output": forwards the whole audio output, and disables playback on the device.
+ - "playback": captures the audio playback (Android apps can opt-out, so the whole output is not necessarily captured).
+ - "mic": captures the microphone.
+ - "mic-unprocessed": captures the microphone unprocessed (raw) sound.
+ - "mic-camcorder": captures the microphone tuned for video recording, with the same orientation as the camera if available.
+ - "mic-voice-recognition": captures the microphone tuned for voice recognition.
+ - "mic-voice-communication": captures the microphone tuned for voice communications (it will for instance take advantage of echo cancellation or automatic gain control if available).
+ - "voice-call": captures voice call.
+ - "voice-call-uplink": captures voice call uplink only.
+ - "voice-call-downlink": captures voice call downlink only.
+ - "voice-performance": captures audio meant to be processed for live performance (karaoke), includes both the microphone and the device playback.
Default is output.
diff --git a/app/src/cli.c b/app/src/cli.c
index b83fc9ec..b2e3e30a 100644
--- a/app/src/cli.c
+++ b/app/src/cli.c
@@ -217,13 +217,31 @@ static const struct sc_option options[] = {
.longopt_id = OPT_AUDIO_SOURCE,
.longopt = "audio-source",
.argdesc = "source",
- .text = "Select the audio source (output, mic or playback).\n"
- "The \"output\" source forwards the whole audio output, and "
- "disables playback on the device.\n"
- "The \"playback\" source captures the audio playback (Android "
- "apps can opt-out, so the whole output is not necessarily "
+ .text = "Select the audio source. Possible values are:\n"
+ " - \"output\": forwards the whole audio output, and disables "
+ "playback on the device.\n"
+ " - \"playback\": captures the audio playback (Android apps "
+ "can opt-out, so the whole output is not necessarily "
"captured).\n"
- "The \"mic\" source captures the microphone.\n"
+ " - \"mic\": captures the microphone.\n"
+ " - \"mic-unprocessed\": captures the microphone unprocessed "
+ "(raw) sound.\n"
+ " - \"mic-camcorder\": captures the microphone tuned for video "
+ "recording, with the same orientation as the camera if "
+ "available.\n"
+ " - \"mic-voice-recognition\": captures the microphone tuned "
+ "for voice recognition.\n"
+ " - \"mic-voice-communication\": captures the microphone tuned "
+ "for voice communications (it will for instance take advantage "
+ "of echo cancellation or automatic gain control if "
+ "available).\n"
+ " - \"voice-call\": captures voice call.\n"
+ " - \"voice-call-uplink\": captures voice call uplink only.\n"
+ " - \"voice-call-downlink\": captures voice call downlink "
+ "only.\n"
+ " - \"voice-performance\": captures audio meant to be "
+ "processed for live performance (karaoke), includes both the "
+ "microphone and the device playback.\n"
"Default is output.",
},
{
@@ -2036,8 +2054,50 @@ parse_audio_source(const char *optarg, enum sc_audio_source *source) {
return true;
}
- LOGE("Unsupported audio source: %s (expected output, mic or playback)",
- optarg);
+ if (!strcmp(optarg, "mic-unprocessed")) {
+ *source = SC_AUDIO_SOURCE_MIC_UNPROCESSED;
+ return true;
+ }
+
+ if (!strcmp(optarg, "mic-camcorder")) {
+ *source = SC_AUDIO_SOURCE_MIC_CAMCORDER;
+ return true;
+ }
+
+ if (!strcmp(optarg, "mic-voice-recognition")) {
+ *source = SC_AUDIO_SOURCE_MIC_VOICE_RECOGNITION;
+ return true;
+ }
+
+ if (!strcmp(optarg, "mic-voice-communication")) {
+ *source = SC_AUDIO_SOURCE_MIC_VOICE_COMMUNICATION;
+ return true;
+ }
+
+ if (!strcmp(optarg, "voice-call")) {
+ *source = SC_AUDIO_SOURCE_VOICE_CALL;
+ return true;
+ }
+
+ if (!strcmp(optarg, "voice-call-uplink")) {
+ *source = SC_AUDIO_SOURCE_VOICE_CALL_UPLINK;
+ return true;
+ }
+
+ if (!strcmp(optarg, "voice-call-downlink")) {
+ *source = SC_AUDIO_SOURCE_VOICE_CALL_DOWNLINK;
+ return true;
+ }
+
+ if (!strcmp(optarg, "voice-performance")) {
+ *source = SC_AUDIO_SOURCE_VOICE_PERFORMANCE;
+ return true;
+ }
+
+ LOGE("Unsupported audio source: %s (expected output, mic, playback, "
+ "mic-unprocessed, mic-camcorder, mic-voice-recognition, "
+ "mic-voice-communication, voice-call, voice-call-uplink, "
+ "voice-call-downlink, voice-performance)", optarg);
return false;
}
diff --git a/app/src/options.h b/app/src/options.h
index ef7542e3..03b42913 100644
--- a/app/src/options.h
+++ b/app/src/options.h
@@ -59,6 +59,14 @@ enum sc_audio_source {
SC_AUDIO_SOURCE_OUTPUT,
SC_AUDIO_SOURCE_MIC,
SC_AUDIO_SOURCE_PLAYBACK,
+ SC_AUDIO_SOURCE_MIC_UNPROCESSED,
+ SC_AUDIO_SOURCE_MIC_CAMCORDER,
+ SC_AUDIO_SOURCE_MIC_VOICE_RECOGNITION,
+ SC_AUDIO_SOURCE_MIC_VOICE_COMMUNICATION,
+ SC_AUDIO_SOURCE_VOICE_CALL,
+ SC_AUDIO_SOURCE_VOICE_CALL_UPLINK,
+ SC_AUDIO_SOURCE_VOICE_CALL_DOWNLINK,
+ SC_AUDIO_SOURCE_VOICE_PERFORMANCE,
};
enum sc_camera_facing {
diff --git a/app/src/server.c b/app/src/server.c
index 6979c09b..153219c3 100644
--- a/app/src/server.c
+++ b/app/src/server.c
@@ -149,6 +149,22 @@ sc_server_get_audio_source_name(enum sc_audio_source audio_source) {
return "mic";
case SC_AUDIO_SOURCE_PLAYBACK:
return "playback";
+ case SC_AUDIO_SOURCE_MIC_UNPROCESSED:
+ return "mic-unprocessed";
+ case SC_AUDIO_SOURCE_MIC_CAMCORDER:
+ return "mic-camcorder";
+ case SC_AUDIO_SOURCE_MIC_VOICE_RECOGNITION:
+ return "mic-voice-recognition";
+ case SC_AUDIO_SOURCE_MIC_VOICE_COMMUNICATION:
+ return "mic-voice-communication";
+ case SC_AUDIO_SOURCE_VOICE_CALL:
+ return "voice-call";
+ case SC_AUDIO_SOURCE_VOICE_CALL_UPLINK:
+ return "voice-call-uplink";
+ case SC_AUDIO_SOURCE_VOICE_CALL_DOWNLINK:
+ return "voice-call-downlink";
+ case SC_AUDIO_SOURCE_VOICE_PERFORMANCE:
+ return "voice-performance";
default:
assert(!"unexpected audio source");
return NULL;
diff --git a/doc/audio.md b/doc/audio.md
index 85f76ac5..142626f5 100644
--- a/doc/audio.md
+++ b/doc/audio.md
@@ -66,6 +66,20 @@ the computer:
scrcpy --audio-source=mic --no-video --no-playback --record=file.opus
```
+Many sources are available:
+
+ - `output` (default): forwards the whole audio output, and disables playback on the device (mapped to [`REMOTE_SUBMIX`](https://developer.android.com/reference/android/media/MediaRecorder.AudioSource#REMOTE_SUBMIX)).
+ - `playback`: captures the audio playback (Android apps can opt-out, so the whole output is not necessarily captured).
+ - `mic`: captures the microphone (mapped to [`MIC`](https://developer.android.com/reference/android/media/MediaRecorder.AudioSource#MIC)).
+ - `mic-unprocessed`: captures the microphone unprocessed (raw) sound (mapped to [`UNPROCESSED`](https://developer.android.com/reference/android/media/MediaRecorder.AudioSource#UNPROCESSED)).
+ - `mic-camcorder`: captures the microphone tuned for video recording, with the same orientation as the camera if available (mapped to [`CAMCORDER`](https://developer.android.com/reference/android/media/MediaRecorder.AudioSource#CAMCORDER)).
+ - `mic-voice-recognition`: captures the microphone tuned for voice recognition (mapped to [`VOICE_RECOGNITION`](https://developer.android.com/reference/android/media/MediaRecorder.AudioSource#VOICE_RECOGNITION)).
+ - `mic-voice-communication`: captures the microphone tuned for voice communications (it will for instance take advantage of echo cancellation or automatic gain control if available) (mapped to [`VOICE_COMMUNICATION`](https://developer.android.com/reference/android/media/MediaRecorder.AudioSource#VOICE_COMMUNICATION)).
+ - `voice-call`: captures voice call (mapped to [`VOICE_CALL`](https://developer.android.com/reference/android/media/MediaRecorder.AudioSource#VOICE_CALL)).
+ - `voice-call-uplink`: captures voice call uplink only (mapped to [`VOICE_UPLINK`](https://developer.android.com/reference/android/media/MediaRecorder.AudioSource#VOICE_UPLINK)).
+ - `voice-call-downlink`: captures voice call downlink only (mapped to [`VOICE_DOWNLINK`](https://developer.android.com/reference/android/media/MediaRecorder.AudioSource#VOICE_DOWNLINK)).
+ - `voice-performance`: captures audio meant to be processed for live performance (karaoke), includes both the microphone and the device playback (mapped to [`VOICE_PERFORMANCE`](https://developer.android.com/reference/android/media/MediaRecorder.AudioSource#VOICE_PERFORMANCE)).
+
### Duplication
An alternative device audio capture method is also available (only for Android
diff --git a/server/src/main/java/com/genymobile/scrcpy/audio/AudioSource.java b/server/src/main/java/com/genymobile/scrcpy/audio/AudioSource.java
index 353f2281..d16b5e38 100644
--- a/server/src/main/java/com/genymobile/scrcpy/audio/AudioSource.java
+++ b/server/src/main/java/com/genymobile/scrcpy/audio/AudioSource.java
@@ -1,11 +1,21 @@
package com.genymobile.scrcpy.audio;
+import android.annotation.SuppressLint;
import android.media.MediaRecorder;
+@SuppressLint("InlinedApi")
public enum AudioSource {
OUTPUT("output", MediaRecorder.AudioSource.REMOTE_SUBMIX),
MIC("mic", MediaRecorder.AudioSource.MIC),
- PLAYBACK("playback", -1);
+ PLAYBACK("playback", -1),
+ MIC_UNPROCESSED("mic-unprocessed", MediaRecorder.AudioSource.UNPROCESSED),
+ MIC_CAMCORDER("mic-camcorder", MediaRecorder.AudioSource.CAMCORDER),
+ MIC_VOICE_RECOGNITION("mic-voice-recognition", MediaRecorder.AudioSource.VOICE_RECOGNITION),
+ MIC_VOICE_COMMUNICATION("mic-voice-communication", MediaRecorder.AudioSource.VOICE_COMMUNICATION),
+ VOICE_CALL("voice-call", MediaRecorder.AudioSource.VOICE_CALL),
+ VOICE_CALL_UPLINK("voice-call-uplink", MediaRecorder.AudioSource.VOICE_UPLINK),
+ VOICE_CALL_DOWNLINK("voice-call-downlink", MediaRecorder.AudioSource.VOICE_DOWNLINK),
+ VOICE_PERFORMANCE("voice-performance", MediaRecorder.AudioSource.VOICE_PERFORMANCE);
private final String name;
private final int directAudioSource;