Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
anbox
提交
1913017f
A
anbox
项目概览
openeuler
/
anbox
通知
24
Star
1
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
anbox
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
1913017f
编写于
7月 29, 2020
作者:
O
openeuler-ci-bot
提交者:
Gitee
7月 29, 2020
浏览文件
操作
浏览文件
下载
差异文件
!60 dynamically obtain the name of usb sound card for audio unit test
Merge pull request !60 from twwang/master
上级
116594ee
2af7713e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
8 deletion
+13
-8
src/anbox/audio/alsa_helper.cpp
src/anbox/audio/alsa_helper.cpp
+1
-1
tests/anbox/audio/alsa_helper_tests.cpp
tests/anbox/audio/alsa_helper_tests.cpp
+12
-7
未找到文件。
src/anbox/audio/alsa_helper.cpp
浏览文件 @
1913017f
...
...
@@ -89,7 +89,7 @@ int AlsaHelper::set_pcm_params(hwparams params)
int
AlsaHelper
::
set_params
()
{
snd_pcm_hw_params_t
*
params
;
snd_pcm_hw_params_t
*
params
=
nullptr
;
snd_pcm_uframes_t
buffer_size
;
snd_pcm_uframes_t
frames
;
int
err
=
-
1
;
// negative indicate error, otherwise success
...
...
tests/anbox/audio/alsa_helper_tests.cpp
浏览文件 @
1913017f
...
...
@@ -28,13 +28,14 @@ TEST (AlsaHelper, OpenPcmDevice) {
EXPECT_EQ
(
0
,
alsahelper
.
open_pcm_device
(
"default"
,
SND_PCM_STREAM_CAPTURE
,
0
));
alsahelper
.
close_pcm_device
();
EXPECT_EQ
(
0
,
alsahelper
.
open_pcm_device
(
"hw:2,0"
,
SND_PCM_STREAM_CAPTURE
,
0
));
std
::
string
deviceName
=
alsahelper
.
get_usb_audio_device_name
();
EXPECT_EQ
(
0
,
alsahelper
.
open_pcm_device
(
deviceName
.
c_str
(),
SND_PCM_STREAM_CAPTURE
,
0
));
alsahelper
.
close_pcm_device
();
EXPECT_EQ
(
0
,
alsahelper
.
open_pcm_device
(
"default"
,
SND_PCM_STREAM_PLAYBACK
,
0
));
alsahelper
.
close_pcm_device
();
EXPECT_EQ
(
0
,
alsahelper
.
open_pcm_device
(
"hw:2,0"
,
SND_PCM_STREAM_PLAYBACK
,
0
));
EXPECT_EQ
(
0
,
alsahelper
.
open_pcm_device
(
deviceName
.
c_str
()
,
SND_PCM_STREAM_PLAYBACK
,
0
));
alsahelper
.
close_pcm_device
();
// pc doesn't has hw:4,0 so open fail
...
...
@@ -56,7 +57,8 @@ TEST (AlsaHelper, ClosePcmDevice) {
TEST
(
AlsaHelper
,
SetPcmParams
)
{
AlsaHelper
alsahelper
;
alsahelper
.
open_pcm_device
(
"hw:2,0"
,
SND_PCM_STREAM_CAPTURE
,
0
);
std
::
string
deviceName
=
alsahelper
.
get_usb_audio_device_name
();
alsahelper
.
open_pcm_device
(
deviceName
.
c_str
(),
SND_PCM_STREAM_CAPTURE
,
0
);
hwparams
mhwparams
;
// rate is correct
{
...
...
@@ -97,7 +99,8 @@ TEST (AlsaHelper, SetPcmParams) {
TEST
(
AlsaHelper
,
PcmRead
)
{
AlsaHelper
alsahelper
;
alsahelper
.
open_pcm_device
(
"hw:2,0"
,
SND_PCM_STREAM_CAPTURE
,
0
);
std
::
string
deviceName
=
alsahelper
.
get_usb_audio_device_name
();
alsahelper
.
open_pcm_device
(
deviceName
.
c_str
(),
SND_PCM_STREAM_CAPTURE
,
0
);
hwparams
params
;
params
.
rate
=
48000
;
// 48kHZ
params
.
channels
=
CHANELTYPE_MONO
;
...
...
@@ -119,7 +122,8 @@ TEST (AlsaHelper, PcmRead) {
TEST
(
AlsaHelper
,
GetPeriodFrames
)
{
AlsaHelper
alsahelper
;
alsahelper
.
open_pcm_device
(
"hw:2,0"
,
SND_PCM_STREAM_CAPTURE
,
0
);
std
::
string
deviceName
=
alsahelper
.
get_usb_audio_device_name
();
alsahelper
.
open_pcm_device
(
deviceName
.
c_str
(),
SND_PCM_STREAM_CAPTURE
,
0
);
hwparams
params
;
params
.
rate
=
48000
;
// 48KHz
params
.
channels
=
CHANELTYPE_MONO
;
...
...
@@ -132,7 +136,8 @@ TEST (AlsaHelper, GetPeriodFrames) {
TEST
(
AlsaHelper
,
GetPeriodFramesBytes
){
AlsaHelper
alsahelper
;
alsahelper
.
open_pcm_device
(
"hw:2,0"
,
SND_PCM_STREAM_CAPTURE
,
0
);
std
::
string
deviceName
=
alsahelper
.
get_usb_audio_device_name
();
alsahelper
.
open_pcm_device
(
deviceName
.
c_str
(),
SND_PCM_STREAM_CAPTURE
,
0
);
hwparams
params
;
params
.
rate
=
48000
;
// 48kHZ
params
.
channels
=
CHANELTYPE_MONO
;
...
...
@@ -148,7 +153,7 @@ TEST(AlsaHelper,GetUsbAudioDeviceName){
AlsaHelper
alsahelper
;
std
::
string
deviceName
;
deviceName
=
alsahelper
.
get_usb_audio_device_name
();
EXPECT_EQ
(
deviceName
,
"hw:
2
,0"
);
EXPECT_EQ
(
deviceName
,
"hw:
1
,0"
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录