Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Obs Studio
提交
2d1d9166
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,发现更多精彩内容 >>
未验证
提交
2d1d9166
编写于
5月 18, 2019
作者:
J
Jim
提交者:
GitHub
5月 18, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1885 from jpark37/minor-cleanup
Minor cleanup
上级
c22077ae
493648c6
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
4 addition
and
32 deletion
+4
-32
UI/window-projector.cpp
UI/window-projector.cpp
+0
-22
libobs/data/default.effect
libobs/data/default.effect
+1
-1
plugins/obs-filters/chroma-key-filter.c
plugins/obs-filters/chroma-key-filter.c
+3
-7
plugins/obs-filters/data/chroma_key_filter.effect
plugins/obs-filters/data/chroma_key_filter.effect
+0
-1
plugins/obs-filters/data/color_key_filter.effect
plugins/obs-filters/data/color_key_filter.effect
+0
-1
未找到文件。
UI/window-projector.cpp
浏览文件 @
2d1d9166
...
...
@@ -226,28 +226,6 @@ static OBSSource CreateLabel(const char *name, size_t h)
return
txtSource
;
}
static
inline
void
renderVB
(
gs_effect_t
*
effect
,
gs_vertbuffer_t
*
vb
,
int
cx
,
int
cy
)
{
if
(
!
vb
)
return
;
matrix4
transform
;
matrix4_identity
(
&
transform
);
transform
.
x
.
x
=
cx
;
transform
.
y
.
y
=
cy
;
gs_load_vertexbuffer
(
vb
);
gs_matrix_push
();
gs_matrix_mul
(
&
transform
);
while
(
gs_effect_loop
(
effect
,
"Solid"
))
gs_draw
(
GS_LINESTRIP
,
0
,
0
);
gs_matrix_pop
();
}
static
inline
uint32_t
labelOffset
(
obs_source_t
*
label
,
uint32_t
cx
)
{
uint32_t
w
=
obs_source_get_width
(
label
);
...
...
libobs/data/default.effect
浏览文件 @
2d1d9166
...
...
@@ -37,7 +37,7 @@ float4 PSDrawAlphaDivide(VertInOut vert_in) : TARGET
float4 PSDrawMatrix(VertInOut vert_in) : TARGET
{
float3 rgb = image.Sample(def_sampler, vert_in.uv).rgb;
float3 yuv = mul(float4(
saturate(rgb)
, 1.0), color_matrix).xyz;
float3 yuv = mul(float4(
rgb
, 1.0), color_matrix).xyz;
return float4(yuv, 1.0);
}
...
...
plugins/obs-filters/chroma-key-filter.c
浏览文件 @
2d1d9166
...
...
@@ -35,7 +35,6 @@ struct chroma_key_filter_data {
gs_eparam_t
*
pixel_size_param
;
gs_eparam_t
*
chroma_param
;
gs_eparam_t
*
key_rgb_param
;
gs_eparam_t
*
similarity_param
;
gs_eparam_t
*
smoothness_param
;
gs_eparam_t
*
spill_param
;
...
...
@@ -45,7 +44,6 @@ struct chroma_key_filter_data {
float
brightness
;
float
gamma
;
struct
vec4
key_rgb
;
struct
vec2
chroma
;
float
similarity
;
float
smoothness
;
...
...
@@ -97,6 +95,7 @@ static inline void chroma_settings_update(
SETTING_KEY_COLOR
);
const
char
*
key_type
=
obs_data_get_string
(
settings
,
SETTING_COLOR_TYPE
);
struct
vec4
key_rgb
;
struct
vec4
key_color_v4
;
struct
matrix4
yuv_mat_m4
;
...
...
@@ -107,10 +106,10 @@ static inline void chroma_settings_update(
else
if
(
strcmp
(
key_type
,
"magenta"
)
==
0
)
key_color
=
0xFF00FF
;
vec4_from_rgba
(
&
filter
->
key_rgb
,
key_color
|
0xFF000000
);
vec4_from_rgba
(
&
key_rgb
,
key_color
|
0xFF000000
);
memcpy
(
&
yuv_mat_m4
,
yuv_mat
,
sizeof
(
yuv_mat
));
vec4_transform
(
&
key_color_v4
,
&
filter
->
key_rgb
,
&
yuv_mat_m4
);
vec4_transform
(
&
key_color_v4
,
&
key_rgb
,
&
yuv_mat_m4
);
vec2_set
(
&
filter
->
chroma
,
key_color_v4
.
y
,
key_color_v4
.
z
);
filter
->
similarity
=
(
float
)
similarity
/
1000
.
0
f
;
...
...
@@ -161,8 +160,6 @@ static void *chroma_key_create(obs_data_t *settings, obs_source_t *context)
filter
->
effect
,
"gamma"
);
filter
->
chroma_param
=
gs_effect_get_param_by_name
(
filter
->
effect
,
"chroma_key"
);
filter
->
key_rgb_param
=
gs_effect_get_param_by_name
(
filter
->
effect
,
"key_rgb"
);
filter
->
pixel_size_param
=
gs_effect_get_param_by_name
(
filter
->
effect
,
"pixel_size"
);
filter
->
similarity_param
=
gs_effect_get_param_by_name
(
...
...
@@ -205,7 +202,6 @@ static void chroma_key_render(void *data, gs_effect_t *effect)
gs_effect_set_float
(
filter
->
brightness_param
,
filter
->
brightness
);
gs_effect_set_float
(
filter
->
gamma_param
,
filter
->
gamma
);
gs_effect_set_vec2
(
filter
->
chroma_param
,
&
filter
->
chroma
);
gs_effect_set_vec4
(
filter
->
key_rgb_param
,
&
filter
->
key_rgb
);
gs_effect_set_vec2
(
filter
->
pixel_size_param
,
&
pixel_size
);
gs_effect_set_float
(
filter
->
similarity_param
,
filter
->
similarity
);
gs_effect_set_float
(
filter
->
smoothness_param
,
filter
->
smoothness
);
...
...
plugins/obs-filters/data/chroma_key_filter.effect
浏览文件 @
2d1d9166
...
...
@@ -12,7 +12,6 @@ uniform float brightness;
uniform float gamma;
uniform float2 chroma_key;
uniform float4 key_rgb;
uniform float2 pixel_size;
uniform float similarity;
uniform float smoothness;
...
...
plugins/obs-filters/data/color_key_filter.effect
浏览文件 @
2d1d9166
...
...
@@ -42,7 +42,6 @@ float GetColorDist(float3 rgb)
float4 ProcessColorKey(float4 rgba, VertData v_in)
{
float colorDist = GetColorDist(rgba.rgb);
float baseMask = colorDist - similarity;
rgba.a *= saturate(max(colorDist - similarity, 0.0) / smoothness);
return CalcColor(rgba);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录