Merge pull request #706 from barry-ran/fix/sanxing_bug

fix: samsung error stack corruption detected
This commit is contained in:
Barry 2022-10-21 12:16:43 +08:00 committed by GitHub
commit f9fefb8f9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions

View file

@ -68,7 +68,7 @@ jobs:
- uses: actions/upload-artifact@v1
with:
name: ${{ steps.package.outputs.package-name }}.zip
path: ci/build/${{ steps.package.outputs.package-name }}.app
path: ci/build/${{ steps.package.outputs.package-name }}.dmg
# Upload to release
- name: Upload Release
if: startsWith(github.ref, 'refs/tags/')

@ -1 +1 @@
Subproject commit f81d3696cb79964e073415798bc070415337877d
Subproject commit 9b81a312ad2e8157c48dc042e973a81702357509

View file

@ -292,7 +292,7 @@ void Dialog::on_startServerBtn_clicked()
{
outLog("start server...", false);
// this is ok that "native" toUshort is 0
// this is ok that "original" toUshort is 0
quint16 videoSize = ui->maxSizeBox->currentText().trimmed().toUShort();
qsc::DeviceParams params;
params.serial = ui->serialBox->currentText().trimmed();

View file

@ -21,7 +21,7 @@
#define COMMON_SERVER_PATH_DEF "/data/local/tmp/scrcpy-server.jar"
#define COMMON_MAX_FPS_KEY "MaxFps"
#define COMMON_MAX_FPS_DEF 60
#define COMMON_MAX_FPS_DEF 0
#define COMMON_DESKTOP_OPENGL_KEY "UseDesktopOpenGL"
#define COMMON_DESKTOP_OPENGL_DEF -1
@ -227,7 +227,7 @@ QString Config::getServerVersion()
int Config::getMaxFps()
{
int fps = 60;
int fps = 0;
m_settings->beginGroup(GROUP_COMMON);
fps = m_settings->value(COMMON_MAX_FPS_KEY, COMMON_MAX_FPS_DEF).toInt();
m_settings->endGroup();

View file

@ -4,7 +4,7 @@ WindowTitle=QtScrcpy
# 推送到安卓设备的文件保存路径(必须以/结尾)
PushFilePath=/sdcard/
# 最大fps仅支持Android 10以上
MaxFps=60
MaxFps=0
# 是否渲染过期视频帧(跳过过期视频帧意味着更低的延迟)
RenderExpiredFrames=0
# 视频解码方式:-1 自动0 软解1 dx硬解2 opengl硬解