Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Obs Studio
提交
640967b9
O
Obs Studio
项目概览
小白菜888
/
Obs Studio
通知
4
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Obs Studio
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
640967b9
编写于
12月 15, 2014
作者:
J
jp9000
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
UI: Add video scale filters to basic settings
上级
488cd84f
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
47 addition
and
1 deletion
+47
-1
obs/data/locale/en-US.ini
obs/data/locale/en-US.ini
+5
-0
obs/forms/OBSBasicSettings.ui
obs/forms/OBSBasicSettings.ui
+1
-1
obs/window-basic-main.cpp
obs/window-basic-main.cpp
+15
-0
obs/window-basic-settings.cpp
obs/window-basic-settings.cpp
+25
-0
obs/window-basic-settings.hpp
obs/window-basic-settings.hpp
+1
-0
未找到文件。
obs/data/locale/en-US.ini
浏览文件 @
640967b9
...
...
@@ -244,6 +244,11 @@ Basic.Settings.Video.Renderer="Renderer:"
Basic.Settings.Video.InvalidResolution
=
"Invalid resolution value. Must be [width]x[height] (i.e. 1920x1080)"
Basic.Settings.Video.CurrentlyActive
=
"Video output is currently active. Please turn off any outputs to change video settings."
# scale filters
Basic.Settings.Video.DownscaleFilter.Bilinear
=
"Bilinear (Fastest, but blurry if scaling)"
Basic.Settings.Video.DownscaleFilter.Bicubic
=
"Bicubic (Sharpened scaling, 16 samples)"
Basic.Settings.Video.DownscaleFilter.Lanczos
=
"Lanczos (Sparpened scaling, 32 samples)"
# basic mode 'audio' settings
Basic.Settings.Audio
=
"Audio"
Basic.Settings.Audio.SampleRate
=
"Sample Rate"
...
...
obs/forms/OBSBasicSettings.ui
浏览文件 @
640967b9
...
...
@@ -866,7 +866,7 @@
<item
row=
"4"
column=
"1"
>
<widget
class=
"QComboBox"
name=
"downscaleFilter"
>
<property
name=
"enabled"
>
<bool>
fals
e
</bool>
<bool>
tru
e
</bool>
</property>
</widget>
</item>
...
...
obs/window-basic-main.cpp
浏览文件 @
640967b9
...
...
@@ -471,6 +471,7 @@ bool OBSBasic::InitBasicConfigDefaults()
config_set_default_uint
(
basicConfig
,
"Video"
,
"FPSInt"
,
30
);
config_set_default_uint
(
basicConfig
,
"Video"
,
"FPSNum"
,
30
);
config_set_default_uint
(
basicConfig
,
"Video"
,
"FPSDen"
,
1
);
config_set_default_string
(
basicConfig
,
"Video"
,
"ScaleType"
,
"bicubic"
);
config_set_default_uint
(
basicConfig
,
"Audio"
,
"SampleRate"
,
44100
);
config_set_default_string
(
basicConfig
,
"Audio"
,
"ChannelSetup"
,
...
...
@@ -1335,6 +1336,19 @@ static inline int AttemptToResetVideo(struct obs_video_info *ovi)
return
ret
;
}
static
inline
enum
obs_scale_type
GetScaleType
(
ConfigFile
&
basicConfig
)
{
const
char
*
scaleTypeStr
=
config_get_string
(
basicConfig
,
"Video"
,
"ScaleType"
);
if
(
astrcmpi
(
scaleTypeStr
,
"bilinear"
)
==
0
)
return
OBS_SCALE_BILINEAR
;
else
if
(
astrcmpi
(
scaleTypeStr
,
"lanczos"
)
==
0
)
return
OBS_SCALE_LANCZOS
;
else
return
OBS_SCALE_BICUBIC
;
}
int
OBSBasic
::
ResetVideo
()
{
struct
obs_video_info
ovi
;
...
...
@@ -1356,6 +1370,7 @@ int OBSBasic::ResetVideo()
ovi
.
range
=
VIDEO_RANGE_FULL
;
ovi
.
adapter
=
0
;
ovi
.
gpu_conversion
=
true
;
ovi
.
scale_type
=
GetScaleType
(
basicConfig
);
QTToGSWindow
(
ui
->
preview
->
winId
(),
ovi
.
window
);
...
...
obs/window-basic-settings.cpp
浏览文件 @
640967b9
...
...
@@ -338,6 +338,29 @@ void OBSBasicSettings::ResetDownscales(uint32_t cx, uint32_t cy)
ui
->
outputResolution
->
lineEdit
()
->
setText
(
ResString
(
cx
,
cy
).
c_str
());
}
void
OBSBasicSettings
::
LoadDownscaleFilters
()
{
ui
->
downscaleFilter
->
addItem
(
QTStr
(
"Basic.Settings.Video.DownscaleFilter.Bilinear"
),
QT_UTF8
(
"bilinear"
));
ui
->
downscaleFilter
->
addItem
(
QTStr
(
"Basic.Settings.Video.DownscaleFilter.Bicubic"
),
QT_UTF8
(
"bicubic"
));
ui
->
downscaleFilter
->
addItem
(
QTStr
(
"Basic.Settings.Video.DownscaleFilter.Lanczos"
),
QT_UTF8
(
"lanczos"
));
const
char
*
scaleType
=
config_get_string
(
main
->
Config
(),
"Video"
,
"ScaleType"
);
if
(
astrcmpi
(
scaleType
,
"bilinear"
)
==
0
)
ui
->
downscaleFilter
->
setCurrentIndex
(
0
);
else
if
(
astrcmpi
(
scaleType
,
"lanczos"
)
==
0
)
ui
->
downscaleFilter
->
setCurrentIndex
(
2
);
else
ui
->
downscaleFilter
->
setCurrentIndex
(
1
);
}
void
OBSBasicSettings
::
LoadResolutionLists
()
{
uint32_t
cx
=
config_get_uint
(
main
->
Config
(),
"Video"
,
"BaseCX"
);
...
...
@@ -415,6 +438,7 @@ void OBSBasicSettings::LoadVideoSettings()
LoadRendererList
();
LoadResolutionLists
();
LoadFPSData
();
LoadDownscaleFilters
();
loading
=
false
;
}
...
...
@@ -614,6 +638,7 @@ void OBSBasicSettings::SaveVideoSettings()
SaveSpinBox
(
ui
->
fpsInteger
,
"Video"
,
"FPSInt"
);
SaveSpinBox
(
ui
->
fpsNumerator
,
"Video"
,
"FPSNum"
);
SaveSpinBox
(
ui
->
fpsDenominator
,
"Video"
,
"FPSDen"
);
SaveComboData
(
ui
->
downscaleFilter
,
"Video"
,
"ScaleType"
);
main
->
ResetVideo
();
}
...
...
obs/window-basic-settings.hpp
浏览文件 @
640967b9
...
...
@@ -104,6 +104,7 @@ private:
/* video */
void
LoadRendererList
();
void
ResetDownscales
(
uint32_t
cx
,
uint32_t
cy
);
void
LoadDownscaleFilters
();
void
LoadResolutionLists
();
void
LoadFPSData
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录