mirrors/QtScrcpy
0
0
Fork 0
mirror of https://github.com/barry-ran/QtScrcpy.git synced 2025-08-03 14:18:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
fix: samsung error stack corruption detected
This commit is contained in:
Barry 2022-10-21 12:16:43 +08:00 • committed by GitHub
commit f1e24fe81a
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/macos.yml vendored
View file

@ -68,7 +68,7 @@ jobs:
- uses: actions/upload-artifact@v1 - uses: actions/upload-artifact@v1
with: with:
name: ${{ steps.package.outputs.package-name }}.zip 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 # Upload to release
- name: Upload Release - name: Upload Release
if: startsWith(github.ref, 'refs/tags/') if: startsWith(github.ref, 'refs/tags/')

2
QtScrcpy/QtScrcpyCore

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

2
QtScrcpy/ui/dialog.cpp
View file

@ -292,7 +292,7 @@ void Dialog::on_startServerBtn_clicked()
{ {
outLog("start server...", false); 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(); quint16 videoSize = ui->maxSizeBox->currentText().trimmed().toUShort();
qsc::DeviceParams params; qsc::DeviceParams params;
params.serial = ui->serialBox->currentText().trimmed(); params.serial = ui->serialBox->currentText().trimmed();

4
QtScrcpy/util/config.cpp
View file

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

2
config/config.ini
View file

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