From 4eafdc6577f9e4c9741ab107f448c7d90590e4b1 Mon Sep 17 00:00:00 2001 From: rankun Date: Wed, 8 Jul 2020 11:55:15 +0800 Subject: [PATCH] feat: add codec options --- QtScrcpy/device/server/server.cpp | 2 +- QtScrcpy/util/config.cpp | 12 ++++++++++++ QtScrcpy/util/config.h | 1 + config/config.ini | 4 ++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/QtScrcpy/device/server/server.cpp b/QtScrcpy/device/server/server.cpp index ec51093..1ff8c02 100644 --- a/QtScrcpy/device/server/server.cpp +++ b/QtScrcpy/device/server/server.cpp @@ -161,7 +161,7 @@ bool Server::execute() // code option // https://github.com/Genymobile/scrcpy/commit/080a4ee3654a9b7e96c8ffe37474b5c21c02852a // - args << "-"; + args << Config::getInstance().getCodecOptions(); #ifdef SERVER_DEBUGGER qInfo("Server debugger waiting for a client on device port " SERVER_DEBUGGER_PORT "..."); diff --git a/QtScrcpy/util/config.cpp b/QtScrcpy/util/config.cpp index c30fa0c..b067941 100644 --- a/QtScrcpy/util/config.cpp +++ b/QtScrcpy/util/config.cpp @@ -37,6 +37,9 @@ #define COMMON_LOG_LEVEL_KEY "LogLevel" #define COMMON_LOG_LEVEL_DEF "info" +#define COMMON_CODEC_OPTIONS_KEY "CodecOptions" +#define COMMON_CODEC_OPTIONS_DEF "-" + // user data #define COMMON_RECORD_KEY "RecordPath" #define COMMON_RECORD_DEF "" @@ -277,6 +280,15 @@ QString Config::getLogLevel() return logLevel; } +QString Config::getCodecOptions() +{ + QString codecOptions; + m_settings->beginGroup(GROUP_COMMON); + codecOptions = m_settings->value(COMMON_CODEC_OPTIONS_KEY, COMMON_CODEC_OPTIONS_DEF).toString(); + m_settings->endGroup(); + return codecOptions; +} + QString Config::getTitle() { QString title; diff --git a/QtScrcpy/util/config.h b/QtScrcpy/util/config.h index 8f82fda..681b422 100644 --- a/QtScrcpy/util/config.h +++ b/QtScrcpy/util/config.h @@ -22,6 +22,7 @@ public: QString getServerPath(); QString getAdbPath(); QString getLogLevel(); + QString getCodecOptions(); // user data QString getRecordPath(); diff --git a/config/config.ini b/config/config.ini index f72d577..ba11654 100644 --- a/config/config.ini +++ b/config/config.ini @@ -15,6 +15,10 @@ ServerVersion=1.14 ServerPath=/data/local/tmp/scrcpy-server.jar # 自定义adb路径,例如D:/android/tools/adb.exe AdbPath= +# 编码选项 "-"表示默认 +# 例如 CodecOptions="profile=1,level=2" +# 更多编码选项参考 https://d.android.com/reference/android/media/MediaFormat +CodecOptions="-" # Set the log level (debug, info, warn, error) LogLevel=info