Flac audio codec

app/data/bash-completion/scrcpy

@@ -97,7 +97,7 @@ _scrcpy() {
             return
             ;;
         --audio-codec)
-            COMPREPLY=($(compgen -W 'opus aac raw' -- "$cur"))
+            COMPREPLY=($(compgen -W 'opus aac flac raw' -- "$cur"))
             return
             ;;
         --video-source)

app/data/zsh-completion/_scrcpy

@@ -11,7 +11,7 @@ arguments=(
     '--always-on-top[Make scrcpy window always on top \(above other windows\)]'
     '--audio-bit-rate=[Encode the audio at the given bit-rate]'
     '--audio-buffer=[Configure the audio buffering delay (in milliseconds)]'
-    '--audio-codec=[Select the audio codec]:codec:(opus aac raw)'
+    '--audio-codec=[Select the audio codec]:codec:(opus aac flac raw)'
     '--audio-codec-options=[Set a list of comma-separated key\:type=value options for the device audio encoder]'
     '--audio-encoder=[Use a specific MediaCodec audio encoder]'
     '--audio-source=[Select the audio source]:source:(output mic)'

app/scrcpy.1

@@ -35,7 +35,7 @@ Default is 50.
 
 .TP
 .BI "\-\-audio\-codec " name
-Select an audio codec (opus, aac or raw).
+Select an audio codec (opus, aac, flac or raw).
 
 Default is opus.
 

app/src/cli.c

@@ -152,7 +152,7 @@ static const struct sc_option options[] = {
         .longopt_id = OPT_AUDIO_CODEC,
         .longopt = "audio-codec",
         .argdesc = "name",
-        .text = "Select an audio codec (opus, aac or raw).\n"
+        .text = "Select an audio codec (opus, aac, flac or raw).\n"
                 "Default is opus.",
     },
     {
@@ -1626,6 +1626,9 @@ get_record_format(const char *name) {
     if (!strcmp(name, "aac")) {
         return SC_RECORD_FORMAT_AAC;
     }
+    if (!strcmp(name, "flac")) {
+        return SC_RECORD_FORMAT_FLAC;
+    }
     return 0;
 }
 
@@ -1695,11 +1698,15 @@ parse_audio_codec(const char *optarg, enum sc_codec *codec) {
         *codec = SC_CODEC_AAC;
         return true;
     }
+    if (!strcmp(optarg, "flac")) {
+        *codec = SC_CODEC_FLAC;
+        return true;
+    }
     if (!strcmp(optarg, "raw")) {
         *codec = SC_CODEC_RAW;
         return true;
     }
-    LOGE("Unsupported audio codec: %s (expected opus, aac or raw)", optarg);
+    LOGE("Unsupported audio codec: %s (expected opus, aac, flac or raw)", optarg);
     return false;
 }
 
@@ -2376,6 +2383,18 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
                  "(try with --audio-codec=aac)");
             return false;
         }
+        if (opts->record_format == SC_RECORD_FORMAT_FLAC
+                && opts->audio_codec != SC_CODEC_FLAC) {
+            LOGE("Recording to FLAC file requires an FLAC audio stream "
+                 "(try with --audio-codec=flac)");
+            return false;
+        }
+    }
+
+    if (opts->audio_codec == SC_CODEC_FLAC) {
+        if (opts->audio_bit_rate) {
+            LOGW("--audio-bit-rate is ignored for flac audio codec");
+        }
     }
 
     if (opts->audio_codec == SC_CODEC_RAW) {

app/src/demuxer.c

@@ -26,6 +26,7 @@ sc_demuxer_to_avcodec_id(uint32_t codec_id) {
 #define SC_CODEC_ID_AV1 UINT32_C(0x00617631) // "av1" in ASCII
 #define SC_CODEC_ID_OPUS UINT32_C(0x6f707573) // "opus" in ASCII
 #define SC_CODEC_ID_AAC UINT32_C(0x00616163) // "aac in ASCII"
+#define SC_CODEC_ID_FLAC UINT32_C(0x664c6143) // "fLaC in ASCII"
 #define SC_CODEC_ID_RAW UINT32_C(0x00726177) // "raw" in ASCII
     switch (codec_id) {
         case SC_CODEC_ID_H264:
@@ -43,6 +44,8 @@ sc_demuxer_to_avcodec_id(uint32_t codec_id) {
             return AV_CODEC_ID_OPUS;
         case SC_CODEC_ID_AAC:
             return AV_CODEC_ID_AAC;
+        case SC_CODEC_ID_FLAC:
+            return AV_CODEC_ID_FLAC;
         case SC_CODEC_ID_RAW:
             return AV_CODEC_ID_PCM_S16LE;
         default:

app/src/options.h

@@ -25,14 +25,16 @@ enum sc_record_format {
     SC_RECORD_FORMAT_MKA,
     SC_RECORD_FORMAT_OPUS,
     SC_RECORD_FORMAT_AAC,
+    SC_RECORD_FORMAT_FLAC;
 };
 
 static inline bool
 sc_record_format_is_audio_only(enum sc_record_format fmt) {
     return fmt == SC_RECORD_FORMAT_M4A
         || fmt == SC_RECORD_FORMAT_MKA
         || fmt == SC_RECORD_FORMAT_OPUS
-        || fmt == SC_RECORD_FORMAT_AAC;
+        || fmt == SC_RECORD_FORMAT_AAC
+        || fmt == SC_RECORD_FORMAT_FLAC;
 }
 
 enum sc_codec {
@@ -41,6 +43,7 @@ enum sc_codec {
     SC_CODEC_AV1,
     SC_CODEC_OPUS,
     SC_CODEC_AAC,
+    SC_CODEC_FLAC,
     SC_CODEC_RAW,
 };
 

app/src/recorder.c

@@ -69,6 +69,8 @@ sc_recorder_get_format_name(enum sc_record_format format) {
             return "matroska";
         case SC_RECORD_FORMAT_OPUS:
             return "opus";
+        case SC_RECORD_FORMAT_FLAC:
+            return "flac";
         default:
             return NULL;
     }

app/src/server.c

@@ -178,6 +178,8 @@ sc_server_get_codec_name(enum sc_codec codec) {
             return "opus";
         case SC_CODEC_AAC:
             return "aac";
+        case SC_CODEC_FLAC:
+            return "flac";
         case SC_CODEC_RAW:
             return "raw";
         default:

server/src/main/java/com/genymobile/scrcpy/AudioCodec.java

@@ -5,6 +5,7 @@
 public enum AudioCodec implements Codec {
     OPUS(0x6f_70_75_73, "opus", MediaFormat.MIMETYPE_AUDIO_OPUS),
     AAC(0x00_61_61_63, "aac", MediaFormat.MIMETYPE_AUDIO_AAC),
+    FLAC(0x66_4c_61_43, "flac", MediaFormat.MIMETYPE_AUDIO_FLAC),
     RAW(0x00_72_61_77, "raw", MediaFormat.MIMETYPE_AUDIO_RAW);
 
     private final int id; // 4-byte ASCII representation of the name