diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 900057184..748be5cd3 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -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/') diff --git a/QtScrcpy/QtScrcpyCore b/QtScrcpy/QtScrcpyCore index f81d3696c..9b81a312a 160000 --- a/QtScrcpy/QtScrcpyCore +++ b/QtScrcpy/QtScrcpyCore @@ -1 +1 @@ -Subproject commit f81d3696cb79964e073415798bc070415337877d +Subproject commit 9b81a312ad2e8157c48dc042e973a81702357509 diff --git a/QtScrcpy/ui/dialog.cpp b/QtScrcpy/ui/dialog.cpp index 610e244bb..abc143f8d 100644 --- a/QtScrcpy/ui/dialog.cpp +++ b/QtScrcpy/ui/dialog.cpp @@ -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(); diff --git a/QtScrcpy/util/config.cpp b/QtScrcpy/util/config.cpp index 7deca9afd..7f16171e0 100644 --- a/QtScrcpy/util/config.cpp +++ b/QtScrcpy/util/config.cpp @@ -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(); diff --git a/config/config.ini b/config/config.ini index 593dfcd98..87949f4d1 100644 --- a/config/config.ini +++ b/config/config.ini @@ -4,7 +4,7 @@ WindowTitle=QtScrcpy # 推送到安卓设备的文件保存路径(必须以/结尾) PushFilePath=/sdcard/ # 最大fps(仅支持Android 10以上) -MaxFps=60 +MaxFps=0 # 是否渲染过期视频帧(跳过过期视频帧意味着更低的延迟) RenderExpiredFrames=0 # 视频解码方式:-1 自动,0 软解,1 dx硬解,2 opengl硬解