Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Obs Studio
提交
31b73f80
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,发现更多精彩内容 >>
提交
31b73f80
编写于
4月 30, 2019
作者:
C
Clayton Groeneveld
提交者:
jp9000
5月 02, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
UI: Add ability to set properties spinbox suffix
上级
8789b346
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
30 addition
and
8 deletion
+30
-8
UI/properties-view.cpp
UI/properties-view.cpp
+4
-0
UI/window-basic-settings.cpp
UI/window-basic-settings.cpp
+3
-0
plugins/mac-vth264/encoder.c
plugins/mac-vth264/encoder.c
+6
-2
plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c
plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c
+4
-2
plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c
plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c
+3
-1
plugins/obs-qsv11/obs-qsv11.c
plugins/obs-qsv11/obs-qsv11.c
+7
-2
plugins/obs-x264/obs-x264.c
plugins/obs-x264/obs-x264.c
+3
-1
未找到文件。
UI/properties-view.cpp
浏览文件 @
31b73f80
...
...
@@ -333,12 +333,14 @@ void OBSPropertiesView::AddInt(obs_property_t *prop, QFormLayout *layout,
int
minVal
=
obs_property_int_min
(
prop
);
int
maxVal
=
obs_property_int_max
(
prop
);
int
stepVal
=
obs_property_int_step
(
prop
);
const
char
*
suffix
=
obs_property_int_suffix
(
prop
);
spin
->
setMinimum
(
minVal
);
spin
->
setMaximum
(
maxVal
);
spin
->
setSingleStep
(
stepVal
);
spin
->
setValue
(
val
);
spin
->
setToolTip
(
QT_UTF8
(
obs_property_long_description
(
prop
)));
spin
->
setSuffix
(
QT_UTF8
(
suffix
));
WidgetInfo
*
info
=
new
WidgetInfo
(
this
,
prop
,
spin
);
children
.
emplace_back
(
info
);
...
...
@@ -382,12 +384,14 @@ void OBSPropertiesView::AddFloat(obs_property_t *prop, QFormLayout *layout,
double
minVal
=
obs_property_float_min
(
prop
);
double
maxVal
=
obs_property_float_max
(
prop
);
double
stepVal
=
obs_property_float_step
(
prop
);
const
char
*
suffix
=
obs_property_float_suffix
(
prop
);
spin
->
setMinimum
(
minVal
);
spin
->
setMaximum
(
maxVal
);
spin
->
setSingleStep
(
stepVal
);
spin
->
setValue
(
val
);
spin
->
setToolTip
(
QT_UTF8
(
obs_property_long_description
(
prop
)));
spin
->
setSuffix
(
QT_UTF8
(
suffix
));
WidgetInfo
*
info
=
new
WidgetInfo
(
this
,
prop
,
spin
);
children
.
emplace_back
(
info
);
...
...
UI/window-basic-settings.cpp
浏览文件 @
31b73f80
...
...
@@ -463,7 +463,10 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
HookWidget
(
ui
->
autoRemux
,
CHECK_CHANGED
,
ADV_CHANGED
);
ui
->
simpleOutputVBitrate
->
setSingleStep
(
50
);
ui
->
simpleOutputVBitrate
->
setSuffix
(
" Kbps"
);
ui
->
advOutFFVBitrate
->
setSingleStep
(
50
);
ui
->
advOutFFVBitrate
->
setSuffix
(
" Kbps"
);
ui
->
advOutFFABitrate
->
setSuffix
(
" Kbps"
);
#if !defined(_WIN32) && !defined(__APPLE__)
delete
ui
->
enableAutoUpdates
;
...
...
plugins/mac-vth264/encoder.c
浏览文件 @
31b73f80
...
...
@@ -874,14 +874,18 @@ static obs_properties_t *vt_h264_properties(void *unused)
obs_properties_t
*
props
=
obs_properties_create
();
obs_property_t
*
p
;
obs_properties_add_int
(
props
,
"bitrate"
,
TEXT_BITRATE
,
50
,
10000000
,
50
);
p
=
obs_properties_add_int
(
props
,
"bitrate"
,
TEXT_BITRATE
,
50
,
10000000
,
50
);
obs_property_int_set_suffix
(
p
,
" Kbps"
);
p
=
obs_properties_add_bool
(
props
,
"limit_bitrate"
,
TEXT_USE_MAX_BITRATE
);
obs_property_set_modified_callback
(
p
,
limit_bitrate_modified
);
obs_properties_add_int
(
props
,
"max_bitrate"
,
TEXT_MAX_BITRATE
,
50
,
p
=
obs_properties_add_int
(
props
,
"max_bitrate"
,
TEXT_MAX_BITRATE
,
50
,
10000000
,
50
);
obs_property_int_set_suffix
(
p
,
" Kbps"
);
obs_properties_add_float
(
props
,
"max_bitrate_window"
,
TEXT_MAX_BITRATE_WINDOW
,
0
.
10
f
,
10
.
0
f
,
0
.
25
f
);
...
...
plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c
浏览文件 @
31b73f80
...
...
@@ -451,10 +451,12 @@ obs_properties_t *nvenc_properties_internal(bool ffmpeg)
obs_property_set_modified_callback
(
p
,
rate_control_modified
);
obs_properties_add_int
(
props
,
"bitrate"
,
p
=
obs_properties_add_int
(
props
,
"bitrate"
,
obs_module_text
(
"Bitrate"
),
50
,
300000
,
50
);
obs_properties_add_int
(
props
,
"max_bitrate"
,
obs_property_int_set_suffix
(
p
,
" Kbps"
);
p
=
obs_properties_add_int
(
props
,
"max_bitrate"
,
obs_module_text
(
"MaxBitrate"
),
50
,
300000
,
50
);
obs_property_int_set_suffix
(
p
,
" Kbps"
);
obs_properties_add_int
(
props
,
"cqp"
,
obs_module_text
(
"NVENC.CQLevel"
),
1
,
30
,
1
);
...
...
plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c
浏览文件 @
31b73f80
...
...
@@ -490,8 +490,10 @@ static obs_properties_t *vaapi_properties(void *unused)
obs_property_list_add_int
(
list
,
"720p60/1080p30 (4.1)"
,
41
);
obs_property_list_add_int
(
list
,
"1080p60 (4.2)"
,
42
);
obs_properties_add_int
(
props
,
"bitrate"
,
obs_module_text
(
"Bitrate"
),
0
,
obs_property_t
*
p
;
p
=
obs_properties_add_int
(
props
,
"bitrate"
,
obs_module_text
(
"Bitrate"
),
0
,
300000
,
50
);
obs_property_int_set_suffix
(
p
,
" Kbps"
);
obs_properties_add_int
(
props
,
"keyint_sec"
,
obs_module_text
(
"Keyframe Interval (seconds)"
),
0
,
20
,
...
...
plugins/obs-qsv11/obs-qsv11.c
浏览文件 @
31b73f80
...
...
@@ -260,10 +260,15 @@ static obs_properties_t *obs_qsv_props(void *unused)
add_rate_controls
(
list
,
qsv_ratecontrols
);
obs_property_set_modified_callback
(
list
,
rate_control_modified
);
obs_properties_add_int
(
props
,
"bitrate"
,
TEXT_TARGET_BITRATE
,
50
,
obs_property_t
*
p
;
p
=
obs_properties_add_int
(
props
,
"bitrate"
,
TEXT_TARGET_BITRATE
,
50
,
10000000
,
50
);
obs_properties_add_int
(
props
,
"max_bitrate"
,
TEXT_MAX_BITRATE
,
50
,
obs_property_int_set_suffix
(
p
,
" Kbps"
);
p
=
obs_properties_add_int
(
props
,
"max_bitrate"
,
TEXT_MAX_BITRATE
,
50
,
10000000
,
50
);
obs_property_int_set_suffix
(
p
,
" Kbps"
);
obs_properties_add_int
(
props
,
"accuracy"
,
TEXT_ACCURACY
,
0
,
10000
,
1
);
obs_properties_add_int
(
props
,
"convergence"
,
TEXT_CONVERGENCE
,
0
,
10
,
1
);
obs_properties_add_int
(
props
,
"qpi"
,
"QPI"
,
1
,
51
,
1
);
...
...
plugins/obs-x264/obs-x264.c
浏览文件 @
31b73f80
...
...
@@ -179,7 +179,9 @@ static obs_properties_t *obs_x264_props(void *unused)
obs_property_set_modified_callback
(
list
,
rate_control_modified
);
obs_properties_add_int
(
props
,
"bitrate"
,
TEXT_BITRATE
,
50
,
10000000
,
50
);
p
=
obs_properties_add_int
(
props
,
"bitrate"
,
TEXT_BITRATE
,
50
,
10000000
,
50
);
obs_property_int_set_suffix
(
p
,
" Kbps"
);
p
=
obs_properties_add_bool
(
props
,
"use_bufsize"
,
TEXT_CUSTOM_BUF
);
obs_property_set_modified_callback
(
p
,
use_bufsize_modified
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录