Compare commits
4 Commits
camera
...
pause_on_e
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1c864a88eb | ||
|
|
1650b7c058 | ||
|
|
a7c3c9a54c | ||
|
|
111d02fca4 |
@@ -44,6 +44,8 @@ _scrcpy() {
|
|||||||
--no-video-playback
|
--no-video-playback
|
||||||
--otg
|
--otg
|
||||||
-p --port=
|
-p --port=
|
||||||
|
--pause-on-exit
|
||||||
|
--pause-on-exit=
|
||||||
--power-off-on-close
|
--power-off-on-close
|
||||||
--prefer-text
|
--prefer-text
|
||||||
--print-fps
|
--print-fps
|
||||||
@@ -97,6 +99,10 @@ _scrcpy() {
|
|||||||
COMPREPLY=($(compgen -W 'unlocked initial 0 1 2 3' -- "$cur"))
|
COMPREPLY=($(compgen -W 'unlocked initial 0 1 2 3' -- "$cur"))
|
||||||
return
|
return
|
||||||
;;
|
;;
|
||||||
|
--pause-on-exit)
|
||||||
|
COMPREPLY=($(compgen -W 'true false if-error' -- "$cur"))
|
||||||
|
return
|
||||||
|
;;
|
||||||
-r|--record)
|
-r|--record)
|
||||||
COMPREPLY=($(compgen -f -- "$cur"))
|
COMPREPLY=($(compgen -f -- "$cur"))
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -1,4 +1,2 @@
|
|||||||
@echo off
|
@echo off
|
||||||
scrcpy.exe %*
|
scrcpy.exe --pause-on-exit=if-error %*
|
||||||
:: if the exit code is >= 1, then pause
|
|
||||||
if errorlevel 1 pause
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ Comment=Display and control your Android device
|
|||||||
# For some users, the PATH or ADB environment variables are set from the shell
|
# For some users, the PATH or ADB environment variables are set from the shell
|
||||||
# startup file, like .bashrc or .zshrc… Run an interactive shell to get
|
# startup file, like .bashrc or .zshrc… Run an interactive shell to get
|
||||||
# environment correctly initialized.
|
# environment correctly initialized.
|
||||||
Exec=/bin/bash --norc --noprofile -i -c "\"\\$SHELL\" -i -c scrcpy || read -p 'Press Enter to quit...'"
|
Exec=/bin/sh -c "\"\\$SHELL\" -i -c scrcpy --pause-on-exit=if-error"
|
||||||
Icon=scrcpy
|
Icon=scrcpy
|
||||||
Terminal=true
|
Terminal=true
|
||||||
Type=Application
|
Type=Application
|
||||||
|
|||||||
@@ -50,6 +50,7 @@ arguments=(
|
|||||||
'--no-video-playback[Disable video playback]'
|
'--no-video-playback[Disable video playback]'
|
||||||
'--otg[Run in OTG mode \(simulating physical keyboard and mouse\)]'
|
'--otg[Run in OTG mode \(simulating physical keyboard and mouse\)]'
|
||||||
{-p,--port=}'[\[port\[\:port\]\] Set the TCP port \(range\) used by the client to listen]'
|
{-p,--port=}'[\[port\[\:port\]\] Set the TCP port \(range\) used by the client to listen]'
|
||||||
|
'--pause-on-exit=[Make scrcpy pause before exiting]:mode:(true false if-error)'
|
||||||
'--power-off-on-close[Turn the device screen off when closing scrcpy]'
|
'--power-off-on-close[Turn the device screen off when closing scrcpy]'
|
||||||
'--prefer-text[Inject alpha characters and space as text events instead of key events]'
|
'--prefer-text[Inject alpha characters and space as text events instead of key events]'
|
||||||
'--print-fps[Start FPS counter, to print frame logs to the console]'
|
'--print-fps[Start FPS counter, to print frame logs to the console]'
|
||||||
|
|||||||
10
app/scrcpy.1
10
app/scrcpy.1
@@ -267,6 +267,16 @@ Set the TCP port (range) used by the client to listen.
|
|||||||
|
|
||||||
Default is 27183:27199.
|
Default is 27183:27199.
|
||||||
|
|
||||||
|
.TP
|
||||||
|
\fB\-\-pause\-on\-exit\fR[=\fImode\fR]
|
||||||
|
Configure pause on exit. Possible values are "true" (always pause on exit), "false" (never pause on exit) and "if-error" (pause only if an error occured).
|
||||||
|
|
||||||
|
This is useful to prevent the terminal window from automatically closing, so that error messages can be read.
|
||||||
|
|
||||||
|
Default is "false".
|
||||||
|
|
||||||
|
Passing the option without argument is equivalent to passing "true".
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
.B \-\-power\-off\-on\-close
|
.B \-\-power\-off\-on\-close
|
||||||
Turn the device screen off when closing scrcpy.
|
Turn the device screen off when closing scrcpy.
|
||||||
|
|||||||
@@ -79,6 +79,7 @@ enum {
|
|||||||
OPT_AUDIO_SOURCE,
|
OPT_AUDIO_SOURCE,
|
||||||
OPT_KILL_ADB_ON_CLOSE,
|
OPT_KILL_ADB_ON_CLOSE,
|
||||||
OPT_TIME_LIMIT,
|
OPT_TIME_LIMIT,
|
||||||
|
OPT_PAUSE_ON_EXIT,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct sc_option {
|
struct sc_option {
|
||||||
@@ -463,6 +464,20 @@ static const struct sc_option options[] = {
|
|||||||
"Default is " STR(DEFAULT_LOCAL_PORT_RANGE_FIRST) ":"
|
"Default is " STR(DEFAULT_LOCAL_PORT_RANGE_FIRST) ":"
|
||||||
STR(DEFAULT_LOCAL_PORT_RANGE_LAST) ".",
|
STR(DEFAULT_LOCAL_PORT_RANGE_LAST) ".",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
.longopt_id = OPT_PAUSE_ON_EXIT,
|
||||||
|
.longopt = "pause-on-exit",
|
||||||
|
.argdesc = "mode",
|
||||||
|
.optional_arg = true,
|
||||||
|
.text = "Configure pause on exit. Possible values are \"true\" (always "
|
||||||
|
"pause on exit), \"false\" (never pause on exit) and "
|
||||||
|
"\"if-error\" (pause only if an error occured).\n"
|
||||||
|
"This is useful to prevent the terminal window from "
|
||||||
|
"automatically closing, so that error messages can be read.\n"
|
||||||
|
"Default is \"false\".\n"
|
||||||
|
"Passing the option without argument is equivalent to passing "
|
||||||
|
"\"true\".",
|
||||||
|
},
|
||||||
{
|
{
|
||||||
.longopt_id = OPT_POWER_OFF_ON_CLOSE,
|
.longopt_id = OPT_POWER_OFF_ON_CLOSE,
|
||||||
.longopt = "power-off-on-close",
|
.longopt = "power-off-on-close",
|
||||||
@@ -1637,6 +1652,29 @@ parse_time_limit(const char *s, sc_tick *tick) {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool
|
||||||
|
parse_pause_on_exit(const char *s, enum sc_pause_on_exit *pause_on_exit) {
|
||||||
|
if (!s || !strcmp(s, "true")) {
|
||||||
|
*pause_on_exit = SC_PAUSE_ON_EXIT_TRUE;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!strcmp(s, "false")) {
|
||||||
|
*pause_on_exit = SC_PAUSE_ON_EXIT_FALSE;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!strcmp(s, "if-error")) {
|
||||||
|
*pause_on_exit = SC_PAUSE_ON_EXIT_IF_ERROR;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
LOGE("Unsupported pause on exit mode: %s "
|
||||||
|
"(expected true, false or if-error)", optarg);
|
||||||
|
return false;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
static bool
|
static bool
|
||||||
parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
|
parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
|
||||||
const char *optstring, const struct option *longopts) {
|
const char *optstring, const struct option *longopts) {
|
||||||
@@ -1977,6 +2015,11 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case OPT_PAUSE_ON_EXIT:
|
||||||
|
if (!parse_pause_on_exit(optarg, &args->pause_on_exit)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
// getopt prints the error message on stderr
|
// getopt prints the error message on stderr
|
||||||
return false;
|
return false;
|
||||||
@@ -2190,6 +2233,37 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static enum sc_pause_on_exit
|
||||||
|
sc_get_pause_on_exit(int argc, char *argv[]) {
|
||||||
|
// Read arguments backwards so that the last --pause-on-exit is considered
|
||||||
|
// (same behavior as getopt())
|
||||||
|
for (int i = argc - 1; i >= 1; --i) {
|
||||||
|
const char *arg = argv[i];
|
||||||
|
// Starts with "--pause-on-exit"
|
||||||
|
if (!strncmp("--pause-on-exit", arg, 15)) {
|
||||||
|
if (arg[15] == '\0') {
|
||||||
|
// No argument
|
||||||
|
return SC_PAUSE_ON_EXIT_TRUE;
|
||||||
|
}
|
||||||
|
if (arg[15] != '=') {
|
||||||
|
// Invalid parameter, ignore
|
||||||
|
return SC_PAUSE_ON_EXIT_FALSE;
|
||||||
|
}
|
||||||
|
const char *value = &arg[16];
|
||||||
|
if (!strcmp(value, "true")) {
|
||||||
|
return SC_PAUSE_ON_EXIT_TRUE;
|
||||||
|
}
|
||||||
|
if (!strcmp(value, "if-error")) {
|
||||||
|
return SC_PAUSE_ON_EXIT_IF_ERROR;
|
||||||
|
}
|
||||||
|
// Set to false, inclusing when the value is invalid
|
||||||
|
return SC_PAUSE_ON_EXIT_FALSE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
|
scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
|
||||||
struct sc_getopt_adapter adapter;
|
struct sc_getopt_adapter adapter;
|
||||||
@@ -2203,5 +2277,11 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
|
|||||||
|
|
||||||
sc_getopt_adapter_destroy(&adapter);
|
sc_getopt_adapter_destroy(&adapter);
|
||||||
|
|
||||||
|
if (!ret && args->pause_on_exit == SC_PAUSE_ON_EXIT_FALSE) {
|
||||||
|
// Check if "--pause-on-exit" is present in the arguments list, because
|
||||||
|
// it must be taken into account even if command line parsing failed
|
||||||
|
args->pause_on_exit = sc_get_pause_on_exit(argc, argv);
|
||||||
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,10 +7,17 @@
|
|||||||
|
|
||||||
#include "options.h"
|
#include "options.h"
|
||||||
|
|
||||||
|
enum sc_pause_on_exit {
|
||||||
|
SC_PAUSE_ON_EXIT_TRUE,
|
||||||
|
SC_PAUSE_ON_EXIT_FALSE,
|
||||||
|
SC_PAUSE_ON_EXIT_IF_ERROR,
|
||||||
|
};
|
||||||
|
|
||||||
struct scrcpy_cli_args {
|
struct scrcpy_cli_args {
|
||||||
struct scrcpy_options opts;
|
struct scrcpy_options opts;
|
||||||
bool help;
|
bool help;
|
||||||
bool version;
|
bool version;
|
||||||
|
enum sc_pause_on_exit pause_on_exit;
|
||||||
};
|
};
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|||||||
@@ -39,26 +39,32 @@ main_scrcpy(int argc, char *argv[]) {
|
|||||||
.opts = scrcpy_options_default,
|
.opts = scrcpy_options_default,
|
||||||
.help = false,
|
.help = false,
|
||||||
.version = false,
|
.version = false,
|
||||||
|
.pause_on_exit = SC_PAUSE_ON_EXIT_FALSE,
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifndef NDEBUG
|
#ifndef NDEBUG
|
||||||
args.opts.log_level = SC_LOG_LEVEL_DEBUG;
|
args.opts.log_level = SC_LOG_LEVEL_DEBUG;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
enum scrcpy_exit_code ret;
|
||||||
|
|
||||||
if (!scrcpy_parse_args(&args, argc, argv)) {
|
if (!scrcpy_parse_args(&args, argc, argv)) {
|
||||||
return SCRCPY_EXIT_FAILURE;
|
ret = SCRCPY_EXIT_FAILURE;
|
||||||
|
goto end;
|
||||||
}
|
}
|
||||||
|
|
||||||
sc_set_log_level(args.opts.log_level);
|
sc_set_log_level(args.opts.log_level);
|
||||||
|
|
||||||
if (args.help) {
|
if (args.help) {
|
||||||
scrcpy_print_usage(argv[0]);
|
scrcpy_print_usage(argv[0]);
|
||||||
return SCRCPY_EXIT_SUCCESS;
|
ret = SCRCPY_EXIT_SUCCESS;
|
||||||
|
goto end;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (args.version) {
|
if (args.version) {
|
||||||
scrcpy_print_version();
|
scrcpy_print_version();
|
||||||
return SCRCPY_EXIT_SUCCESS;
|
ret = SCRCPY_EXIT_SUCCESS;
|
||||||
|
goto end;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef SCRCPY_LAVF_REQUIRES_REGISTER_ALL
|
#ifdef SCRCPY_LAVF_REQUIRES_REGISTER_ALL
|
||||||
@@ -72,18 +78,26 @@ main_scrcpy(int argc, char *argv[]) {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!net_init()) {
|
if (!net_init()) {
|
||||||
return SCRCPY_EXIT_FAILURE;
|
ret = SCRCPY_EXIT_FAILURE;
|
||||||
|
goto end;
|
||||||
}
|
}
|
||||||
|
|
||||||
sc_log_configure();
|
sc_log_configure();
|
||||||
|
|
||||||
#ifdef HAVE_USB
|
#ifdef HAVE_USB
|
||||||
enum scrcpy_exit_code ret = args.opts.otg ? scrcpy_otg(&args.opts)
|
ret = args.opts.otg ? scrcpy_otg(&args.opts) : scrcpy(&args.opts);
|
||||||
: scrcpy(&args.opts);
|
|
||||||
#else
|
#else
|
||||||
enum scrcpy_exit_code ret = scrcpy(&args.opts);
|
ret = scrcpy(&args.opts);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
end:
|
||||||
|
if (args.pause_on_exit == SC_PAUSE_ON_EXIT_TRUE ||
|
||||||
|
(args.pause_on_exit == SC_PAUSE_ON_EXIT_IF_ERROR &&
|
||||||
|
ret != SCRCPY_EXIT_SUCCESS)) {
|
||||||
|
printf("Press Enter to continue...\n");
|
||||||
|
getchar();
|
||||||
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,83 +0,0 @@
|
|||||||
package com.genymobile.scrcpy;
|
|
||||||
|
|
||||||
import com.genymobile.scrcpy.wrappers.SurfaceControl;
|
|
||||||
|
|
||||||
import android.graphics.Rect;
|
|
||||||
import android.os.Build;
|
|
||||||
import android.os.IBinder;
|
|
||||||
import android.view.Surface;
|
|
||||||
|
|
||||||
public class ScreenCapture extends SurfaceCapture implements Device.RotationListener, Device.FoldListener {
|
|
||||||
|
|
||||||
private final Device device;
|
|
||||||
private IBinder display;
|
|
||||||
|
|
||||||
public ScreenCapture(Device device) {
|
|
||||||
this.device = device;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void init() {
|
|
||||||
display = createDisplay();
|
|
||||||
device.setRotationListener(this);
|
|
||||||
device.setFoldListener(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void release() {
|
|
||||||
device.setRotationListener(null);
|
|
||||||
device.setFoldListener(null);
|
|
||||||
SurfaceControl.destroyDisplay(display);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Size getSize() {
|
|
||||||
return device.getScreenInfo().getVideoSize();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setMaxSize(int size) {
|
|
||||||
device.setMaxSize(size);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setSurface(Surface surface) {
|
|
||||||
ScreenInfo screenInfo = device.getScreenInfo();
|
|
||||||
Rect contentRect = screenInfo.getContentRect();
|
|
||||||
|
|
||||||
// does not include the locked video orientation
|
|
||||||
Rect unlockedVideoRect = screenInfo.getUnlockedVideoSize().toRect();
|
|
||||||
int videoRotation = screenInfo.getVideoRotation();
|
|
||||||
int layerStack = device.getLayerStack();
|
|
||||||
setDisplaySurface(display, surface, videoRotation, contentRect, unlockedVideoRect, layerStack);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onFoldChanged(int displayId, boolean folded) {
|
|
||||||
requestReset();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onRotationChanged(int rotation) {
|
|
||||||
requestReset();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static IBinder createDisplay() {
|
|
||||||
// Since Android 12 (preview), secure displays could not be created with shell permissions anymore.
|
|
||||||
// On Android 12 preview, SDK_INT is still R (not S), but CODENAME is "S".
|
|
||||||
boolean secure = Build.VERSION.SDK_INT < Build.VERSION_CODES.R || (Build.VERSION.SDK_INT == Build.VERSION_CODES.R && !"S".equals(
|
|
||||||
Build.VERSION.CODENAME));
|
|
||||||
return SurfaceControl.createDisplay("scrcpy", secure);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void setDisplaySurface(IBinder display, Surface surface, int orientation, Rect deviceRect, Rect displayRect, int layerStack) {
|
|
||||||
SurfaceControl.openTransaction();
|
|
||||||
try {
|
|
||||||
SurfaceControl.setDisplaySurface(display, surface);
|
|
||||||
SurfaceControl.setDisplayProjection(display, orientation, deviceRect, displayRect);
|
|
||||||
SurfaceControl.setDisplayLayerStack(display, layerStack);
|
|
||||||
} finally {
|
|
||||||
SurfaceControl.closeTransaction();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -17,7 +17,7 @@ import java.nio.ByteBuffer;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
|
|
||||||
public class SurfaceEncoder implements AsyncProcessor {
|
public class ScreenEncoder implements Device.RotationListener, Device.FoldListener, AsyncProcessor {
|
||||||
|
|
||||||
private static final int DEFAULT_I_FRAME_INTERVAL = 10; // seconds
|
private static final int DEFAULT_I_FRAME_INTERVAL = 10; // seconds
|
||||||
private static final int REPEAT_FRAME_DELAY_US = 100_000; // repeat after 100ms
|
private static final int REPEAT_FRAME_DELAY_US = 100_000; // repeat after 100ms
|
||||||
@@ -27,7 +27,9 @@ public class SurfaceEncoder implements AsyncProcessor {
|
|||||||
private static final int[] MAX_SIZE_FALLBACK = {2560, 1920, 1600, 1280, 1024, 800};
|
private static final int[] MAX_SIZE_FALLBACK = {2560, 1920, 1600, 1280, 1024, 800};
|
||||||
private static final int MAX_CONSECUTIVE_ERRORS = 3;
|
private static final int MAX_CONSECUTIVE_ERRORS = 3;
|
||||||
|
|
||||||
private final SurfaceCapture capture;
|
private final AtomicBoolean resetCapture = new AtomicBoolean();
|
||||||
|
|
||||||
|
private final Device device;
|
||||||
private final Streamer streamer;
|
private final Streamer streamer;
|
||||||
private final String encoderName;
|
private final String encoderName;
|
||||||
private final List<CodecOption> codecOptions;
|
private final List<CodecOption> codecOptions;
|
||||||
@@ -41,9 +43,9 @@ public class SurfaceEncoder implements AsyncProcessor {
|
|||||||
private Thread thread;
|
private Thread thread;
|
||||||
private final AtomicBoolean stopped = new AtomicBoolean();
|
private final AtomicBoolean stopped = new AtomicBoolean();
|
||||||
|
|
||||||
public SurfaceEncoder(SurfaceCapture capture, Streamer streamer, int videoBitRate, int maxFps, List<CodecOption> codecOptions, String encoderName,
|
public ScreenEncoder(Device device, Streamer streamer, int videoBitRate, int maxFps, List<CodecOption> codecOptions, String encoderName,
|
||||||
boolean downsizeOnError) {
|
boolean downsizeOnError) {
|
||||||
this.capture = capture;
|
this.device = device;
|
||||||
this.streamer = streamer;
|
this.streamer = streamer;
|
||||||
this.videoBitRate = videoBitRate;
|
this.videoBitRate = videoBitRate;
|
||||||
this.maxFps = maxFps;
|
this.maxFps = maxFps;
|
||||||
@@ -52,29 +54,51 @@ public class SurfaceEncoder implements AsyncProcessor {
|
|||||||
this.downsizeOnError = downsizeOnError;
|
this.downsizeOnError = downsizeOnError;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onFoldChanged(int displayId, boolean folded) {
|
||||||
|
resetCapture.set(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onRotationChanged(int rotation) {
|
||||||
|
resetCapture.set(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean consumeResetCapture() {
|
||||||
|
return resetCapture.getAndSet(false);
|
||||||
|
}
|
||||||
|
|
||||||
private void streamScreen() throws IOException, ConfigurationException {
|
private void streamScreen() throws IOException, ConfigurationException {
|
||||||
Codec codec = streamer.getCodec();
|
Codec codec = streamer.getCodec();
|
||||||
MediaCodec mediaCodec = createMediaCodec(codec, encoderName);
|
MediaCodec mediaCodec = createMediaCodec(codec, encoderName);
|
||||||
MediaFormat format = createFormat(codec.getMimeType(), videoBitRate, maxFps, codecOptions);
|
MediaFormat format = createFormat(codec.getMimeType(), videoBitRate, maxFps, codecOptions);
|
||||||
|
IBinder display = createDisplay();
|
||||||
|
device.setRotationListener(this);
|
||||||
|
device.setFoldListener(this);
|
||||||
|
|
||||||
capture.init();
|
streamer.writeVideoHeader(device.getScreenInfo().getVideoSize());
|
||||||
|
|
||||||
try {
|
|
||||||
streamer.writeVideoHeader(capture.getSize());
|
|
||||||
|
|
||||||
boolean alive;
|
boolean alive;
|
||||||
|
try {
|
||||||
do {
|
do {
|
||||||
Size size = capture.getSize();
|
ScreenInfo screenInfo = device.getScreenInfo();
|
||||||
format.setInteger(MediaFormat.KEY_WIDTH, size.getWidth());
|
Rect contentRect = screenInfo.getContentRect();
|
||||||
format.setInteger(MediaFormat.KEY_HEIGHT, size.getHeight());
|
|
||||||
|
// include the locked video orientation
|
||||||
|
Rect videoRect = screenInfo.getVideoSize().toRect();
|
||||||
|
format.setInteger(MediaFormat.KEY_WIDTH, videoRect.width());
|
||||||
|
format.setInteger(MediaFormat.KEY_HEIGHT, videoRect.height());
|
||||||
|
|
||||||
Surface surface = null;
|
Surface surface = null;
|
||||||
try {
|
try {
|
||||||
mediaCodec.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
|
mediaCodec.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
|
||||||
surface = mediaCodec.createInputSurface();
|
surface = mediaCodec.createInputSurface();
|
||||||
|
|
||||||
capture.setSurface(surface);
|
// does not include the locked video orientation
|
||||||
|
Rect unlockedVideoRect = screenInfo.getUnlockedVideoSize().toRect();
|
||||||
|
int videoRotation = screenInfo.getVideoRotation();
|
||||||
|
int layerStack = device.getLayerStack();
|
||||||
|
setDisplaySurface(display, surface, videoRotation, contentRect, unlockedVideoRect, layerStack);
|
||||||
|
|
||||||
mediaCodec.start();
|
mediaCodec.start();
|
||||||
|
|
||||||
@@ -83,7 +107,7 @@ public class SurfaceEncoder implements AsyncProcessor {
|
|||||||
mediaCodec.stop();
|
mediaCodec.stop();
|
||||||
} catch (IllegalStateException | IllegalArgumentException e) {
|
} catch (IllegalStateException | IllegalArgumentException e) {
|
||||||
Ln.e("Encoding error: " + e.getClass().getName() + ": " + e.getMessage());
|
Ln.e("Encoding error: " + e.getClass().getName() + ": " + e.getMessage());
|
||||||
if (!prepareRetry(size)) {
|
if (!prepareRetry(device, screenInfo)) {
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
Ln.i("Retrying...");
|
Ln.i("Retrying...");
|
||||||
@@ -97,11 +121,13 @@ public class SurfaceEncoder implements AsyncProcessor {
|
|||||||
} while (alive);
|
} while (alive);
|
||||||
} finally {
|
} finally {
|
||||||
mediaCodec.release();
|
mediaCodec.release();
|
||||||
capture.release();
|
device.setRotationListener(null);
|
||||||
|
device.setFoldListener(null);
|
||||||
|
SurfaceControl.destroyDisplay(display);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean prepareRetry(Size currentSize) {
|
private boolean prepareRetry(Device device, ScreenInfo screenInfo) {
|
||||||
if (firstFrameSent) {
|
if (firstFrameSent) {
|
||||||
++consecutiveErrors;
|
++consecutiveErrors;
|
||||||
if (consecutiveErrors >= MAX_CONSECUTIVE_ERRORS) {
|
if (consecutiveErrors >= MAX_CONSECUTIVE_ERRORS) {
|
||||||
@@ -121,7 +147,7 @@ public class SurfaceEncoder implements AsyncProcessor {
|
|||||||
|
|
||||||
// Downsizing on error is only enabled if an encoding failure occurs before the first frame (downsizing later could be surprising)
|
// Downsizing on error is only enabled if an encoding failure occurs before the first frame (downsizing later could be surprising)
|
||||||
|
|
||||||
int newMaxSize = chooseMaxSizeFallback(currentSize);
|
int newMaxSize = chooseMaxSizeFallback(screenInfo.getVideoSize());
|
||||||
if (newMaxSize == 0) {
|
if (newMaxSize == 0) {
|
||||||
// Must definitively fail
|
// Must definitively fail
|
||||||
return false;
|
return false;
|
||||||
@@ -129,7 +155,7 @@ public class SurfaceEncoder implements AsyncProcessor {
|
|||||||
|
|
||||||
// Retry with a smaller device size
|
// Retry with a smaller device size
|
||||||
Ln.i("Retrying with -m" + newMaxSize + "...");
|
Ln.i("Retrying with -m" + newMaxSize + "...");
|
||||||
capture.setMaxSize(newMaxSize);
|
device.setMaxSize(newMaxSize);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -150,14 +176,14 @@ public class SurfaceEncoder implements AsyncProcessor {
|
|||||||
boolean alive = true;
|
boolean alive = true;
|
||||||
MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();
|
MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();
|
||||||
|
|
||||||
while (!capture.consumeReset() && !eof) {
|
while (!consumeResetCapture() && !eof) {
|
||||||
if (stopped.get()) {
|
if (stopped.get()) {
|
||||||
alive = false;
|
alive = false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
int outputBufferId = codec.dequeueOutputBuffer(bufferInfo, -1);
|
int outputBufferId = codec.dequeueOutputBuffer(bufferInfo, -1);
|
||||||
try {
|
try {
|
||||||
if (capture.consumeReset()) {
|
if (consumeResetCapture()) {
|
||||||
// must restart encoding with new size
|
// must restart encoding with new size
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -241,8 +267,8 @@ public class SurfaceEncoder implements AsyncProcessor {
|
|||||||
private static IBinder createDisplay() {
|
private static IBinder createDisplay() {
|
||||||
// Since Android 12 (preview), secure displays could not be created with shell permissions anymore.
|
// Since Android 12 (preview), secure displays could not be created with shell permissions anymore.
|
||||||
// On Android 12 preview, SDK_INT is still R (not S), but CODENAME is "S".
|
// On Android 12 preview, SDK_INT is still R (not S), but CODENAME is "S".
|
||||||
boolean secure = Build.VERSION.SDK_INT < Build.VERSION_CODES.R || (Build.VERSION.SDK_INT == Build.VERSION_CODES.R && !"S".equals(
|
boolean secure = Build.VERSION.SDK_INT < Build.VERSION_CODES.R || (Build.VERSION.SDK_INT == Build.VERSION_CODES.R && !"S"
|
||||||
Build.VERSION.CODENAME));
|
.equals(Build.VERSION.CODENAME));
|
||||||
return SurfaceControl.createDisplay("scrcpy", secure);
|
return SurfaceControl.createDisplay("scrcpy", secure);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -132,8 +132,7 @@ public final class Server {
|
|||||||
if (video) {
|
if (video) {
|
||||||
Streamer videoStreamer = new Streamer(connection.getVideoFd(), options.getVideoCodec(), options.getSendCodecMeta(),
|
Streamer videoStreamer = new Streamer(connection.getVideoFd(), options.getVideoCodec(), options.getSendCodecMeta(),
|
||||||
options.getSendFrameMeta());
|
options.getSendFrameMeta());
|
||||||
ScreenCapture screenCapture = new ScreenCapture(device);
|
ScreenEncoder screenEncoder = new ScreenEncoder(device, videoStreamer, options.getVideoBitRate(), options.getMaxFps(),
|
||||||
SurfaceEncoder screenEncoder = new SurfaceEncoder(screenCapture, videoStreamer, options.getVideoBitRate(), options.getMaxFps(),
|
|
||||||
options.getVideoCodecOptions(), options.getVideoEncoder(), options.getDownsizeOnError());
|
options.getVideoCodecOptions(), options.getVideoEncoder(), options.getDownsizeOnError());
|
||||||
asyncProcessors.add(screenEncoder);
|
asyncProcessors.add(screenEncoder);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,61 +0,0 @@
|
|||||||
package com.genymobile.scrcpy;
|
|
||||||
|
|
||||||
import android.view.Surface;
|
|
||||||
|
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A video source which can be rendered on a Surface for encoding.
|
|
||||||
*/
|
|
||||||
public abstract class SurfaceCapture {
|
|
||||||
|
|
||||||
private final AtomicBoolean resetCapture = new AtomicBoolean();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Request the encoding session to be restarted, for example if the capture implementation detects that the video source size has changed (on
|
|
||||||
* device rotation for example).
|
|
||||||
*/
|
|
||||||
protected void requestReset() {
|
|
||||||
resetCapture.set(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Consume the reset request (intended to be called by the encoder).
|
|
||||||
*
|
|
||||||
* @return {@code true} if a reset request was pending, {@code false} otherwise.
|
|
||||||
*/
|
|
||||||
public boolean consumeReset() {
|
|
||||||
return resetCapture.getAndSet(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Called once before the capture starts.
|
|
||||||
*/
|
|
||||||
public abstract void init();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Called after the capture ends (if and only if {@link #init()} has been called).
|
|
||||||
*/
|
|
||||||
public abstract void release();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return the video size
|
|
||||||
*
|
|
||||||
* @return the video size
|
|
||||||
*/
|
|
||||||
public abstract Size getSize();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set the maximum capture size (set by the encoder if it does not support the current size).
|
|
||||||
*
|
|
||||||
* @param size Maximum size
|
|
||||||
*/
|
|
||||||
public abstract void setMaxSize(int size);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set the target surface.
|
|
||||||
*
|
|
||||||
* @param surface the surface which will be encoded
|
|
||||||
*/
|
|
||||||
public abstract void setSurface(Surface surface);
|
|
||||||
}
|
|
||||||
@@ -154,7 +154,7 @@ public final class Workarounds {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void fillBaseContext() {
|
private static void fillBaseContext() {
|
||||||
try {
|
try {
|
||||||
fillActivityThread();
|
fillActivityThread();
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ import java.lang.reflect.InvocationTargetException;
|
|||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
|
|
||||||
@SuppressLint("PrivateApi,DiscouragedPrivateApi")
|
@SuppressLint("PrivateApi,DiscouragedPrivateApi")
|
||||||
public class ActivityManager {
|
public final class ActivityManager {
|
||||||
|
|
||||||
private final IInterface manager;
|
private final IInterface manager;
|
||||||
private Method getContentProviderExternalMethod;
|
private Method getContentProviderExternalMethod;
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import android.os.IInterface;
|
|||||||
import java.lang.reflect.InvocationTargetException;
|
import java.lang.reflect.InvocationTargetException;
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
|
|
||||||
public class ClipboardManager {
|
public final class ClipboardManager {
|
||||||
private final IInterface manager;
|
private final IInterface manager;
|
||||||
private Method getPrimaryClipMethod;
|
private Method getPrimaryClipMethod;
|
||||||
private Method setPrimaryClipMethod;
|
private Method setPrimaryClipMethod;
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import java.io.Closeable;
|
|||||||
import java.lang.reflect.InvocationTargetException;
|
import java.lang.reflect.InvocationTargetException;
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
|
|
||||||
public class ContentProvider implements Closeable {
|
public final class ContentProvider implements Closeable {
|
||||||
|
|
||||||
public static final String TABLE_SYSTEM = "system";
|
public static final String TABLE_SYSTEM = "system";
|
||||||
public static final String TABLE_SECURE = "secure";
|
public static final String TABLE_SECURE = "secure";
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import android.os.IInterface;
|
|||||||
import java.lang.reflect.InvocationTargetException;
|
import java.lang.reflect.InvocationTargetException;
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
|
|
||||||
public class StatusBarManager {
|
public final class StatusBarManager {
|
||||||
|
|
||||||
private final IInterface manager;
|
private final IInterface manager;
|
||||||
private Method expandNotificationsPanelMethod;
|
private Method expandNotificationsPanelMethod;
|
||||||
|
|||||||
Reference in New Issue
Block a user