Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
miniaudio
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
miniaudio
Commits
13675cc1
Commit
13675cc1
authored
Jul 28, 2018
by
David Reid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Work on the audioio backend.
parent
b0a8df7f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
70 additions
and
7 deletions
+70
-7
mini_al.h
mini_al.h
+69
-7
tests/mal_test_0.c
tests/mal_test_0.c
+1
-0
No files found.
mini_al.h
View file @
13675cc1
...
@@ -14911,10 +14911,66 @@ mal_result mal_context_get_device_info_from_fd__audioio(mal_context* pContext, m
...
@@ -14911,10 +14911,66 @@ mal_result mal_context_get_device_info_from_fd__audioio(mal_context* pContext, m
(void)pContext;
(void)pContext;
(void)deviceType;
(void)deviceType;
(void)fd;
(void)pInfoOut;
audio_device_t fdDevice;
if (ioctl(fd, AUDIO_GETDEV, &fdDevice) < 0) {
return MAL_ERROR; // Failed to retrieve device info.
}
// Name.
mal_strcpy_s(pInfoOut->name, sizeof(pInfoOut->name), fdDevice.name);
// Supported formats. We get this by looking at the encodings.
int counter = 0;
for (;;) {
audio_encoding_t encoding;
mal_zero_object(&encoding);
encoding.index = counter;
if (ioctl(fd, AUDIO_GETENC, &encoding) < 0) {
break;
}
if (encoding.precision == 8 && (encoding.encoding == AUDIO_ENCODING_ULINEAR || encoding.encoding == AUDIO_ENCODING_ULINEAR || encoding.encoding == AUDIO_ENCODING_ULINEAR_LE || encoding.encoding == AUDIO_ENCODING_ULINEAR_BE)) {
pInfoOut->formats[pInfoOut->formatCount++] = mal_format_u8;
} else {
if (encoding.encoding == AUDIO_ENCODING_SLINEAR_LE) {
if (encoding.precision == 16) {
pInfoOut->formats[pInfoOut->formatCount++] = mal_format_s16;
} else if (encoding.precision == 24) {
pInfoOut->formats[pInfoOut->formatCount++] = mal_format_s24;
} else if (encoding.precision == 32) {
pInfoOut->formats[pInfoOut->formatCount++] = mal_format_s32;
}
}
}
#if 0
printf("Encoding Name: %s\n", encoding.name);
printf(" Encoding: %d\n", encoding.encoding);
printf(" Precision: %d\n", encoding.precision);
printf(" Flags: %d\n", encoding.flags);
#endif
counter += 1;
}
audio_info_t fdInfo;
if (ioctl(fd, AUDIO_GETINFO, &fdInfo) < 0) {
return MAL_ERROR;
}
if (deviceType == mal_device_type_playback) {
pInfoOut->minChannels = fdInfo.play.channels;
pInfoOut->maxChannels = fdInfo.play.channels;
pInfoOut->minSampleRate = fdInfo.play.sample_rate;
pInfoOut->maxSampleRate = fdInfo.play.sample_rate;
} else {
pInfoOut->minChannels = fdInfo.record.channels;
pInfoOut->maxChannels = fdInfo.record.channels;
pInfoOut->minSampleRate = fdInfo.record.sample_rate;
pInfoOut->maxSampleRate = fdInfo.record.sample_rate;
}
// TODO: Implement me.
return MAL_SUCCESS;
return MAL_SUCCESS;
}
}
...
@@ -14946,7 +15002,7 @@ mal_result mal_context_enumerate_devices__audioio(mal_context* pContext, mal_enu
...
@@ -14946,7 +15002,7 @@ mal_result mal_context_enumerate_devices__audioio(mal_context* pContext, mal_enu
mal_device_info deviceInfo;
mal_device_info deviceInfo;
mal_zero_object(&deviceInfo);
mal_zero_object(&deviceInfo);
mal_construct_device_id__audioio(deviceInfo.id.audioio, sizeof(deviceInfo.id.audioio), "/dev/audio", iDevice);
mal_construct_device_id__audioio(deviceInfo.id.audioio, sizeof(deviceInfo.id.audioio), "/dev/audio", iDevice);
if (mal_context_get_device_info_from_fd__audioio(pContext, mal_device_type_playback, fd, &deviceInfo)
!
= MAL_SUCCESS) {
if (mal_context_get_device_info_from_fd__audioio(pContext, mal_device_type_playback, fd, &deviceInfo)
=
= MAL_SUCCESS) {
isTerminating = !callback(pContext, mal_device_type_playback, &deviceInfo, pUserData);
isTerminating = !callback(pContext, mal_device_type_playback, &deviceInfo, pUserData);
}
}
...
@@ -14962,7 +15018,7 @@ mal_result mal_context_enumerate_devices__audioio(mal_context* pContext, mal_enu
...
@@ -14962,7 +15018,7 @@ mal_result mal_context_enumerate_devices__audioio(mal_context* pContext, mal_enu
mal_device_info deviceInfo;
mal_device_info deviceInfo;
mal_zero_object(&deviceInfo);
mal_zero_object(&deviceInfo);
mal_construct_device_id__audioio(deviceInfo.id.audioio, sizeof(deviceInfo.id.audioio), "/dev/audio", iDevice);
mal_construct_device_id__audioio(deviceInfo.id.audioio, sizeof(deviceInfo.id.audioio), "/dev/audio", iDevice);
if (mal_context_get_device_info_from_fd__audioio(pContext, mal_device_type_capture, fd, &deviceInfo)
!
= MAL_SUCCESS) {
if (mal_context_get_device_info_from_fd__audioio(pContext, mal_device_type_capture, fd, &deviceInfo)
=
= MAL_SUCCESS) {
isTerminating = !callback(pContext, mal_device_type_capture, &deviceInfo, pUserData);
isTerminating = !callback(pContext, mal_device_type_capture, &deviceInfo, pUserData);
}
}
...
@@ -14988,15 +15044,21 @@ mal_result mal_context_get_device_info__audioio(mal_context* pContext, mal_devic
...
@@ -14988,15 +15044,21 @@ mal_result mal_context_get_device_info__audioio(mal_context* pContext, mal_devic
// from the device ID which will be in "/dev/audioN" format.
// from the device ID which will be in "/dev/audioN" format.
int fd = -1;
int fd = -1;
int deviceIndex = -1;
int deviceIndex = -1;
char ctlid[256];
if (pDeviceID == NULL) {
if (pDeviceID == NULL) {
// Default device.
// Default device.
fd = open("/dev/audioctl", (deviceType == mal_device_type_playback) ? O_RDONLY : O_WRONLY, 0
);
mal_strcpy_s(ctlid, sizeof(ctlid), "/dev/audioctl"
);
} else {
} else {
// Specific device. We need to convert from "/dev/audioN" to "/dev/audioctlN".
// Specific device. We need to convert from "/dev/audioN" to "/dev/audioctlN".
mal_result result = mal_extract_device_index_from_id__audioio(pDeviceID->audioio, "/dev/audio", &deviceIndex);
if (result != MAL_SUCCESS) {
return result;
}
// TODO: Implement me.
mal_construct_device_id__audioio(ctlid, sizeof(ctlid), "/dev/audioctl", deviceIndex);
}
}
fd = open(ctlid, (deviceType == mal_device_type_playback) ? O_RDONLY : O_WRONLY, 0);
if (fd == -1) {
if (fd == -1) {
return MAL_NO_DEVICE;
return MAL_NO_DEVICE;
}
}
tests/mal_test_0.c
View file @
13675cc1
...
@@ -26,6 +26,7 @@ mal_backend g_Backends[] = {
...
@@ -26,6 +26,7 @@ mal_backend g_Backends[] = {
mal_backend_dsound
,
mal_backend_dsound
,
mal_backend_winmm
,
mal_backend_winmm
,
mal_backend_coreaudio
,
mal_backend_coreaudio
,
mal_backend_audioio
,
mal_backend_oss
,
mal_backend_oss
,
mal_backend_pulseaudio
,
mal_backend_pulseaudio
,
mal_backend_alsa
,
mal_backend_alsa
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment