improve support for mac/apple

Author: Cabbache

app/meson.build

@@ -25,7 +25,6 @@ src = [
     'src/keyboard_sdk.c',
     'src/mouse_capture.c',
     'src/mouse_sdk.c',
-    'src/client_audio.c',
     'src/opengl.c',
     'src/options.c',
     'src/packet_merger.c',
@@ -97,6 +96,12 @@ if v4l2_support
     src += [ 'src/v4l2_sink.c' ]
 endif
 
+libavdevice_dep = dependency('libavdevice', static: get_option('static'), required: false)
+client_audio_support = get_option('client_audio') and libavdevice_dep.found()
+if client_audio_support
+    src += [ 'src/client_audio.c' ]
+endif
+
 usb_support = get_option('usb')
 if usb_support
     src += [
@@ -122,8 +127,8 @@ dependencies = [
     dependency('sdl3', version: '>= 3.2.0', static: static),
 ]
 
-if v4l2_support
-    dependencies += dependency('libavdevice', static: static)
+if v4l2_support or client_audio_support
+    dependencies += libavdevice_dep
 endif
 
 if usb_support
@@ -175,6 +180,9 @@ conf.set('SERVER_DEBUGGER', get_option('server_debugger'))
 # enable V4L2 support (linux only)
 conf.set('HAVE_V4L2', v4l2_support)
 
+# enable client audio forwarding (requires libavdevice)
+conf.set('HAVE_CLIENT_AUDIO', client_audio_support)
+
 # enable HID over AOA support (linux only)
 conf.set('HAVE_USB', usb_support)
 

app/src/cli.c

@@ -2650,8 +2650,13 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
                      "use --video-encoder or --audio-encoder.");
                 return false;
             case OPT_CLIENT_AUDIO_SOURCE:
+#ifdef HAVE_CLIENT_AUDIO
                 opts->client_audio_source = optarg;
                 break;
+#else
+                LOGE("Client audio (--client-audio-source) is disabled in this build");
+                return false;
+#endif
             case OPT_VIDEO_ENCODER:
                 opts->video_encoder = optarg;
                 break;
@@ -2771,8 +2776,13 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
                 opts->list |= SC_OPTION_LIST_APPS;
                 break;
             case OPT_LIST_AUDIO_SOURCES:
+#ifdef HAVE_CLIENT_AUDIO
                 args->list_audio_sources = true;
                 break;
+#else
+                LOGE("Client audio (--list-client-audio-sources) is disabled in this build");
+                return false;
+#endif
             case OPT_REQUIRE_AUDIO:
                 opts->require_audio = true;
                 break;
@@ -2944,8 +2954,12 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
         opts->audio = false;
     }
 
-    if (!opts->video && !opts->audio && !opts->control && !otg && !opts->client_audio_source) {
-        LOGE("No video, no audio, no control, no OTG, no client audio: nothing to do");
+    bool has_client_audio = false;
+#ifdef HAVE_CLIENT_AUDIO
+    has_client_audio = opts->client_audio_source != NULL;
+#endif
+    if (!opts->video && !opts->audio && !opts->control && !otg && !has_client_audio) {
+        LOGE("No video, no audio, no control, no OTG: nothing to do");
         return false;
     }
 
@@ -3065,12 +3079,14 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
         }
     }
 
+#ifdef HAVE_CLIENT_AUDIO
     if (opts->client_audio_source &&
         (opts->audio_source == SC_AUDIO_SOURCE_VOICE_CALL ||
          opts->audio_source == SC_AUDIO_SOURCE_VOICE_CALL_UPLINK)) {
         LOGE("--client-audio-source is incompatible with --audio-source=voice-call and --audio-source=voice-call-uplink");
         return false;
     }
+#endif
 
     if (otg) {
         if (!opts->control) {

app/src/client_audio.c

@@ -54,6 +54,30 @@ sc_microphone_list_audio_sources(void) {
     LOGI("Audio input format: %s (%s)",
          input_format->name,
          input_format->long_name ? input_format->long_name : "no description");
+
+#ifdef __APPLE__
+    LOGI("Listing devices via avfoundation (see output above/below):");
+
+    AVDictionary *options = NULL;
+    av_dict_set(&options, "list_devices", "true", 0);
+
+    AVFormatContext *fmt_ctx = NULL;
+    avformat_open_input(&fmt_ctx, "", input_format, &options);
+
+    av_dict_free(&options);
+    if (fmt_ctx) {
+        avformat_close_input(&fmt_ctx);
+    }
+
+    LOGI("How to use:");
+    LOGI("  Use the audio device index with --client-audio-source");
+    LOGI("  Format: \":AUDIO_INDEX\" (e.g., \":0\" for first audio device)");
+    LOGI("Examples:");
+    LOGI("  scrcpy --client-audio-source :0");
+    LOGI("  scrcpy --client-audio-source file:///path/to/audio.mp3");
+    return;
+#endif
+
     LOGI("Available audio sources:");
 
     AVDeviceInfoList *device_list = NULL;
@@ -66,9 +90,6 @@ sc_microphone_list_audio_sources(void) {
 #ifdef _WIN32
         LOGI("  - \"audio=DEVICE_NAME\" (for dshow)");
         LOGI("  - Try running 'ffmpeg -list_devices true -f dshow -i dummy' to see available devices");
-#elif defined(__APPLE__)
-        LOGI("  - \":0\" (default microphone)");
-        LOGI("  - Try running 'ffmpeg -f avfoundation -list_devices true -i \"\"' to see available devices");
 #else
         LOGI("  - \"default\" (default ALSA device)");
         LOGI("  - \"hw:0,0\" (hardware device)");
@@ -93,13 +114,10 @@ sc_microphone_list_audio_sources(void) {
     avdevice_free_list_devices(&device_list);
 
     LOGI("How to use:");
-    LOGI("  Use the device name exactly as shown above with --client-audio-source");
+    LOGI("  Pass the device names shown above as --client-audio-source <device>");
     LOGI("Common microphone devices:");
 #ifdef _WIN32
     LOGI("  - \"audio=DEVICE_NAME\" (use the exact name from the list)");
-#elif defined(__APPLE__)
-    LOGI("  - \":0\" or \":1\" (device indices for macOS)");
-    LOGI("  - \"default\" (default microphone)");
 #else
     LOGI("  - \"default\" (usually your default microphone)");
     LOGI("  - \"hw:CARD,DEV\" devices are hardware devices");
@@ -289,8 +307,15 @@ sc_microphone_run(void *data) {
         }
 
         if (read_ret < 0) {
-            // For device input, any error means we should stop
+            // EAGAIN means no data available yet, retry
+            if (read_ret == AVERROR(EAGAIN)) {
+                av_usleep(1000);
+                continue;
+            }
             if (!is_file) {
+                char errbuf[128];
+                av_strerror(read_ret, errbuf, sizeof(errbuf));
+                LOGD("av_read_frame error: %d (%s)", read_ret, errbuf);
                 break;
             }
             continue;

app/src/main.c

@@ -2,7 +2,7 @@
 
 #include <stdbool.h>
 #include <stdio.h>
-#ifdef HAVE_V4L2
+#ifdef HAVE_CLIENT_AUDIO
 # include <libavdevice/avdevice.h>
 #endif
 #include <SDL3/SDL.h>
@@ -17,7 +17,9 @@
 #include "util/net.h"
 #include "util/thread.h"
 #include "version.h"
-#include "client_audio.h"
+#ifdef HAVE_CLIENT_AUDIO
+# include "client_audio.h"
+#endif
 
 #ifdef _WIN32
 #include <windows.h>
@@ -73,6 +75,7 @@ main_scrcpy(int argc, char *argv[]) {
     av_register_all();
 #endif
 
+#ifdef HAVE_CLIENT_AUDIO
     //needed for capturing microphone and listing audio sources
     avdevice_register_all();
 
@@ -81,6 +84,7 @@ main_scrcpy(int argc, char *argv[]) {
         ret = SCRCPY_EXIT_SUCCESS;
         goto end;
     }
+#endif
 
     // The current thread is the main thread
     SC_MAIN_THREAD_ID = sc_thread_get_id();

app/src/scrcpy.c

@@ -26,7 +26,9 @@
 #include "recorder.h"
 #include "screen.h"
 #include "server.h"
-#include "client_audio.h"
+#ifdef HAVE_CLIENT_AUDIO
+# include "client_audio.h"
+#endif
 #include "uhid/gamepad_uhid.h"
 #include "uhid/keyboard_uhid.h"
 #include "uhid/mouse_uhid.h"
@@ -62,8 +64,10 @@ struct scrcpy {
 #endif
     struct sc_controller controller;
     struct sc_file_pusher file_pusher;
+#ifdef HAVE_CLIENT_AUDIO
     struct sc_microphone_params microphone_params;
     sc_thread microphone_thread;
+#endif
 #ifdef HAVE_USB
     struct sc_usb usb;
     struct sc_aoa aoa;
@@ -451,7 +455,11 @@ scrcpy(struct scrcpy_options *options) {
         .display_ime_policy = options->display_ime_policy,
         .video = options->video,
         .audio = options->audio,
+#ifdef HAVE_CLIENT_AUDIO
         .client_audio = options->client_audio_source != NULL,
+#else
+        .client_audio = false,
+#endif
         .audio_dup = options->audio_dup,
         .show_touches = options->show_touches,
         .stay_awake = options->stay_awake,
@@ -892,6 +900,7 @@ scrcpy(struct scrcpy_options *options) {
         audio_demuxer_started = true;
     }
 
+#ifdef HAVE_CLIENT_AUDIO
     bool microphone_started = false;
     if (options->client_audio_source) {
         s->microphone_params.socket = s->server.client_mic_socket;
@@ -903,6 +912,7 @@ scrcpy(struct scrcpy_options *options) {
         }
         microphone_started = true;
     }
+#endif
 
     // If the device screen is to be turned off, send the control message after
     // everything is set up
@@ -1032,9 +1042,11 @@ scrcpy(struct scrcpy_options *options) {
         sc_demuxer_join(&s->audio_demuxer);
     }
 
+#ifdef HAVE_CLIENT_AUDIO
     if (microphone_started) {
         sc_thread_join(&s->microphone_thread, NULL);
     }
+#endif
 
 #ifdef HAVE_V4L2
     if (v4l2_sink_initialized) {

meson_options.txt

@@ -6,3 +6,4 @@ option('static', type: 'boolean', value: false, description: 'Use static depende
 option('server_debugger', type: 'boolean', value: false, description: 'Run a server debugger and wait for a client to be attached')
 option('v4l2', type: 'boolean', value: true, description: 'Enable V4L2 feature when supported')
 option('usb', type: 'boolean', value: true, description: 'Enable HID/OTG features when supported')
+option('client_audio', type: 'boolean', value: true, description: 'Enable client audio forwarding (requires libavdevice)')