From 1bb316d1c82e56d63aab5c318ca1fea85dc1774b Mon Sep 17 00:00:00 2001 From: Barry <870709864@qq.com> Date: Tue, 24 May 2022 10:42:04 +0800 Subject: [PATCH] refactor: change device params --- QtScrcpy/device/device.cpp | 4 ++-- QtScrcpy/device/server/server.h | 13 ++++++++----- QtScrcpy/include/QtScrcpyCoreDef.h | 23 ++++++++++++++--------- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/QtScrcpy/device/device.cpp b/QtScrcpy/device/device.cpp index 88090f4..a686c1d 100644 --- a/QtScrcpy/device/device.cpp +++ b/QtScrcpy/device/device.cpp @@ -280,11 +280,11 @@ bool Device::connectDevice() params.maxSize = m_params.maxSize; params.bitRate = m_params.bitRate; params.maxFps = m_params.maxFps; - params.crop = ""; - params.control = true; params.useReverse = m_params.useReverse; params.lockVideoOrientation = m_params.lockVideoOrientation; params.stayAwake = m_params.stayAwake; + params.crop = ""; + params.control = true; m_server->start(params); }); diff --git a/QtScrcpy/device/server/server.h b/QtScrcpy/device/server/server.h index 3f57741..d7cc555 100644 --- a/QtScrcpy/device/server/server.h +++ b/QtScrcpy/device/server/server.h @@ -26,18 +26,21 @@ class Server : public QObject public: struct ServerParams { - QString serverLocalPath = ""; // 本地安卓server路径 - QString serverRemotePath = ""; // 要推送到远端设备的server路径 - QString serial = ""; // 设备序列号 + // necessary + QString serial = ""; // 设备序列号 + QString serverLocalPath = ""; // 本地安卓server路径 + + // optional + QString serverRemotePath = "/data/local/tmp/scrcpy-server.jar"; // 要推送到远端设备的server路径 quint16 localPort = 27183; // reverse时本地监听端口 quint16 maxSize = 720; // 视频分辨率 quint32 bitRate = 8000000; // 视频比特率 quint32 maxFps = 60; // 视频最大帧率 - QString crop = ""; // 视频裁剪 - bool control = true; // 安卓端是否接收键鼠控制 bool useReverse = true; // true:先使用adb reverse,失败后自动使用adb forward;false:直接使用adb forward int lockVideoOrientation = -1; // 是否锁定视频方向 int stayAwake = false; // 是否保持唤醒 + QString crop = ""; // 视频裁剪 + bool control = true; // 安卓端是否接收键鼠控制 }; explicit Server(QObject *parent = nullptr); diff --git a/QtScrcpy/include/QtScrcpyCoreDef.h b/QtScrcpy/include/QtScrcpyCoreDef.h index 8992490..e968840 100644 --- a/QtScrcpy/include/QtScrcpyCoreDef.h +++ b/QtScrcpy/include/QtScrcpyCoreDef.h @@ -4,23 +4,28 @@ namespace qsc { struct DeviceParams { - QString serverLocalPath = ""; // 本地安卓server路径 - QString serverRemotePath = ""; // 要推送到远端设备的server路径 - QString recordPath = ""; // 视频保存路径 - QString recordFileFormat = "mp4"; // 视频保存格式 mp4/mkv + // necessary QString serial = ""; // 设备序列号 + QString serverLocalPath = ""; // 本地安卓server路径 + + // optional + QString serverRemotePath = "/data/local/tmp/scrcpy-server.jar"; // 要推送到远端设备的server路径 quint16 localPort = 27183; // reverse时本地监听端口 quint16 maxSize = 720; // 视频分辨率 quint32 bitRate = 2000000; // 视频比特率 quint32 maxFps = 60; // 视频最大帧率 - bool recordFile = false; // 录制到文件 - bool closeScreen = false; // 启动时自动息屏 bool useReverse = true; // true:先使用adb reverse,失败后自动使用adb forward;false:直接使用adb forward - bool display = true; // 是否显示画面(或者仅仅后台录制) - QString gameScript = ""; // 游戏映射脚本 - bool renderExpiredFrames = false; // 是否渲染延迟视频帧 int lockVideoOrientation = -1; // 是否锁定视频方向 bool stayAwake = false; // 是否保持唤醒 + + QString recordPath = ""; // 视频保存路径 + QString recordFileFormat = "mp4"; // 视频保存格式 mp4/mkv + bool recordFile = false; // 录制到文件 + + bool closeScreen = false; // 启动时自动息屏 + bool display = true; // 是否显示画面(或者仅仅后台录制) + bool renderExpiredFrames = false; // 是否渲染延迟视频帧 + QString gameScript = ""; // 游戏映射脚本 }; }