Capture device audio WIP

Co-authored-by: Romain Vimont <rom@rom1v.com>
Signed-off-by: Romain Vimont <rom@rom1v.com>

README.md

@@ -252,22 +252,10 @@ This affects recording orientation.
 The [window may also be rotated](#rotation) independently.
 
 
-#### Codec
+#### Encoder
 
-The video codec can be selected. The possible values are `h264` (default),
-`h265` and `av1`:
-
-```bash
-scrcpy --codec=h264  # default
-scrcpy --codec=h265
-scrcpy --codec=av1
-```
-
-
-##### Encoder
-
-Some devices have more than one encoder for a specific codec, and some of them
-may cause issues or crash. It is possible to select a different encoder:
+Some devices have more than one encoder, and some of them may cause issues or
+crash. It is possible to select a different encoder:
 
 ```bash
 scrcpy --encoder=OMX.qcom.video.encoder.avc
@@ -277,8 +265,7 @@ To list the available encoders, you can pass an invalid encoder name; the
 error will give the available encoders:
 
 ```bash
-scrcpy --encoder=_               # for the default codec
-scrcpy --codec=h265 --encoder=_  # for a specific codec
+scrcpy --encoder=_
 ```
 
 ### Capture

app/scrcpy.1

@@ -26,11 +26,7 @@ Encode the video at the given bit\-rate, expressed in bits/s. Unit suffixes are
 Default is 8000000.
 
 .TP
-.BI "\-\-codec " name
-Select a video codec (h264, h265 or av1).
-
-.TP
-.BI "\-\-codec\-options " key\fR[:\fItype\fR]=\fIvalue\fR[,...]
+.BI "\-\-codec\-options " key[:type]=value[,...]
 Set a list of comma-separated key:type=value options for the device encoder.
 
 The possible values for 'type' are 'int' (default), 'long', 'float' and 'string'.
@@ -121,7 +117,7 @@ Inject computer clipboard text as a sequence of key events on Ctrl+v (like MOD+S
 This is a workaround for some devices not behaving as expected when setting the device clipboard programmatically.
 
 .TP
-\fB\-\-lock\-video\-orientation\fR[=\fIvalue\fR]
+.BI "\-\-lock\-video\-orientation[=value]
 Lock video orientation to \fIvalue\fR. Possible values are "unlocked", "initial" (locked to the initial orientation), 0, 1, 2 and 3. Natural device orientation is 0, and each increment adds a 90 degrees rotation counterclockwise.
 
 Default is "unlocked".
@@ -203,7 +199,7 @@ It may only work over USB.
 See \fB\-\-hid\-keyboard\fR and \fB\-\-hid\-mouse\fR.
 
 .TP
-.BI "\-p, \-\-port " port\fR[:\fIport\fR]
+.BI "\-p, \-\-port " port[:port]
 Set the TCP port (range) used by the client to listen.
 
 Default is 27183:27199.
@@ -264,7 +260,7 @@ Set the initial display rotation. Possibles values are 0, 1, 2 and 3. Each incre
 The device serial number. Mandatory only if several devices are connected to adb.
 
 .TP
-.BI "\-\-shortcut\-mod " key\fR[+...]][,...]
+.BI "\-\-shortcut\-mod " key[+...]][,...]
 Specify the modifiers to use for scrcpy shortcuts. Possible keys are "lctrl", "rctrl", "lalt", "ralt", "lsuper" and "rsuper".
 
 A shortcut can consist in several keys, separated by '+'. Several shortcuts can be specified, separated by ','.
@@ -274,7 +270,7 @@ For example, to use either LCtrl+LAlt or LSuper for scrcpy shortcuts, pass "lctr
 Default is "lalt,lsuper" (left-Alt or left-Super).
 
 .TP
-.BI "\-\-tcpip\fR[=\fIip\fR[:\fIport\fR]]
+.BI "\-\-tcpip[=ip[:port]]
 Configure and reconnect the device over TCP/IP.
 
 If a destination address is provided, then scrcpy connects to this address before starting. The device must listen on the given TCP port (default is 5555).

app/src/cli.c

@@ -57,8 +57,6 @@
 #define OPT_NO_CLEANUP             1037
 #define OPT_PRINT_FPS              1038
 #define OPT_NO_POWER_ON            1039
-#define OPT_CODEC                  1040
-#define OPT_NO_AUDIO               1041
 
 struct sc_option {
     char shortopt;
@@ -107,12 +105,6 @@ static const struct sc_option options[] = {
                 "Unit suffixes are supported: 'K' (x1000) and 'M' (x1000000).\n"
                 "Default is " STR(DEFAULT_BIT_RATE) ".",
     },
-    {
-        .longopt_id = OPT_CODEC,
-        .longopt = "codec",
-        .argdesc = "name",
-        .text = "Select a video codec (h264, h265 or av1).",
-    },
     {
         .longopt_id = OPT_CODEC_OPTIONS,
         .longopt = "codec-options",
@@ -299,11 +291,6 @@ static const struct sc_option options[] = {
         .text = "Do not display device (only when screen recording or V4L2 "
                 "sink is enabled).",
     },
-    {
-        .longopt_id = OPT_NO_AUDIO,
-        .longopt = "no-audio",
-        .text = "Disable audio forwarding.",
-    },
     {
         .longopt_id = OPT_NO_KEY_REPEAT,
         .longopt = "no-key-repeat",
@@ -1390,24 +1377,6 @@ guess_record_format(const char *filename) {
     return 0;
 }
 
-static bool
-parse_codec(const char *optarg, enum sc_codec *codec) {
-    if (!strcmp(optarg, "h264")) {
-        *codec = SC_CODEC_H264;
-        return true;
-    }
-    if (!strcmp(optarg, "h265")) {
-        *codec = SC_CODEC_H265;
-        return true;
-    }
-    if (!strcmp(optarg, "av1")) {
-        *codec = SC_CODEC_AV1;
-        return true;
-    }
-    LOGE("Unsupported codec: %s (expected h264, h265 or av1)", optarg);
-    return false;
-}
-
 static bool
 parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
                        const char *optstring, const struct option *longopts) {
@@ -1632,9 +1601,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
             case OPT_NO_DOWNSIZE_ON_ERROR:
                 opts->downsize_on_error = false;
                 break;
-            case OPT_NO_AUDIO:
-                opts->audio = false;
-                break;
             case OPT_NO_CLEANUP:
                 opts->cleanup = false;
                 break;
@@ -1644,11 +1610,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
             case OPT_PRINT_FPS:
                 opts->start_fps_counter = true;
                 break;
-            case OPT_CODEC:
-                if (!parse_codec(optarg, &opts->codec)) {
-                    return false;
-                }
-                break;
             case OPT_OTG:
 #ifdef HAVE_USB
                 opts->otg = true;
@@ -1757,13 +1718,6 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
         }
     }
 
-    if (opts->record_format == SC_RECORD_FORMAT_MP4
-            && opts->codec == SC_CODEC_AV1) {
-        LOGE("Could not mux AV1 stream into MP4 container "
-             "(record to mkv or select another video codec)");
-        return false;
-    }
-
     if (!opts->control) {
         if (opts->turn_screen_off) {
             LOGE("Could not request to turn screen off if control is disabled");

app/src/demuxer.c

@@ -17,34 +17,6 @@
 
 #define SC_PACKET_PTS_MASK (SC_PACKET_FLAG_KEY_FRAME - 1)
 
-static enum AVCodecID
-sc_demuxer_recv_codec_id(struct sc_demuxer *demuxer) {
-    uint8_t data[4];
-    ssize_t r = net_recv_all(demuxer->socket, data, 4);
-    if (r < 4) {
-        return false;
-    }
-
-#define SC_CODEC_ID_H264 UINT32_C(0x68323634) // "h264" in ASCII
-#define SC_CODEC_ID_H265 UINT32_C(0x68323635) // "h265" in ASCII
-#define SC_CODEC_ID_AV1 UINT32_C(0x00617631) // "av1" in ASCII
-#define SC_CODEC_ID_OPUS UINT32_C(0x6f707573) // "opus" in ASCII
-    uint32_t codec_id = sc_read32be(data);
-    switch (codec_id) {
-        case SC_CODEC_ID_H264:
-            return AV_CODEC_ID_H264;
-        case SC_CODEC_ID_H265:
-            return AV_CODEC_ID_HEVC;
-        case SC_CODEC_ID_AV1:
-            return AV_CODEC_ID_AV1;
-        case SC_CODEC_ID_OPUS:
-            return AV_CODEC_ID_OPUS;
-        default:
-            LOGE("Unknown codec id 0x%08" PRIx32, codec_id);
-            return AV_CODEC_ID_NONE;
-    }
-}
-
 static bool
 sc_demuxer_recv_packet(struct sc_demuxer *demuxer, AVPacket *packet) {
     // The video stream contains raw packets, without time information. When we
@@ -199,13 +171,7 @@ static int
 run_demuxer(void *data) {
     struct sc_demuxer *demuxer = data;
 
-    enum AVCodecID codec_id = sc_demuxer_recv_codec_id(demuxer);
-    if (codec_id == AV_CODEC_ID_NONE) {
-        // Error already logged
-        goto end;
-    }
-
-    const AVCodec *codec = avcodec_find_decoder(codec_id);
+    const AVCodec *codec = avcodec_find_decoder(AV_CODEC_ID_H264);
     if (!codec) {
         LOGE("H.264 decoder not found");
         goto end;
@@ -222,7 +188,7 @@ run_demuxer(void *data) {
         goto finally_free_codec_ctx;
     }
 
-    demuxer->parser = av_parser_init(codec_id);
+    demuxer->parser = av_parser_init(AV_CODEC_ID_H264);
     if (!demuxer->parser) {
         LOGE("Could not initialize parser");
         goto finally_close_sinks;
@@ -273,12 +239,8 @@ end:
 }
 
 void
-sc_demuxer_init(struct sc_demuxer *demuxer, enum sc_stream_id stream_id,
-                sc_socket socket, const struct sc_demuxer_callbacks *cbs,
-                void *cbs_userdata) {
-    assert(socket != SC_SOCKET_NONE);
-
-    demuxer->stream_id = stream_id;
+sc_demuxer_init(struct sc_demuxer *demuxer, sc_socket socket,
+                const struct sc_demuxer_callbacks *cbs, void *cbs_userdata) {
     demuxer->socket = socket;
     demuxer->pending = NULL;
     demuxer->sink_count = 0;

app/src/demuxer.h

@@ -14,13 +14,7 @@
 
 #define SC_DEMUXER_MAX_SINKS 2
 
-enum sc_stream_id {
-    SC_STREAM_ID_VIDEO,
-    SC_STREAM_ID_AUDIO,
-};
-
 struct sc_demuxer {
-    enum sc_stream_id stream_id;
     sc_socket socket;
     sc_thread thread;
 
@@ -42,9 +36,8 @@ struct sc_demuxer_callbacks {
 };
 
 void
-sc_demuxer_init(struct sc_demuxer *demuxer, enum sc_stream_id stream_id,
-                sc_socket socket, const struct sc_demuxer_callbacks *cbs,
-                void *cbs_userdata);
+sc_demuxer_init(struct sc_demuxer *demuxer, sc_socket socket,
+                const struct sc_demuxer_callbacks *cbs, void *cbs_userdata);
 
 void
 sc_demuxer_add_sink(struct sc_demuxer *demuxer, struct sc_packet_sink *sink);

app/src/options.c

@@ -13,7 +13,6 @@ const struct scrcpy_options scrcpy_options_default = {
     .v4l2_device = NULL,
 #endif
     .log_level = SC_LOG_LEVEL_INFO,
-    .codec = SC_CODEC_H264,
     .record_format = SC_RECORD_FORMAT_AUTO,
     .keyboard_input_mode = SC_KEYBOARD_INPUT_MODE_INJECT,
     .port_range = {
@@ -66,5 +65,4 @@ const struct scrcpy_options scrcpy_options_default = {
     .cleanup = true,
     .start_fps_counter = false,
     .power_on = true,
-    .audio = true,
 };

app/src/options.h

@@ -23,12 +23,6 @@ enum sc_record_format {
     SC_RECORD_FORMAT_MKV,
 };
 
-enum sc_codec {
-    SC_CODEC_H264,
-    SC_CODEC_H265,
-    SC_CODEC_AV1,
-};
-
 enum sc_lock_video_orientation {
     SC_LOCK_VIDEO_ORIENTATION_UNLOCKED = -1,
     // lock the current orientation when scrcpy starts
@@ -99,7 +93,6 @@ struct scrcpy_options {
     const char *v4l2_device;
 #endif
     enum sc_log_level log_level;
-    enum sc_codec codec;
     enum sc_record_format record_format;
     enum sc_keyboard_input_mode keyboard_input_mode;
     enum sc_mouse_input_mode mouse_input_mode;
@@ -147,7 +140,6 @@ struct scrcpy_options {
     bool cleanup;
     bool start_fps_counter;
     bool power_on;
-    bool audio;
 };
 
 extern const struct scrcpy_options scrcpy_options_default;

app/src/recorder.c

@@ -130,6 +130,8 @@ sc_recorder_write(struct sc_recorder *recorder, AVPacket *packet) {
         return true;
     }
 
+    LOGI("==== %" PRIu64, packet->pts);
+
     sc_recorder_rescale_packet(recorder, packet);
     return av_write_frame(recorder->ctx, packet) >= 0;
 }

app/src/scrcpy.c

@@ -40,8 +40,7 @@
 struct scrcpy {
     struct sc_server server;
     struct sc_screen screen;
-    struct sc_demuxer video_demuxer;
-    struct sc_demuxer audio_demuxer;
+    struct sc_demuxer demuxer;
     struct sc_decoder decoder;
     struct sc_recorder recorder;
 #ifdef HAVE_V4L2
@@ -234,21 +233,13 @@ av_log_callback(void *avcl, int level, const char *fmt, va_list vl) {
 }
 
 static void
-sc_video_demuxer_on_eos(struct sc_demuxer *demuxer, void *userdata) {
+sc_demuxer_on_eos(struct sc_demuxer *demuxer, void *userdata) {
     (void) demuxer;
     (void) userdata;
 
     PUSH_EVENT(EVENT_STREAM_STOPPED);
 }
 
-static void
-sc_audio_demuxer_on_eos(struct sc_demuxer *demuxer, void *userdata) {
-    (void) demuxer;
-    (void) userdata;
-
-    // TODO
-}
-
 static void
 sc_server_on_connection_failed(struct sc_server *server, void *userdata) {
     (void) server;
@@ -304,8 +295,7 @@ scrcpy(struct scrcpy_options *options) {
 #ifdef HAVE_V4L2
     bool v4l2_sink_initialized = false;
 #endif
-    bool video_demuxer_started = false;
-    bool audio_demuxer_started = false;
+    bool demuxer_started = false;
 #ifdef HAVE_USB
     bool aoa_hid_initialized = false;
     bool hid_keyboard_initialized = false;
@@ -325,7 +315,6 @@ scrcpy(struct scrcpy_options *options) {
         .select_usb = options->select_usb,
         .select_tcpip = options->select_tcpip,
         .log_level = options->log_level,
-        .codec = options->codec,
         .crop = options->crop,
         .port_range = options->port_range,
         .tunnel_host = options->tunnel_host,
@@ -336,7 +325,6 @@ scrcpy(struct scrcpy_options *options) {
         .lock_video_orientation = options->lock_video_orientation,
         .control = options->control,
         .display_id = options->display_id,
-        .audio = options->audio,
         .show_touches = options->show_touches,
         .stay_awake = options->stay_awake,
         .codec_options = options->codec_options,
@@ -431,26 +419,17 @@ scrcpy(struct scrcpy_options *options) {
 
     av_log_set_callback(av_log_callback);
 
-    static const struct sc_demuxer_callbacks video_demuxer_cbs = {
-        .on_eos = sc_video_demuxer_on_eos,
+    static const struct sc_demuxer_callbacks demuxer_cbs = {
+        .on_eos = sc_demuxer_on_eos,
     };
-    sc_demuxer_init(&s->video_demuxer, SC_STREAM_ID_VIDEO,
-                    s->server.video_socket, &video_demuxer_cbs, NULL);
-
-    if (options->audio) {
-        static const struct sc_demuxer_callbacks audio_demuxer_cbs = {
-            .on_eos = sc_audio_demuxer_on_eos,
-        };
-        sc_demuxer_init(&s->audio_demuxer, SC_STREAM_ID_AUDIO,
-                        s->server.audio_socket, &audio_demuxer_cbs, NULL);
-    }
+    sc_demuxer_init(&s->demuxer, s->server.video_socket, &demuxer_cbs, NULL);
 
     if (dec) {
-        sc_demuxer_add_sink(&s->video_demuxer, &dec->packet_sink);
+        sc_demuxer_add_sink(&s->demuxer, &dec->packet_sink);
     }
 
     if (rec) {
-        sc_demuxer_add_sink(&s->video_demuxer, &rec->packet_sink);
+        sc_demuxer_add_sink(&s->demuxer, &rec->packet_sink);
     }
 
     struct sc_controller *controller = NULL;
@@ -658,24 +637,17 @@ aoa_hid_end:
 #endif
 
     // now we consumed the header values, the socket receives the video stream
-    // start the video demuxer
-    if (!sc_demuxer_start(&s->video_demuxer)) {
+    // start the demuxer
+    if (!sc_demuxer_start(&s->demuxer)) {
         goto end;
     }
-    video_demuxer_started = true;
-
-    if (options->audio) {
-        if (!sc_demuxer_start(&s->audio_demuxer)) {
-            goto end;
-        }
-        audio_demuxer_started = true;
-    }
+    demuxer_started = true;
 
     ret = event_loop(s);
     LOGD("quit...");
 
     // Close the window immediately on closing, because screen_destroy() may
-    // only be called once the video demuxer thread is joined (it may take time)
+    // only be called once the demuxer thread is joined (it may take time)
     sc_screen_hide_window(&s->screen);
 
 end:
@@ -713,12 +685,8 @@ end:
 
     // now that the sockets are shutdown, the demuxer and controller are
     // interrupted, we can join them
-    if (video_demuxer_started) {
-        sc_demuxer_join(&s->video_demuxer);
-    }
-
-    if (audio_demuxer_started) {
-        sc_demuxer_join(&s->audio_demuxer);
+    if (demuxer_started) {
+        sc_demuxer_join(&s->demuxer);
     }
 
 #ifdef HAVE_V4L2
@@ -737,9 +705,8 @@ end:
     }
 #endif
 
-    // Destroy the screen only after the video demuxer is guaranteed to be
-    // finished, because otherwise the screen could receive new frames after
-    // destruction
+    // Destroy the screen only after the demuxer is guaranteed to be finished,
+    // because otherwise the screen could receive new frames after destruction
     if (screen_initialized) {
         sc_screen_join(&s->screen);
         sc_screen_destroy(&s->screen);

app/src/server.c

@@ -8,7 +8,6 @@
 #include <SDL2/SDL_platform.h>
 
 #include "adb/adb.h"
-#include "util/binary.h"
 #include "util/file.h"
 #include "util/log.h"
 #include "util/net_intr.h"
@@ -156,20 +155,6 @@ sc_server_sleep(struct sc_server *server, sc_tick deadline) {
     return !stopped;
 }
 
-static const char *
-sc_server_get_codec_name(enum sc_codec codec) {
-    switch (codec) {
-        case SC_CODEC_H264:
-            return "h264";
-        case SC_CODEC_H265:
-            return "h265";
-        case SC_CODEC_AV1:
-            return "av1";
-        default:
-            return NULL;
-    }
-}
-
 static sc_pid
 execute_server(struct sc_server *server,
                const struct sc_server_params *params) {
@@ -217,12 +202,6 @@ execute_server(struct sc_server *server,
     ADD_PARAM("log_level=%s", log_level_to_server_string(params->log_level));
     ADD_PARAM("bit_rate=%" PRIu32, params->bit_rate);
 
-    if (!params->audio) {
-        ADD_PARAM("audio=false");
-    }
-    if (params->codec != SC_CODEC_H264) {
-        ADD_PARAM("codec=%s", sc_server_get_codec_name(params->codec));
-    }
     if (params->max_size) {
         ADD_PARAM("max_size=%" PRIu16, params->max_size);
     }
@@ -391,7 +370,6 @@ sc_server_init(struct sc_server *server, const struct sc_server_params *params,
     server->stopped = false;
 
     server->video_socket = SC_SOCKET_NONE;
-    server->audio_socket = SC_SOCKET_NONE;
     server->control_socket = SC_SOCKET_NONE;
 
     sc_adb_tunnel_init(&server->tunnel);
@@ -420,9 +398,10 @@ device_read_info(struct sc_intr *intr, sc_socket device_socket,
     buf[SC_DEVICE_NAME_FIELD_LENGTH - 1] = '\0';
     memcpy(info->device_name, (char *) buf, sizeof(info->device_name));
 
-    unsigned char *fields = &buf[SC_DEVICE_NAME_FIELD_LENGTH];
-    info->frame_size.width = sc_read16be(fields);
-    info->frame_size.height = sc_read16be(&fields[2]);
+    info->frame_size.width = (buf[SC_DEVICE_NAME_FIELD_LENGTH] << 8)
+                           | buf[SC_DEVICE_NAME_FIELD_LENGTH + 1];
+    info->frame_size.height = (buf[SC_DEVICE_NAME_FIELD_LENGTH + 2] << 8)
+                            | buf[SC_DEVICE_NAME_FIELD_LENGTH + 3];
     return true;
 }
 
@@ -435,11 +414,9 @@ sc_server_connect_to(struct sc_server *server, struct sc_server_info *info) {
     const char *serial = server->serial;
     assert(serial);
 
-    bool audio = server->params.audio;
     bool control = server->params.control;
 
     sc_socket video_socket = SC_SOCKET_NONE;
-    sc_socket audio_socket = SC_SOCKET_NONE;
     sc_socket control_socket = SC_SOCKET_NONE;
     if (!tunnel->forward) {
         video_socket = net_accept_intr(&server->intr, tunnel->server_socket);
@@ -447,14 +424,6 @@ sc_server_connect_to(struct sc_server *server, struct sc_server_info *info) {
             goto fail;
         }
 
-        if (audio) {
-            audio_socket =
-                net_accept_intr(&server->intr, tunnel->server_socket);
-            if (audio_socket == SC_SOCKET_NONE) {
-                goto fail;
-            }
-        }
-
         if (control) {
             control_socket =
                 net_accept_intr(&server->intr, tunnel->server_socket);
@@ -481,18 +450,6 @@ sc_server_connect_to(struct sc_server *server, struct sc_server_info *info) {
             goto fail;
         }
 
-        if (audio) {
-            audio_socket = net_socket();
-            if (audio_socket == SC_SOCKET_NONE) {
-                goto fail;
-            }
-            bool ok = net_connect_intr(&server->intr, audio_socket, tunnel_host,
-                                       tunnel_port);
-            if (!ok) {
-                goto fail;
-            }
-        }
-
         if (control) {
             // we know that the device is listening, we don't need several
             // attempts
@@ -519,11 +476,9 @@ sc_server_connect_to(struct sc_server *server, struct sc_server_info *info) {
     }
 
     assert(video_socket != SC_SOCKET_NONE);
-    assert(!audio || audio_socket != SC_SOCKET_NONE);
     assert(!control || control_socket != SC_SOCKET_NONE);
 
     server->video_socket = video_socket;
-    server->audio_socket = audio_socket;
     server->control_socket = control_socket;
 
     return true;
@@ -535,12 +490,6 @@ fail:
         }
     }
 
-    if (audio_socket != SC_SOCKET_NONE) {
-        if (!net_close(audio_socket)) {
-            LOGW("Could not close audio socket");
-        }
-    }
-
     if (control_socket != SC_SOCKET_NONE) {
         if (!net_close(control_socket)) {
             LOGW("Could not close control socket");
@@ -886,11 +835,6 @@ run_server(void *data) {
     assert(server->video_socket != SC_SOCKET_NONE);
     net_interrupt(server->video_socket);
 
-    if (server->audio_socket != SC_SOCKET_NONE) {
-        // There is no audio_socket if --no-audio is set
-        net_interrupt(server->audio_socket);
-    }
-
     if (server->control_socket != SC_SOCKET_NONE) {
         // There is no control_socket if --no-control is set
         net_interrupt(server->control_socket);
@@ -952,9 +896,6 @@ sc_server_destroy(struct sc_server *server) {
     if (server->video_socket != SC_SOCKET_NONE) {
         net_close(server->video_socket);
     }
-    if (server->audio_socket != SC_SOCKET_NONE) {
-        net_close(server->audio_socket);
-    }
     if (server->control_socket != SC_SOCKET_NONE) {
         net_close(server->control_socket);
     }

app/src/server.h

@@ -25,7 +25,6 @@ struct sc_server_params {
     uint32_t uid;
     const char *req_serial;
     enum sc_log_level log_level;
-    enum sc_codec codec;
     const char *crop;
     const char *codec_options;
     const char *encoder_name;
@@ -38,7 +37,6 @@ struct sc_server_params {
     int8_t lock_video_orientation;
     bool control;
     uint32_t display_id;
-    bool audio;
     bool show_touches;
     bool stay_awake;
     bool force_adb_forward;
@@ -70,7 +68,6 @@ struct sc_server {
     struct sc_adb_tunnel tunnel;
 
     sc_socket video_socket;
-    sc_socket audio_socket;
     sc_socket control_socket;
 
     const struct sc_server_callbacks *cbs;

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

@@ -1,46 +0,0 @@
-package com.genymobile.scrcpy;
-
-import android.media.MediaFormat;
-
-public enum AudioCodec implements Codec {
-    OPUS(0x6f_70_75_73, "opus", MediaFormat.MIMETYPE_AUDIO_OPUS);
-
-    private final int id; // 4-byte ASCII representation of the name
-    private final String name;
-    private final String mimeType;
-
-    AudioCodec(int id, String name, String mimeType) {
-        this.id = id;
-        this.name = name;
-        this.mimeType = mimeType;
-    }
-
-    @Override
-    public Type getType() {
-        return Type.VIDEO;
-    }
-
-    @Override
-    public int getId() {
-        return id;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public String getMimeType() {
-        return mimeType;
-    }
-
-    public static AudioCodec findByName(String name) {
-        for (AudioCodec codec : values()) {
-            if (codec.name.equals(name)) {
-                return codec;
-            }
-        }
-        return null;
-    }
-}

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

@@ -1,73 +1,23 @@
 package com.genymobile.scrcpy;
 
+import com.genymobile.scrcpy.wrappers.ServiceManager;
+
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
+import android.content.ComponentName;
+import android.content.Intent;
 import android.media.AudioFormat;
 import android.media.AudioRecord;
-import android.media.AudioTimestamp;
-import android.media.MediaCodec;
-import android.media.MediaFormat;
 import android.media.MediaRecorder;
 import android.os.Build;
-import android.os.Handler;
-import android.os.HandlerThread;
 import android.os.SystemClock;
 
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 public final class AudioEncoder {
 
-    private static class InputTask {
-        final int index;
-
-        InputTask(int index) {
-            this.index = index;
-        }
-    }
-
-    private static class OutputTask {
-        final int index;
-        final MediaCodec.BufferInfo bufferInfo;
-
-        OutputTask(int index, MediaCodec.BufferInfo bufferInfo) {
-            this.index = index;
-            this.bufferInfo = bufferInfo;
-        }
-    }
-
-    private static final String MIMETYPE = MediaFormat.MIMETYPE_AUDIO_OPUS;
     private static final int SAMPLE_RATE = 48000;
     private static final int CHANNELS = 2;
-    private static final int BIT_RATE = 128000;
-
-    private static int BUFFER_MS = 15; // milliseconds
-    private static final int BUFFER_SIZE = SAMPLE_RATE * CHANNELS * BUFFER_MS / 1000;
-
-    private final Streamer streamer;
-
-    private AudioRecord recorder;
-    private MediaCodec mediaCodec;
-
-    // Capacity of 64 is in practice "infinite" (it is limited by the number of available MediaCodec buffers, typically 4).
-    // So many pending tasks would lead to an unacceptable delay anyway.
-    private final BlockingQueue<InputTask> inputTasks = new ArrayBlockingQueue<>(64);
-    private final BlockingQueue<OutputTask> outputTasks = new ArrayBlockingQueue<>(64);
 
     private Thread thread;
-    private HandlerThread mediaCodecThread;
-
-    private Thread inputThread;
-    private Thread outputThread;
-
-    private boolean ended;
-
-    public AudioEncoder(Streamer streamer) {
-        this.streamer = streamer;
-    }
 
     private static AudioFormat createAudioFormat() {
         AudioFormat.Builder builder = new AudioFormat.Builder();
@@ -91,82 +41,25 @@ public final class AudioEncoder {
         return builder.build();
     }
 
-    private static MediaFormat createFormat() {
-        MediaFormat format = new MediaFormat();
-        format.setString(MediaFormat.KEY_MIME, MIMETYPE);
-        format.setInteger(MediaFormat.KEY_BIT_RATE, BIT_RATE);
-        format.setInteger(MediaFormat.KEY_CHANNEL_COUNT, CHANNELS);
-        format.setInteger(MediaFormat.KEY_SAMPLE_RATE, SAMPLE_RATE);
-        return format;
-    }
-
-    @TargetApi(Build.VERSION_CODES.N)
-    private void inputThread() throws IOException, InterruptedException {
-        final AudioTimestamp timestamp = new AudioTimestamp();
-        long previousPts = 0;
-        long nextPts = 0;
-
-        while (!Thread.currentThread().isInterrupted()) {
-            InputTask task = inputTasks.take();
-            ByteBuffer buffer = mediaCodec.getInputBuffer(task.index);
-            int r = recorder.read(buffer, BUFFER_SIZE);
-            if (r < 0) {
-                throw new IOException("Could not read audio: " + r);
-            }
-
-            long pts;
-
-            int ret = recorder.getTimestamp(timestamp, AudioTimestamp.TIMEBASE_MONOTONIC);
-            if (ret == AudioRecord.SUCCESS) {
-                pts = timestamp.nanoTime / 1000;
-            } else {
-                if (nextPts == 0) {
-                    Ln.w("Could not get any audio timestamp");
-                }
-                // compute from previous timestamp and packet size
-                pts = nextPts;
-            }
-
-            long durationMs = r * 1000 / CHANNELS / SAMPLE_RATE;
-            nextPts = pts + durationMs;
-
-            if (previousPts != 0 && pts < previousPts) {
-                // Audio PTS may come from two sources:
-                //  - recorder.getTimestamp() if the call works;
-                //  - an estimation from the previous PTS and the packet size as a fallback.
-                //
-                // Therefore, the property that PTS are monotonically increasing is no guaranteed in corner cases, so enforce it.
-                pts = previousPts + 1;
-            }
-
-            mediaCodec.queueInputBuffer(task.index, 0, r, pts, 0);
-
-            previousPts = pts;
-        }
-    }
-
-    private void outputThread() throws IOException, InterruptedException {
-        streamer.writeHeader();
-
-        while (!Thread.currentThread().isInterrupted()) {
-            OutputTask task = outputTasks.take();
-            ByteBuffer buffer = mediaCodec.getOutputBuffer(task.index);
-            try {
-                streamer.writePacket(buffer, task.bufferInfo);
-            } finally {
-                mediaCodec.releaseOutputBuffer(task.index, false);
-            }
-        }
-    }
-
     public void start() {
+        AudioRecord recorder = createAudioRecord();
+
         thread = new Thread(() -> {
+            recorder.startRecording();
             try {
-                encode();
-            } catch (IOException e) {
-                // this is expected on close
+                int BUFFER_MS = 15; // do not buffer more than BUFFER_MS milliseconds
+                byte[] buf = new byte[SAMPLE_RATE * CHANNELS * BUFFER_MS / 1000];
+                while (!Thread.currentThread().isInterrupted()) {
+                    int r = recorder.read(buf, 0, buf.length);
+                    if (r > 0) {
+                        Ln.i("Audio captured: " + r + " bytes");
+                    }
+                    if (r < 0) {
+                        Ln.e("Audio capture error: " + r);
+                    }
+                }
             } finally {
-                Ln.d("Audio encoder stopped");
+                recorder.stop();
             }
         });
         thread.start();
@@ -174,135 +67,8 @@ public final class AudioEncoder {
 
     public void stop() {
         if (thread != null) {
-            // Just wake up the blocking wait from the thread, so that it properly releases all its resources and terminates
-            end();
-        }
-    }
-
-    public void join() throws InterruptedException {
-        if (thread != null) {
-            thread.join();
-        }
-    }
-
-    private synchronized void end() {
-        ended = true;
-        notify();
-    }
-
-    private synchronized void waitEnded() {
-        try {
-            while (!ended) {
-                wait();
-            }
-        } catch (InterruptedException e) {
-            // ignore
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.M)
-    public void encode() throws IOException {
-        mediaCodec = MediaCodec.createEncoderByType(MIMETYPE); // may throw IOException
-
-        try {
-            recorder = createAudioRecord();
-
-            mediaCodecThread = new HandlerThread("AudioEncoder");
-            mediaCodecThread.start();
-
-            MediaFormat format = createFormat();
-            mediaCodec.setCallback(new EncoderCallback(), new Handler(mediaCodecThread.getLooper()));
-            mediaCodec.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
-
-            recorder.startRecording();
-
-            inputThread = new Thread(() -> {
-                try {
-                    inputThread();
-                } catch (IOException | InterruptedException e) {
-                    // this is expected on close
-                } finally {
-                    end();
-                }
-            });
-
-            outputThread = new Thread(() -> {
-                try {
-                    outputThread();
-                } catch (IOException | InterruptedException e) {
-                    // this is expected on close
-                } finally {
-                    end();
-                }
-            });
-
-            mediaCodec.start();
-            inputThread.start();
-            outputThread.start();
-        } catch (Throwable e) {
-            mediaCodec.release();
-            if (recorder != null) {
-                recorder.release();
-            }
-            throw e;
-        }
-
-        try {
-            waitEnded();
-        } finally {
-            cleanUp();
-        }
-    }
-
-    private void cleanUp() {
-        mediaCodecThread.getLooper().quit();
-        inputThread.interrupt();
-        outputThread.interrupt();
-
-        try {
-            mediaCodecThread.join();
-            inputThread.join();
-            outputThread.join();
-        } catch (InterruptedException e) {
-            // Should never happen
-            throw new AssertionError(e);
-        }
-
-        mediaCodec.stop();
-        mediaCodec.release();
-        recorder.stop();
-        recorder.release();
-    }
-
-    private class EncoderCallback extends MediaCodec.Callback {
-        @TargetApi(Build.VERSION_CODES.N)
-        @Override
-        public void onInputBufferAvailable(MediaCodec codec, int index) {
-            try {
-                inputTasks.put(new InputTask(index));
-            } catch (InterruptedException e) {
-                end();
-            }
-        }
-
-        @Override
-        public void onOutputBufferAvailable(MediaCodec codec, int index, MediaCodec.BufferInfo bufferInfo) {
-            try {
-                outputTasks.put(new OutputTask(index, bufferInfo));
-            } catch (InterruptedException e) {
-                end();
-            }
-        }
-
-        @Override
-        public void onError(MediaCodec codec, MediaCodec.CodecException e) {
-            Ln.e("MediaCodec error", e);
-            end();
-        }
-
-        @Override
-        public void onOutputFormatChanged(MediaCodec codec, MediaFormat format) {
-            // ignore
+            thread.interrupt();
+            thread = null;
         }
     }
 }

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

@@ -1,11 +0,0 @@
-package com.genymobile.scrcpy;
-
-public interface Codec {
-
-    enum Type {VIDEO}
-
-    Type getType();
-    int getId();
-    String getName();
-    String getMimeType();
-}

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

@@ -90,7 +90,6 @@ public class Controller {
                 control();
             } catch (IOException e) {
                 // this is expected on close
-            } finally {
                 Ln.d("Controller stopped");
             }
         });
@@ -101,17 +100,11 @@ public class Controller {
     public void stop() {
         if (thread != null) {
             thread.interrupt();
+            thread = null;
         }
         sender.stop();
     }
 
-    public void join() throws InterruptedException {
-        if (thread != null) {
-            thread.join();
-        }
-        sender.join();
-    }
-
     public DeviceMessageSender getSender() {
         return sender;
     }

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

@@ -20,9 +20,6 @@ public final class DesktopConnection implements Closeable {
     private final LocalSocket videoSocket;
     private final FileDescriptor videoFd;
 
-    private final LocalSocket audioSocket;
-    private final FileDescriptor audioFd;
-
     private final LocalSocket controlSocket;
     private final InputStream controlInputStream;
     private final OutputStream controlOutputStream;
@@ -30,10 +27,9 @@ public final class DesktopConnection implements Closeable {
     private final ControlMessageReader reader = new ControlMessageReader();
     private final DeviceMessageWriter writer = new DeviceMessageWriter();
 
-    private DesktopConnection(LocalSocket videoSocket, LocalSocket audioSocket, LocalSocket controlSocket) throws IOException {
+    private DesktopConnection(LocalSocket videoSocket, LocalSocket controlSocket) throws IOException {
         this.videoSocket = videoSocket;
         this.controlSocket = controlSocket;
-        this.audioSocket = audioSocket;
         if (controlSocket != null) {
             controlInputStream = controlSocket.getInputStream();
             controlOutputStream = controlSocket.getOutputStream();
@@ -42,7 +38,6 @@ public final class DesktopConnection implements Closeable {
             controlOutputStream = null;
         }
         videoFd = videoSocket.getFileDescriptor();
-        audioFd = audioSocket != null ? audioSocket.getFileDescriptor() : null;
     }
 
     private static LocalSocket connect(String abstractName) throws IOException {
@@ -60,50 +55,40 @@ public final class DesktopConnection implements Closeable {
         return SOCKET_NAME_PREFIX + String.format("_%08x", uid);
     }
 
-    public static DesktopConnection open(int uid, boolean tunnelForward, boolean audio, boolean control, boolean sendDummyByte) throws IOException {
+    public static DesktopConnection open(int uid, boolean tunnelForward, boolean control, boolean sendDummyByte) throws IOException {
         String socketName = getSocketName(uid);
 
-        LocalSocket videoSocket = null;
-        LocalSocket audioSocket = null;
+        LocalSocket videoSocket;
         LocalSocket controlSocket = null;
-        try {
-            if (tunnelForward) {
-                try (LocalServerSocket localServerSocket = new LocalServerSocket(socketName)) {
-                    videoSocket = localServerSocket.accept();
-                    if (sendDummyByte) {
-                        // send one byte so the client may read() to detect a connection error
-                        videoSocket.getOutputStream().write(0);
-                    }
-                    if (audio) {
-                        audioSocket = localServerSocket.accept();
-                    }
-                    if (control) {
-                        controlSocket = localServerSocket.accept();
-                    }
-                }
-            } else {
-                videoSocket = connect(socketName);
-                if (audio) {
-                    audioSocket = connect(socketName);
+        if (tunnelForward) {
+            try (LocalServerSocket localServerSocket = new LocalServerSocket(socketName)) {
+                videoSocket = localServerSocket.accept();
+                if (sendDummyByte) {
+                    // send one byte so the client may read() to detect a connection error
+                    videoSocket.getOutputStream().write(0);
                 }
                 if (control) {
-                    controlSocket = connect(socketName);
+                    try {
+                        controlSocket = localServerSocket.accept();
+                    } catch (IOException | RuntimeException e) {
+                        videoSocket.close();
+                        throw e;
+                    }
                 }
             }
-        } catch (IOException | RuntimeException e) {
-            if (videoSocket != null) {
-                videoSocket.close();
+        } else {
+            videoSocket = connect(socketName);
+            if (control) {
+                try {
+                    controlSocket = connect(socketName);
+                } catch (IOException | RuntimeException e) {
+                    videoSocket.close();
+                    throw e;
+                }
             }
-            if (audioSocket != null) {
-                audioSocket.close();
-            }
-            if (controlSocket != null) {
-                controlSocket.close();
-            }
-            throw e;
         }
 
-        return new DesktopConnection(videoSocket, audioSocket, controlSocket);
+        return new DesktopConnection(videoSocket, controlSocket);
     }
 
     public void close() throws IOException {
@@ -136,10 +121,6 @@ public final class DesktopConnection implements Closeable {
         return videoFd;
     }
 
-    public FileDescriptor getAudioFd() {
-        return audioFd;
-    }
-
     public ControlMessage receiveControlMessage() throws IOException {
         ControlMessage msg = reader.next();
         while (msg == null) {

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

@@ -277,26 +277,6 @@ public final class Device {
      * @param mode one of the {@code POWER_MODE_*} constants
      */
     public static boolean setScreenPowerMode(int mode) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            // Change the power mode for all physical displays
-            long[] physicalDisplayIds = SurfaceControl.getPhysicalDisplayIds();
-            if (physicalDisplayIds == null) {
-                Ln.e("Could not get physical display ids");
-                return false;
-            }
-
-            boolean allOk = true;
-            for (long physicalDisplayId : physicalDisplayIds) {
-                IBinder binder = SurfaceControl.getPhysicalDisplayToken(physicalDisplayId);
-                boolean ok = SurfaceControl.setDisplayPowerMode(binder, mode);
-                if (!ok) {
-                    allOk = false;
-                }
-            }
-            return allOk;
-        }
-
-        // Older Android versions, only 1 display
         IBinder d = SurfaceControl.getBuiltInDisplay();
         if (d == null) {
             Ln.e("Could not get built-in display");

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

@@ -57,7 +57,6 @@ public final class DeviceMessageSender {
                 loop();
             } catch (IOException | InterruptedException e) {
                 // this is expected on close
-            } finally {
                 Ln.d("Device message sender stopped");
             }
         });
@@ -67,12 +66,7 @@ public final class DeviceMessageSender {
     public void stop() {
         if (thread != null) {
             thread.interrupt();
-        }
-    }
-
-    public void join() throws InterruptedException {
-        if (thread != null) {
-            thread.join();
+            thread = null;
         }
     }
 }

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

@@ -5,12 +5,9 @@ import android.graphics.Rect;
 import java.util.List;
 
 public class Options {
-
     private Ln.Level logLevel = Ln.Level.DEBUG;
     private int uid = -1; // 31-bit non-negative value, or -1
-    private boolean audio = true;
     private int maxSize;
-    private VideoCodec codec = VideoCodec.H264;
     private int bitRate = 8000000;
     private int maxFps;
     private int lockVideoOrientation = -1;
@@ -32,7 +29,6 @@ public class Options {
     private boolean sendDeviceMeta = true; // send device name and size
     private boolean sendFrameMeta = true; // send PTS so that the client may record properly
     private boolean sendDummyByte = true; // write a byte on start to detect connection issues
-    private boolean sendCodecId = true; // write the codec ID (4 bytes) before the stream
 
     public Ln.Level getLogLevel() {
         return logLevel;
@@ -50,14 +46,6 @@ public class Options {
         this.uid = uid;
     }
 
-    public boolean getAudio() {
-        return audio;
-    }
-
-    public void setAudio(boolean audio) {
-        this.audio = audio;
-    }
-
     public int getMaxSize() {
         return maxSize;
     }
@@ -66,14 +54,6 @@ public class Options {
         this.maxSize = maxSize;
     }
 
-    public VideoCodec getCodec() {
-        return codec;
-    }
-
-    public void setCodec(VideoCodec codec) {
-        this.codec = codec;
-    }
-
     public int getBitRate() {
         return bitRate;
     }
@@ -225,12 +205,4 @@ public class Options {
     public void setSendDummyByte(boolean sendDummyByte) {
         this.sendDummyByte = sendDummyByte;
     }
-
-    public boolean getSendCodecId() {
-        return sendCodecId;
-    }
-
-    public void setSendCodecId(boolean sendCodecId) {
-        this.sendCodecId = sendCodecId;
-    }
 }

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

@@ -12,6 +12,7 @@ import android.os.IBinder;
 import android.os.SystemClock;
 import android.view.Surface;
 
+import java.io.FileDescriptor;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -29,23 +30,25 @@ public class ScreenEncoder implements Device.RotationListener {
     private static final int[] MAX_SIZE_FALLBACK = {2560, 1920, 1600, 1280, 1024, 800};
     private static final int MAX_CONSECUTIVE_ERRORS = 3;
 
-    private final AtomicBoolean rotationChanged = new AtomicBoolean();
+    private static final long PACKET_FLAG_CONFIG = 1L << 63;
+    private static final long PACKET_FLAG_KEY_FRAME = 1L << 62;
+
+    private final AtomicBoolean rotationChanged = new AtomicBoolean();
+    private final ByteBuffer headerBuffer = ByteBuffer.allocate(12);
 
-    private final Device device;
-    private final Streamer streamer;
     private final String encoderName;
     private final List<CodecOption> codecOptions;
     private final int bitRate;
     private final int maxFps;
+    private final boolean sendFrameMeta;
     private final boolean downsizeOnError;
 
     private boolean firstFrameSent;
     private int consecutiveErrors;
 
-    public ScreenEncoder(Device device, Streamer streamer, int bitRate, int maxFps, List<CodecOption> codecOptions,
-            String encoderName, boolean downsizeOnError) {
-        this.device = device;
-        this.streamer = streamer;
+    public ScreenEncoder(boolean sendFrameMeta, int bitRate, int maxFps, List<CodecOption> codecOptions, String encoderName,
+            boolean downsizeOnError) {
+        this.sendFrameMeta = sendFrameMeta;
         this.bitRate = bitRate;
         this.maxFps = maxFps;
         this.codecOptions = codecOptions;
@@ -62,15 +65,11 @@ public class ScreenEncoder implements Device.RotationListener {
         return rotationChanged.getAndSet(false);
     }
 
-    public void streamScreen() throws IOException {
-        String videoMimeType = streamer.getCodec().getMimeType();
-        MediaCodec codec = createCodec(videoMimeType, encoderName);
-        MediaFormat format = createFormat(videoMimeType, bitRate, maxFps, codecOptions);
+    public void streamScreen(Device device, FileDescriptor fd) throws IOException {
+        MediaCodec codec = createCodec(encoderName);
+        MediaFormat format = createFormat(bitRate, maxFps, codecOptions);
         IBinder display = createDisplay();
         device.setRotationListener(this);
-
-        streamer.writeHeader();
-
         boolean alive;
         try {
             do {
@@ -95,7 +94,7 @@ public class ScreenEncoder implements Device.RotationListener {
 
                     codec.start();
 
-                    alive = encode(codec, streamer);
+                    alive = encode(codec, fd);
                     // do not call stop() on exception, it would trigger an IllegalStateException
                     codec.stop();
                 } catch (IllegalStateException | IllegalArgumentException e) {
@@ -164,30 +163,31 @@ public class ScreenEncoder implements Device.RotationListener {
         return 0;
     }
 
-    private boolean encode(MediaCodec codec, Streamer streamer) throws IOException {
+    private boolean encode(MediaCodec codec, FileDescriptor fd) throws IOException {
         boolean eof = false;
         MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();
 
         while (!consumeRotationChange() && !eof) {
             int outputBufferId = codec.dequeueOutputBuffer(bufferInfo, -1);
+            eof = (bufferInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0;
             try {
                 if (consumeRotationChange()) {
                     // must restart encoding with new size
                     break;
                 }
-
-                eof = (bufferInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0;
                 if (outputBufferId >= 0) {
                     ByteBuffer codecBuffer = codec.getOutputBuffer(outputBufferId);
 
-                    boolean isConfig = (bufferInfo.flags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0;
-                    if (!isConfig) {
+                    if (sendFrameMeta) {
+                        writeFrameMeta(fd, bufferInfo, codecBuffer.remaining());
+                    }
+
+                    IO.writeFully(fd, codecBuffer);
+                    if ((bufferInfo.flags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) == 0) {
                         // If this is not a config packet, then it contains a frame
                         firstFrameSent = true;
                         consecutiveErrors = 0;
                     }
-
-                    streamer.writePacket(codecBuffer, bufferInfo);
                 }
             } finally {
                 if (outputBufferId >= 0) {
@@ -199,28 +199,47 @@ public class ScreenEncoder implements Device.RotationListener {
         return !eof;
     }
 
-    private static MediaCodecInfo[] listEncoders(String videoMimeType) {
+    private void writeFrameMeta(FileDescriptor fd, MediaCodec.BufferInfo bufferInfo, int packetSize) throws IOException {
+        headerBuffer.clear();
+
+        long pts;
+        if ((bufferInfo.flags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0) {
+            pts = PACKET_FLAG_CONFIG; // non-media data packet
+        } else {
+            pts = bufferInfo.presentationTimeUs;
+            if ((bufferInfo.flags & MediaCodec.BUFFER_FLAG_KEY_FRAME) != 0) {
+                pts |= PACKET_FLAG_KEY_FRAME;
+            }
+        }
+
+        headerBuffer.putLong(pts);
+        headerBuffer.putInt(packetSize);
+        headerBuffer.flip();
+        IO.writeFully(fd, headerBuffer);
+    }
+
+    private static MediaCodecInfo[] listEncoders() {
         List<MediaCodecInfo> result = new ArrayList<>();
         MediaCodecList list = new MediaCodecList(MediaCodecList.REGULAR_CODECS);
         for (MediaCodecInfo codecInfo : list.getCodecInfos()) {
-            if (codecInfo.isEncoder() && Arrays.asList(codecInfo.getSupportedTypes()).contains(videoMimeType)) {
+            if (codecInfo.isEncoder() && Arrays.asList(codecInfo.getSupportedTypes()).contains(MediaFormat.MIMETYPE_VIDEO_AVC)) {
                 result.add(codecInfo);
             }
         }
         return result.toArray(new MediaCodecInfo[result.size()]);
     }
 
-    private static MediaCodec createCodec(String videoMimeType, String encoderName) throws IOException {
+    private static MediaCodec createCodec(String encoderName) throws IOException {
         if (encoderName != null) {
             Ln.d("Creating encoder by name: '" + encoderName + "'");
             try {
                 return MediaCodec.createByCodecName(encoderName);
             } catch (IllegalArgumentException e) {
-                MediaCodecInfo[] encoders = listEncoders(videoMimeType);
+                MediaCodecInfo[] encoders = listEncoders();
                 throw new InvalidEncoderException(encoderName, encoders);
             }
         }
-        MediaCodec codec = MediaCodec.createEncoderByType(videoMimeType);
+        MediaCodec codec = MediaCodec.createEncoderByType(MediaFormat.MIMETYPE_VIDEO_AVC);
         Ln.d("Using encoder: '" + codec.getName() + "'");
         return codec;
     }
@@ -242,9 +261,9 @@ public class ScreenEncoder implements Device.RotationListener {
         Ln.d("Codec option set: " + key + " (" + value.getClass().getSimpleName() + ") = " + value);
     }
 
-    private static MediaFormat createFormat(String videoMimeType, int bitRate, int maxFps, List<CodecOption> codecOptions) {
+    private static MediaFormat createFormat(int bitRate, int maxFps, List<CodecOption> codecOptions) {
         MediaFormat format = new MediaFormat();
-        format.setString(MediaFormat.KEY_MIME, videoMimeType);
+        format.setString(MediaFormat.KEY_MIME, MediaFormat.MIMETYPE_VIDEO_AVC);
         format.setInteger(MediaFormat.KEY_BIT_RATE, bitRate);
         // must be present to configure the encoder, but does not impact the actual frame rate, which is variable
         format.setInteger(MediaFormat.KEY_FRAME_RATE, 60);

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

@@ -4,6 +4,7 @@ import android.graphics.Rect;
 import android.media.MediaCodecInfo;
 import android.os.BatteryManager;
 import android.os.Build;
+import android.provider.MediaStore;
 
 import java.io.IOException;
 import java.util.List;
@@ -69,19 +70,13 @@ public final class Server {
         int uid = options.getUid();
         boolean tunnelForward = options.isTunnelForward();
         boolean control = options.getControl();
-        boolean audio = options.getAudio();
+        boolean audio = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R; // TODO option
         boolean sendDummyByte = options.getSendDummyByte();
 
         Workarounds.prepareMainLooper();
 
-        // Workarounds must be applied for Meizu phones:
-        //  - <https://github.com/Genymobile/scrcpy/issues/240>
-        //  - <https://github.com/Genymobile/scrcpy/issues/365>
-        //  - <https://github.com/Genymobile/scrcpy/issues/2656>
-        //
-        // But only apply when strictly necessary, since workarounds can cause other issues:
-        //  - <https://github.com/Genymobile/scrcpy/issues/940>
-        //  - <https://github.com/Genymobile/scrcpy/issues/994>
+        // <https://github.com/Genymobile/scrcpy/issues/240>
+        // <https://github.com/Genymobile/scrcpy/issues/2656>
         boolean mustFillAppInfo = Build.BRAND.equalsIgnoreCase("meizu");
 
         // Before Android 11, audio is not supported.
@@ -93,12 +88,13 @@ public final class Server {
             Workarounds.fillAppInfo();
         }
 
-        try (DesktopConnection connection = DesktopConnection.open(uid, tunnelForward, audio, control, sendDummyByte)) {
-            VideoCodec codec = options.getCodec();
+        try (DesktopConnection connection = DesktopConnection.open(uid, tunnelForward, control, sendDummyByte)) {
             if (options.getSendDeviceMeta()) {
                 Size videoSize = device.getScreenInfo().getVideoSize();
                 connection.sendDeviceMeta(Device.getDeviceName(), videoSize.getWidth(), videoSize.getHeight());
             }
+            ScreenEncoder screenEncoder = new ScreenEncoder(options.getSendFrameMeta(), options.getBitRate(), options.getMaxFps(), codecOptions,
+                    options.getEncoderName(), options.getDownsizeOnError());
 
             Controller controller = null;
             if (control) {
@@ -111,39 +107,23 @@ public final class Server {
 
             AudioEncoder audioEncoder = null;
             if (audio) {
-                Streamer audioStreamer = new Streamer(connection.getAudioFd(), AudioCodec.OPUS, options.getSendCodecId(), options.getSendFrameMeta());
-                audioEncoder = new AudioEncoder(audioStreamer);
+                audioEncoder = new AudioEncoder();
                 audioEncoder.start();
             }
 
-            Streamer videoStreamer = new Streamer(connection.getVideoFd(), codec, options.getSendCodecId(), options.getSendFrameMeta());
-            ScreenEncoder screenEncoder = new ScreenEncoder(device, videoStreamer, options.getBitRate(), options.getMaxFps(),
-                    codecOptions, options.getEncoderName(), options.getDownsizeOnError());
             try {
                 // synchronous
-                screenEncoder.streamScreen();
+                screenEncoder.streamScreen(device, connection.getVideoFd());
             } catch (IOException e) {
                 // this is expected on close
-            } finally {
                 Ln.d("Screen streaming stopped");
+            } finally {
                 initThread.interrupt();
-                if (audioEncoder != null) {
-                    audioEncoder.stop();
-                }
                 if (controller != null) {
                     controller.stop();
                 }
-
-                try {
-                    initThread.join();
-                    if (audioEncoder != null) {
-                        audioEncoder.join();
-                    }
-                    if (controller != null) {
-                        controller.join();
-                    }
-                } catch (InterruptedException e) {
-                    // ignore
+                if (audioEncoder != null) {
+                    audioEncoder.stop();
                 }
             }
         }
@@ -188,17 +168,6 @@ public final class Server {
                     Ln.Level level = Ln.Level.valueOf(value.toUpperCase(Locale.ENGLISH));
                     options.setLogLevel(level);
                     break;
-                case "audio":
-                    boolean audio = Boolean.parseBoolean(value);
-                    options.setAudio(audio);
-                    break;
-                case "codec":
-                    VideoCodec codec = VideoCodec.findByName(value);
-                    if (codec == null) {
-                        throw new IllegalArgumentException("Video codec " + value + " not supported");
-                    }
-                    options.setCodec(codec);
-                    break;
                 case "max_size":
                     int maxSize = Integer.parseInt(value) & ~7; // multiple of 8
                     options.setMaxSize(maxSize);
@@ -280,17 +249,12 @@ public final class Server {
                     boolean sendDummyByte = Boolean.parseBoolean(value);
                     options.setSendDummyByte(sendDummyByte);
                     break;
-                case "send_codec_id":
-                    boolean sendCodecId = Boolean.parseBoolean(value);
-                    options.setSendCodecId(sendCodecId);
-                    break;
                 case "raw_video_stream":
                     boolean rawVideoStream = Boolean.parseBoolean(value);
                     if (rawVideoStream) {
                         options.setSendDeviceMeta(false);
                         options.setSendFrameMeta(false);
                         options.setSendDummyByte(false);
-                        options.setSendCodecId(false);
                     }
                     break;
                 default:

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

@@ -1,67 +0,0 @@
-package com.genymobile.scrcpy;
-
-import android.media.MediaCodec;
-
-import java.io.FileDescriptor;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-public final class Streamer {
-
-    private static final long PACKET_FLAG_CONFIG = 1L << 63;
-    private static final long PACKET_FLAG_KEY_FRAME = 1L << 62;
-
-    private final FileDescriptor fd;
-    private final Codec codec;
-    private final boolean sendCodecId;
-    private final boolean sendFrameMeta;
-
-    private final ByteBuffer headerBuffer = ByteBuffer.allocate(12);
-
-    public Streamer(FileDescriptor fd, Codec codec, boolean sendCodecId, boolean sendFrameMeta) {
-        this.fd = fd;
-        this.codec = codec;
-        this.sendCodecId = sendCodecId;
-        this.sendFrameMeta = sendFrameMeta;
-    }
-
-    public Codec getCodec() {
-        return codec;
-    }
-
-    public void writeHeader() throws IOException {
-        if (sendCodecId) {
-            ByteBuffer buffer = ByteBuffer.allocate(4);
-            buffer.putInt(codec.getId());
-            buffer.flip();
-            IO.writeFully(fd, buffer);
-        }
-    }
-
-    public void writePacket(ByteBuffer codecBuffer, MediaCodec.BufferInfo bufferInfo) throws IOException {
-        if (sendFrameMeta) {
-            writeFrameMeta(fd, bufferInfo, codecBuffer.remaining());
-        }
-
-        IO.writeFully(fd, codecBuffer);
-    }
-
-    private void writeFrameMeta(FileDescriptor fd, MediaCodec.BufferInfo bufferInfo, int packetSize) throws IOException {
-        headerBuffer.clear();
-
-        long ptsAndFlags;
-        if ((bufferInfo.flags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0) {
-            ptsAndFlags = PACKET_FLAG_CONFIG; // non-media data packet
-        } else {
-            ptsAndFlags = bufferInfo.presentationTimeUs;
-            if ((bufferInfo.flags & MediaCodec.BUFFER_FLAG_KEY_FRAME) != 0) {
-                ptsAndFlags |= PACKET_FLAG_KEY_FRAME;
-            }
-        }
-
-        headerBuffer.putLong(ptsAndFlags);
-        headerBuffer.putInt(packetSize);
-        headerBuffer.flip();
-        IO.writeFully(fd, headerBuffer);
-    }
-}

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

@@ -1,48 +0,0 @@
-package com.genymobile.scrcpy;
-
-import android.media.MediaFormat;
-
-public enum VideoCodec implements Codec {
-    H264(0x68_32_36_34, "h264", MediaFormat.MIMETYPE_VIDEO_AVC),
-    H265(0x68_32_36_35, "h265", MediaFormat.MIMETYPE_VIDEO_HEVC),
-    AV1(0x00_61_76_31, "av1", MediaFormat.MIMETYPE_VIDEO_AV1);
-
-    private final int id; // 4-byte ASCII representation of the name
-    private final String name;
-    private final String mimeType;
-
-    VideoCodec(int id, String name, String mimeType) {
-        this.id = id;
-        this.name = name;
-        this.mimeType = mimeType;
-    }
-
-    @Override
-    public Type getType() {
-        return Type.VIDEO;
-    }
-
-    @Override
-    public int getId() {
-        return id;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public String getMimeType() {
-        return mimeType;
-    }
-
-    public static VideoCodec findByName(String name) {
-        for (VideoCodec codec : values()) {
-            if (codec.name.equals(name)) {
-                return codec;
-            }
-        }
-        return null;
-    }
-}

server/src/main/java/com/genymobile/scrcpy/wrappers/SurfaceControl.java

@@ -30,8 +30,6 @@ public final class SurfaceControl {
 
     private static Method getBuiltInDisplayMethod;
     private static Method setDisplayPowerModeMethod;
-    private static Method getPhysicalDisplayTokenMethod;
-    private static Method getPhysicalDisplayIdsMethod;
 
     private SurfaceControl() {
         // only static methods
@@ -100,6 +98,7 @@ public final class SurfaceControl {
     }
 
     public static IBinder getBuiltInDisplay() {
+
         try {
             Method method = getGetBuiltInDisplayMethod();
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
@@ -115,40 +114,6 @@ public final class SurfaceControl {
         }
     }
 
-    private static Method getGetPhysicalDisplayTokenMethod() throws NoSuchMethodException {
-        if (getPhysicalDisplayTokenMethod == null) {
-            getPhysicalDisplayTokenMethod = CLASS.getMethod("getPhysicalDisplayToken", long.class);
-        }
-        return getPhysicalDisplayTokenMethod;
-    }
-
-    public static IBinder getPhysicalDisplayToken(long physicalDisplayId) {
-        try {
-            Method method = getGetPhysicalDisplayTokenMethod();
-            return (IBinder) method.invoke(null, physicalDisplayId);
-        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
-            Ln.e("Could not invoke method", e);
-            return null;
-        }
-    }
-
-    private static Method getGetPhysicalDisplayIdsMethod() throws NoSuchMethodException {
-        if (getPhysicalDisplayIdsMethod == null) {
-            getPhysicalDisplayIdsMethod = CLASS.getMethod("getPhysicalDisplayIds");
-        }
-        return getPhysicalDisplayIdsMethod;
-    }
-
-    public static long[] getPhysicalDisplayIds() {
-        try {
-            Method method = getGetPhysicalDisplayIdsMethod();
-            return (long[]) method.invoke(null);
-        } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
-            Ln.e("Could not invoke method", e);
-            return null;
-        }
-    }
-
     private static Method getSetDisplayPowerModeMethod() throws NoSuchMethodException {
         if (setDisplayPowerModeMethod == null) {
             setDisplayPowerModeMethod = CLASS.getMethod("setDisplayPowerMode", IBinder.class, int.class);