Skip to content

Commit

Permalink
fix: samsung error stack corruption detected
Browse files Browse the repository at this point in the history
  • Loading branch information
rankun committed Oct 21, 2022
1 parent fcd6832 commit 4b5fbe7
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/')
Expand Down
2 changes: 1 addition & 1 deletion QtScrcpy/QtScrcpyCore
2 changes: 1 addition & 1 deletion QtScrcpy/ui/dialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions QtScrcpy/util/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion config/config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ WindowTitle=QtScrcpy
# 推送到安卓设备的文件保存路径(必须以/结尾)
PushFilePath=/sdcard/
# 最大fps(仅支持Android 10以上)
MaxFps=60
MaxFps=0
# 是否渲染过期视频帧(跳过过期视频帧意味着更低的延迟)
RenderExpiredFrames=0
# 视频解码方式:-1 自动,0 软解,1 dx硬解,2 opengl硬解
Expand Down

1 comment on commit 4b5fbe7

@chip33
Copy link

@chip33 chip33 commented on 4b5fbe7 Oct 31, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still not fixed on Samsung Galaxy S7 v2.1.2
Server Failure.

Please sign in to comment.