Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
27761f9b
O
obs-studio
项目概览
尘离序散
/
obs-studio
与 Fork 源项目一致
从无法访问的项目Fork
通知
30
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
obs-studio
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
27761f9b
编写于
8月 10, 2015
作者:
P
Palana
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
coreaudio-encoder: Update bitrate property enumeration/logging
上级
c55643c4
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
56 addition
and
35 deletion
+56
-35
plugins/coreaudio-encoder/encoder.cpp
plugins/coreaudio-encoder/encoder.cpp
+56
-35
未找到文件。
plugins/coreaudio-encoder/encoder.cpp
浏览文件 @
27761f9b
...
...
@@ -2,6 +2,7 @@
#include <util/dstr.hpp>
#include <obs-module.h>
#include <algorithm>
#include <initializer_list>
#include <memory>
#include <vector>
...
...
@@ -1093,56 +1094,76 @@ static void aac_defaults(obs_data_t *settings)
obs_data_set_default_bool
(
settings
,
"allow he-aac"
,
true
);
}
struct
add_bitrates_helper
{
DARRAY
(
UInt32
)
bitrates
;
};
typedef
struct
add_bitrates_helper
add_bitrates_helper
;
static
void
add_bitrates_func
(
void
*
data
,
UInt32
min
,
UInt32
max
)
static
vector
<
UInt32
>
get_bitrates
(
DStr
&
log
,
ca_encoder
*
ca
)
{
add_bitrates_helper
*
helper
=
static_cast
<
add_bitrates_helper
*>
(
data
);
vector
<
UInt32
>
bitrates
;
if
(
da_find
(
helper
->
bitrates
,
&
min
,
0
)
==
DARRAY_INVALID
)
da_push_back
(
helper
->
bitrates
,
&
min
);
if
(
da_find
(
helper
->
bitrates
,
&
max
,
0
)
==
DARRAY_INVALID
)
da_push_back
(
helper
->
bitrates
,
&
max
);
}
auto
handle_bitrate
=
[
&
](
UInt32
bitrate
)
{
if
(
find
(
begin
(
bitrates
),
end
(
bitrates
),
bitrate
)
==
end
(
bitrates
))
{
log_to_dstr
(
log
,
ca
,
"Adding bitrate %u
\n
"
,
static_cast
<
uint32_t
>
(
bitrate
));
bitrates
.
push_back
(
bitrate
);
}
else
{
log_to_dstr
(
log
,
ca
,
"Bitrate %u already added
\n
"
,
static_cast
<
uint32_t
>
(
bitrate
));
}
};
static
int
bitrate_compare
(
const
void
*
data1
,
const
void
*
data2
)
{
const
UInt32
*
bitrate1
=
static_cast
<
const
UInt32
*>
(
data1
);
const
UInt32
*
bitrate2
=
static_cast
<
const
UInt32
*>
(
data2
);
auto
helper
=
[
&
](
UInt32
min_
,
UInt32
max_
)
{
handle_bitrate
(
min_
);
if
(
min_
==
max_
)
return
;
log_to_dstr
(
log
,
ca
,
"Got actual bitrate range: %u<->%u
\n
"
,
static_cast
<
uint32_t
>
(
min_
),
static_cast
<
uint32_t
>
(
max_
));
handle_bitrate
(
max_
);
};
for
(
UInt32
format_id
:
(
ca
?
*
ca
->
allowed_formats
:
aac_formats
))
{
log_to_dstr
(
log
,
ca
,
"Trying %s (0x%x)
\n
"
,
format_id_to_str
(
format_id
),
static_cast
<
uint32_t
>
(
format_id
));
auto
out
=
get_default_out_asbd_builder
()
.
format_id
(
format_id
)
.
asbd
;
return
(
int
)
*
bitrate1
-
(
int
)
*
bitrate2
;
auto
converter
=
get_converter
(
log
,
ca
,
out
);
if
(
converter
)
enumerate_bitrates
(
log
,
ca
,
converter
.
get
(),
helper
);
}
return
bitrates
;
}
static
void
add_bitrates
(
obs_property_t
*
prop
,
ca_encoder
*
ca
)
{
add_bitrates_helper
helper
=
{
{
{
0
}
}
}
;
DStr
log
;
for
(
UInt32
format_id
:
(
ca
?
*
ca
->
allowed_formats
:
aac_formats
))
enumerate_bitrates
(
ca
,
get_default_converter
(
format_id
),
add_bitrates_func
,
&
helper
);
auto
bitrates
=
get_bitrates
(
log
,
ca
);
if
(
!
helper
.
bitrates
.
num
)
{
CA_
BLOG
(
LOG_ERROR
,
"Enumeration found no
available bitrates"
);
if
(
!
bitrates
.
size
()
)
{
CA_
CO_DLOG_
(
LOG_ERROR
,
"Couldn't find
available bitrates"
);
return
;
}
qsort
(
helper
.
bitrates
.
array
,
helper
.
bitrates
.
num
,
sizeof
(
UInt32
),
bitrate_compare
);
if
(
log
->
len
)
CA_CO_DLOG_
(
LOG_DEBUG
,
"Bitrate enumeration log"
);
sort
(
begin
(
bitrates
),
end
(
bitrates
));
struct
dstr
str
=
{
0
};
for
(
size_t
i
=
0
;
i
<
helper
.
bitrates
.
num
;
i
++
)
{
dstr_printf
(
&
str
,
"%u"
,
(
uint32_t
)
helper
.
bitrates
.
array
[
i
]
/
1000
);
obs_property_list_add_int
(
prop
,
str
.
array
,
helper
.
bitrates
.
array
[
i
]
/
1000
);
DStr
buffer
;
for
(
UInt32
bitrate
:
bitrates
)
{
dstr_printf
(
buffer
,
"%u"
,
(
uint32_t
)
bitrate
/
1000
);
obs_property_list_add_int
(
prop
,
buffer
->
array
,
bitrate
/
1000
);
}
dstr_free
(
&
str
);
da_free
(
helper
.
bitrates
);
}
static
obs_properties_t
*
aac_properties
(
void
*
data
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录