Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
f7ec6043
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,发现更多精彩内容 >>
未验证
提交
f7ec6043
编写于
7月 18, 2020
作者:
J
Jim
提交者:
GitHub
7月 18, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3179 from pkviet/coreaudio4
coreaudio-encoder: Fix encoding of 4.0 speaker layout
上级
5537a6ce
2ab549e1
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
39 addition
and
1 deletion
+39
-1
plugins/coreaudio-encoder/encoder.cpp
plugins/coreaudio-encoder/encoder.cpp
+21
-1
plugins/coreaudio-encoder/windows-imports.h
plugins/coreaudio-encoder/windows-imports.h
+18
-0
未找到文件。
plugins/coreaudio-encoder/encoder.cpp
浏览文件 @
f7ec6043
...
...
@@ -597,14 +597,34 @@ static void *aac_create(obs_data_t *settings, obs_encoder_t *encoder)
/*
* Fix channel map differences between CoreAudio AAC, FFmpeg, Wav
* New channel mappings below assume 2.1, 4.1, 5.1, 7.1 resp.
* New channel mappings below assume 2.1, 4.
0, 4.
1, 5.1, 7.1 resp.
*/
if
(
ca
->
channels
==
3
)
{
SInt32
channelMap3
[
3
]
=
{
2
,
0
,
1
};
AudioConverterSetProperty
(
ca
->
converter
,
kAudioConverterChannelMap
,
sizeof
(
channelMap3
),
channelMap3
);
}
else
if
(
ca
->
channels
==
4
)
{
/*
* For four channels coreaudio encoder has default channel "quad"
* instead of 4.0. So explicitly set channel layout to
* kAudioChannelLayoutTag_MPEG_4_0_B = (116L << 16) | 4.
*/
AudioChannelLayout
inAcl
=
{
0
};
inAcl
.
mChannelLayoutTag
=
(
116L
<<
16
)
|
4
;
AudioConverterSetProperty
(
ca
->
converter
,
kAudioConverterInputChannelLayout
,
sizeof
(
inAcl
),
&
inAcl
);
AudioConverterSetProperty
(
ca
->
converter
,
kAudioConverterOutputChannelLayout
,
sizeof
(
inAcl
),
&
inAcl
);
SInt32
channelMap4
[
4
]
=
{
2
,
0
,
1
,
3
};
AudioConverterSetProperty
(
ca
->
converter
,
kAudioConverterChannelMap
,
sizeof
(
channelMap4
),
channelMap4
);
}
else
if
(
ca
->
channels
==
5
)
{
SInt32
channelMap5
[
5
]
=
{
2
,
0
,
1
,
3
,
4
};
AudioConverterSetProperty
(
ca
->
converter
,
...
...
plugins/coreaudio-encoder/windows-imports.h
浏览文件 @
f7ec6043
...
...
@@ -61,6 +61,24 @@ struct AudioStreamPacketDescription {
};
typedef
struct
AudioStreamPacketDescription
AudioStreamPacketDescription
;
typedef
UInt32
AudioChannelLabel
;
typedef
UInt32
AudioChannelLayoutTag
;
struct
AudioChannelDescription
{
AudioChannelLabel
mChannelLabel
;
UInt32
mChannelFlags
;
float
mCoordinates
[
3
];
};
typedef
struct
AudioChannelDescription
AudioChannelDescription
;
struct
AudioChannelLayout
{
AudioChannelLayoutTag
mChannelLayoutTag
;
UInt32
mChannelBitmap
;
UInt32
mNumberChannelDescriptions
;
AudioChannelDescription
mChannelDescriptions
[
kVariableLengthArray
];
};
typedef
struct
AudioChannelLayout
AudioChannelLayout
;
typedef
OSStatus
(
*
AudioConverterComplexInputDataProc
)(
AudioConverterRef
inAudioConverter
,
UInt32
*
ioNumberDataPackets
,
AudioBufferList
*
ioData
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录