Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Obs Studio
提交
9ebc3d13
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,发现更多精彩内容 >>
未验证
提交
9ebc3d13
编写于
12月 14, 2019
作者:
J
Jim
提交者:
GitHub
12月 14, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2220 from dionney/rate_control_vaapi
obs-ffmpeg: Enable VAAPI Rate Control
上级
7a193560
2841dfc6
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
96 addition
and
6 deletion
+96
-6
plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c
plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c
+96
-6
未找到文件。
plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c
浏览文件 @
9ebc3d13
...
...
@@ -160,19 +160,69 @@ static bool vaapi_init_codec(struct vaapi_encoder *enc, const char *path)
return
true
;
}
/* "Allowed" options per Rate Control
* See FFMPEG libavcodec/vaapi_encode.c (vaapi_encode_rc_modes)
*/
typedef
struct
{
const
char
*
name
;
bool
qp
;
bool
bitrate
;
bool
maxrate
;
}
rc_mode_t
;
static
const
rc_mode_t
*
get_rc_mode
(
const
char
*
name
)
{
/* Set "allowed" options per Rate Control */
static
const
rc_mode_t
RC_MODES
[]
=
{
{.
name
=
"CBR"
,
.
qp
=
false
,
.
bitrate
=
true
,
.
maxrate
=
false
},
{.
name
=
"CQP"
,
.
qp
=
true
,
.
bitrate
=
false
,
.
maxrate
=
false
},
{.
name
=
"VBR"
,
.
qp
=
false
,
.
bitrate
=
true
,
.
maxrate
=
true
},
NULL
};
const
rc_mode_t
*
rc_mode
=
RC_MODES
;
while
(
!!
rc_mode
&&
strcmp
(
rc_mode
->
name
,
name
)
!=
0
)
rc_mode
++
;
return
rc_mode
?
rc_mode
:
RC_MODES
;
}
static
bool
vaapi_update
(
void
*
data
,
obs_data_t
*
settings
)
{
struct
vaapi_encoder
*
enc
=
data
;
const
char
*
device
=
obs_data_get_string
(
settings
,
"vaapi_device"
);
const
char
*
rate_control
=
obs_data_get_string
(
settings
,
"rate_control"
);
const
rc_mode_t
*
rc_mode
=
get_rc_mode
(
rate_control
);
bool
cbr
=
strcmp
(
rc_mode
->
name
,
"CBR"
)
==
0
;
int
profile
=
(
int
)
obs_data_get_int
(
settings
,
"profile"
);
int
bf
=
(
int
)
obs_data_get_int
(
settings
,
"bf"
);
int
qp
=
rc_mode
->
qp
?
(
int
)
obs_data_get_int
(
settings
,
"qp"
)
:
0
;
av_opt_set_int
(
enc
->
context
->
priv_data
,
"qp"
,
qp
,
0
);
int
level
=
(
int
)
obs_data_get_int
(
settings
,
"level"
);
int
bitrate
=
(
int
)
obs_data_get_int
(
settings
,
"bitrate"
);
int
bitrate
=
rc_mode
->
bitrate
?
(
int
)
obs_data_get_int
(
settings
,
"bitrate"
)
:
0
;
int
maxrate
=
rc_mode
->
maxrate
?
(
int
)
obs_data_get_int
(
settings
,
"maxrate"
)
:
0
;
int
keyint_sec
=
(
int
)
obs_data_get_int
(
settings
,
"keyint_sec"
);
/* For Rate Control which allows maxrate, FFMPEG will give
* an error if maxrate > bitrate. To prevent that set maxrate
* to 0.
* For CBR, maxrate = bitrate
*/
if
(
cbr
)
maxrate
=
bitrate
;
else
if
(
rc_mode
->
maxrate
&&
maxrate
&&
maxrate
<
bitrate
)
maxrate
=
0
;
video_t
*
video
=
obs_encoder_video
(
enc
->
encoder
);
const
struct
video_output_info
*
voi
=
video_output_get_info
(
video
);
struct
video_scale_info
info
;
...
...
@@ -187,7 +237,7 @@ static bool vaapi_update(void *data, obs_data_t *settings)
enc
->
context
->
max_b_frames
=
bf
;
enc
->
context
->
level
=
level
;
enc
->
context
->
bit_rate
=
bitrate
*
1000
;
enc
->
context
->
rc_max_rate
=
bit
rate
*
1000
;
enc
->
context
->
rc_max_rate
=
max
rate
*
1000
;
enc
->
context
->
width
=
obs_encoder_get_width
(
enc
->
encoder
);
enc
->
context
->
height
=
obs_encoder_get_height
(
enc
->
encoder
);
...
...
@@ -212,15 +262,18 @@ static bool vaapi_update(void *data, obs_data_t *settings)
info
(
"settings:
\n
"
"
\t
device: %s
\n
"
"
\t
rate_control: %s
\n
"
"
\t
profile: %d
\n
"
"
\t
level: %d
\n
"
"
\t
qp: %d
\n
"
"
\t
bitrate: %d
\n
"
"
\t
maxrate: %d
\n
"
"
\t
keyint: %d
\n
"
"
\t
width: %d
\n
"
"
\t
height: %d
\n
"
"
\t
b-frames: %d
\n
"
,
device
,
profile
,
level
,
bitrate
,
enc
->
context
->
gop_siz
e
,
enc
->
context
->
width
,
enc
->
context
->
height
,
device
,
rate_control
,
profile
,
level
,
qp
,
bitrate
,
maxrat
e
,
enc
->
context
->
gop_size
,
enc
->
context
->
width
,
enc
->
context
->
height
,
enc
->
context
->
max_b_frames
);
return
vaapi_init_codec
(
enc
,
device
);
...
...
@@ -446,6 +499,27 @@ static void vaapi_defaults(obs_data_t *settings)
obs_data_set_default_int
(
settings
,
"keyint_sec"
,
0
);
obs_data_set_default_int
(
settings
,
"bf"
,
0
);
obs_data_set_default_int
(
settings
,
"rendermode"
,
0
);
obs_data_set_default_string
(
settings
,
"rate_control"
,
"CBR"
);
obs_data_set_default_int
(
settings
,
"qp"
,
20
);
obs_data_set_default_int
(
settings
,
"maxrate"
,
0
);
}
static
bool
rate_control_modified
(
obs_properties_t
*
ppts
,
obs_property_t
*
p
,
obs_data_t
*
settings
)
{
UNUSED_PARAMETER
(
p
);
const
char
*
rate_control
=
obs_data_get_string
(
settings
,
"rate_control"
);
const
rc_mode_t
*
rc_mode
=
get_rc_mode
(
rate_control
);
/* Set options visibility per Rate Control */
set_visible
(
ppts
,
"qp"
,
rc_mode
->
qp
);
set_visible
(
ppts
,
"bitrate"
,
rc_mode
->
bitrate
);
set_visible
(
ppts
,
"maxrate"
,
rc_mode
->
maxrate
);
return
true
;
}
static
obs_properties_t
*
vaapi_properties
(
void
*
unused
)
...
...
@@ -486,14 +560,30 @@ 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
);
list
=
obs_properties_add_list
(
props
,
"rate_control"
,
obs_module_text
(
"RateControl"
),
OBS_COMBO_TYPE_LIST
,
OBS_COMBO_FORMAT_STRING
);
obs_property_list_add_string
(
list
,
"CBR (default)"
,
"CBR"
);
obs_property_list_add_string
(
list
,
"CQP"
,
"CQP"
);
obs_property_list_add_string
(
list
,
"VBR"
,
"VBR"
);
obs_property_set_modified_callback
(
list
,
rate_control_modified
);
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"
);
p
=
obs_properties_add_int
(
props
,
"maxrate"
,
obs_module_text
(
"MaxBitrate"
),
0
,
300000
,
50
);
obs_property_int_set_suffix
(
p
,
" Kbps"
);
obs_properties_add_int
(
props
,
"qp"
,
"QP"
,
0
,
51
,
1
);
obs_properties_add_int
(
props
,
"keyint_sec"
,
obs_module_text
(
"Keyframe
Interval (seconds)"
)
,
0
,
20
,
1
);
obs_module_text
(
"Keyframe
IntervalSec"
),
0
,
20
,
1
);
return
props
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录