Warn on ignored audio options

For raw audio codec, some audio options are ignored.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>

README.md

@@ -718,7 +718,7 @@ scrcpy --display=1
 The list of display ids can be retrieved by:
 
 ```bash
-scrcpy --list-displays
+adb shell dumpsys display   # search "mDisplayId=" in the output
 ```
 
 The secondary display may only be controlled if the device runs at least Android

app/scrcpy.1

@@ -35,17 +35,7 @@ Default is 0 (no buffering).
 .BI "\-\-audio\-codec " name
 Select an audio codec (raw, opus or aac).
 
-Default is opus.
-
-.TP
-.BI "\-\-audio\-codec\-options " key\fR[:\fItype\fR]=\fIvalue\fR[,...]
-Set a list of comma-separated key:type=value options for the device audio encoder.
-
-The possible values for 'type' are 'int' (default), 'long', 'float' and 'string'.
-
-The list of possible codec options is available in the Android documentation
-.UR https://d.android.com/reference/android/media/MediaFormat
-.UE .
+Default is raw.
 
 .TP
 .BI "\-\-audio\-encoder " name

app/src/audio_player.c

@@ -74,7 +74,7 @@ sc_audio_player_sdl_callback(void *userdata, uint8_t *stream, int len_int) {
 static uint8_t *
 sc_audio_player_get_swr_buf(struct sc_audio_player *ap, size_t min_samples) {
     size_t min_buf_size = samples_to_bytes(ap, min_samples);
-    if (min_buf_size > ap->swr_buf_alloc_size) {
+    if (min_buf_size < ap->swr_buf_alloc_size) {
         size_t new_size = min_buf_size + 4096;
         uint8_t *buf = realloc(ap->swr_buf, new_size);
         if (!buf) {

app/src/cli.c

@@ -133,7 +133,7 @@ static const struct sc_option options[] = {
         .longopt = "audio-codec",
         .argdesc = "name",
         .text = "Select an audio codec (raw, opus or aac).\n"
-                "Default is opus.",
+                "Default is raw.",
     },
     {
         .longopt_id = OPT_AUDIO_CODEC_OPTIONS,
@@ -1917,20 +1917,9 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
     }
 
     if (opts->record_filename && opts->audio_codec == SC_CODEC_RAW) {
-        LOGW("Recording does not support RAW audio codec");
-        return false;
-    }
-
-    if (opts->audio_codec == SC_CODEC_RAW) {
-        if (opts->audio_bit_rate) {
-            LOGW("--audio-bit-rate is ignored for raw audio codec");
-        }
-        if (opts->audio_codec_options) {
-            LOGW("--audio-codec-options is ignored for raw audio codec");
-        }
-        if (opts->audio_encoder) {
-            LOGW("--audio-encoder is ignored for raw audio codec");
-        }
+        LOGW("Recording does not support RAW audio codec, automatically "
+             "switching to --audio-codec=opus");
+        opts->audio_codec = SC_CODEC_OPUS;
     }
 
     if (opts->audio_codec == SC_CODEC_RAW) {

app/src/options.c

@@ -16,7 +16,7 @@ const struct scrcpy_options scrcpy_options_default = {
 #endif
     .log_level = SC_LOG_LEVEL_INFO,
     .video_codec = SC_CODEC_H264,
-    .audio_codec = SC_CODEC_OPUS,
+    .audio_codec = SC_CODEC_RAW,
     .record_format = SC_RECORD_FORMAT_AUTO,
     .keyboard_input_mode = SC_KEYBOARD_INPUT_MODE_INJECT,
     .mouse_input_mode = SC_MOUSE_INPUT_MODE_INJECT,

app/src/server.c

@@ -238,7 +238,7 @@ execute_server(struct sc_server *server,
         ADD_PARAM("video_codec=%s",
                   sc_server_get_codec_name(params->video_codec));
     }
-    if (params->audio_codec != SC_CODEC_OPUS) {
+    if (params->audio_codec != SC_CODEC_RAW) {
         ADD_PARAM("audio_codec=%s",
             sc_server_get_codec_name(params->audio_codec));
     }

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

@@ -37,8 +37,8 @@ public final class AudioEncoder implements AudioRecorder {
     private static final int SAMPLE_RATE = AudioCapture.SAMPLE_RATE;
     private static final int CHANNELS = AudioCapture.CHANNELS;
 
-    private static final int READ_MS = 5; // milliseconds
-    private static final int READ_SIZE = AudioCapture.millisToBytes(READ_MS);
+    private static final int BUFFER_MS = 5; // milliseconds
+    private static final int BUFFER_SIZE = AudioCapture.millisToBytes(BUFFER_MS);
 
     private final Streamer streamer;
     private final int bitRate;
@@ -91,7 +91,7 @@ public final class AudioEncoder implements AudioRecorder {
         while (!Thread.currentThread().isInterrupted()) {
             InputTask task = inputTasks.take();
             ByteBuffer buffer = mediaCodec.getInputBuffer(task.index);
-            int r = capture.read(buffer, READ_SIZE, bufferInfo);
+            int r = capture.read(buffer, BUFFER_SIZE, bufferInfo);
             if (r < 0) {
                 throw new IOException("Could not read audio: " + r);
             }

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

@@ -11,15 +11,15 @@ public final class AudioRawRecorder implements AudioRecorder {
 
     private Thread thread;
 
-    private static final int READ_MS = 5; // milliseconds
-    private static final int READ_SIZE = AudioCapture.millisToBytes(READ_MS);
+    private static final int BUFFER_MS = 5; // milliseconds
+    private static final int BUFFER_SIZE = AudioCapture.millisToBytes(BUFFER_MS);
 
     public AudioRawRecorder(Streamer streamer) {
         this.streamer = streamer;
     }
 
     private void record() throws IOException, AudioCaptureForegroundException {
-        final ByteBuffer buffer = ByteBuffer.allocateDirect(READ_SIZE);
+        final ByteBuffer buffer = ByteBuffer.allocateDirect(BUFFER_SIZE);
         final MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();
 
         AudioCapture capture = new AudioCapture();
@@ -29,7 +29,7 @@ public final class AudioRawRecorder implements AudioRecorder {
             streamer.writeHeader();
             while (!Thread.currentThread().isInterrupted()) {
                 buffer.position(0);
-                int r = capture.read(buffer, READ_SIZE, bufferInfo);
+                int r = capture.read(buffer, BUFFER_SIZE, bufferInfo);
                 if (r < 0) {
                     throw new IOException("Could not read audio: " + r);
                 }

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

@@ -110,11 +110,6 @@ public final class DesktopConnection implements Closeable {
         videoSocket.shutdownInput();
         videoSocket.shutdownOutput();
         videoSocket.close();
-        if (audioSocket != null) {
-            audioSocket.shutdownInput();
-            audioSocket.shutdownOutput();
-            audioSocket.close();
-        }
         if (controlSocket != null) {
             controlSocket.shutdownInput();
             controlSocket.shutdownOutput();

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

@@ -11,7 +11,7 @@ public class Options {
     private boolean audio = true;
     private int maxSize;
     private VideoCodec videoCodec = VideoCodec.H264;
-    private AudioCodec audioCodec = AudioCodec.OPUS;
+    private AudioCodec audioCodec = AudioCodec.RAW;
     private int videoBitRate = 8000000;
     private int audioBitRate = 196000;
     private int maxFps;

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

@@ -51,34 +51,27 @@ public final class Streamer {
         IO.writeFully(fd, code, 0, code.length);
     }
 
-    public void writePacket(ByteBuffer buffer, long pts, boolean config, boolean keyFrame) throws IOException {
-        if (config && codec == AudioCodec.OPUS) {
-            fixOpusConfigPacket(buffer);
+    public void writePacket(ByteBuffer codecBuffer, MediaCodec.BufferInfo bufferInfo) throws IOException {
+        if (codec == AudioCodec.OPUS) {
+            fixOpusConfigPacket(codecBuffer, bufferInfo);
         }
 
         if (sendFrameMeta) {
-            writeFrameMeta(fd, buffer.remaining(), pts, config, keyFrame);
+            writeFrameMeta(fd, bufferInfo, codecBuffer.remaining());
         }
 
-        IO.writeFully(fd, buffer);
+        IO.writeFully(fd, codecBuffer);
     }
 
-    public void writePacket(ByteBuffer codecBuffer, MediaCodec.BufferInfo bufferInfo) throws IOException {
-        long pts = bufferInfo.presentationTimeUs;
-        boolean config = (bufferInfo.flags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0;
-        boolean keyFrame = (bufferInfo.flags & MediaCodec.BUFFER_FLAG_KEY_FRAME) != 0;
-        writePacket(codecBuffer, pts, config, keyFrame);
-    }
-
-    private void writeFrameMeta(FileDescriptor fd, int packetSize, long pts, boolean config, boolean keyFrame) throws IOException {
+    private void writeFrameMeta(FileDescriptor fd, MediaCodec.BufferInfo bufferInfo, int packetSize) throws IOException {
         headerBuffer.clear();
 
         long ptsAndFlags;
-        if (config) {
+        if ((bufferInfo.flags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0) {
             ptsAndFlags = PACKET_FLAG_CONFIG; // non-media data packet
         } else {
-            ptsAndFlags = pts;
-            if (keyFrame) {
+            ptsAndFlags = bufferInfo.presentationTimeUs;
+            if ((bufferInfo.flags & MediaCodec.BUFFER_FLAG_KEY_FRAME) != 0) {
                 ptsAndFlags |= PACKET_FLAG_KEY_FRAME;
             }
         }
@@ -89,7 +82,7 @@ public final class Streamer {
         IO.writeFully(fd, headerBuffer);
     }
 
-    private static void fixOpusConfigPacket(ByteBuffer buffer) throws IOException {
+    private static void fixOpusConfigPacket(ByteBuffer buffer, MediaCodec.BufferInfo bufferInfo) throws IOException {
         // Here is an example of the config packet received for an OPUS stream:
         //
         // 00000000  41 4f 50 55 53 48 44 52  13 00 00 00 00 00 00 00  |AOPUSHDR........|
@@ -106,6 +99,11 @@ public final class Streamer {
         //
         // <https://developer.android.com/reference/android/media/MediaCodec#CSD>
 
+        boolean isConfig = (bufferInfo.flags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0;
+        if (!isConfig) {
+            return;
+        }
+
         if (buffer.remaining() < 16) {
             throw new IOException("Not enough data in OPUS config packet");
         }