We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] [v3] Patch to get and use the current hardware frequency with the AUDIO_GETFORMAT ioctl

sdl-getformat.patch (text/plain), 2.11 KB, created by Nia Alarie on 2021-01-08 12:46:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nia Alarie

Created: 2021-01-08 12:46:29 UTC

Size: 2.11 KB

patch

obsolete

>diff --git a/src/audio/netbsd/SDL_netbsdaudio.c b/src/audio/netbsd/SDL_netbsdaudio.c
>--- a/src/audio/netbsd/SDL_netbsdaudio.c
>+++ b/src/audio/netbsd/SDL_netbsdaudio.c
>@@ -205,7 +205,7 @@
> NETBSDAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture)
> {
>     SDL_AudioFormat format = 0;
>-    audio_info_t info;
>+    audio_info_t info, hwinfo;
>     struct audio_prinfo *prinfo = iscapture ? &info.record : &info.play;
> 
>     /* We don't care what the devname is...we'll try to open anything. */
>@@ -233,7 +233,21 @@
> 
>     AUDIO_INITINFO(&info);
> 
>+#ifdef AUDIO_GETFORMAT /* Introduced in NetBSD 9.0 */
>+    if (ioctl(this->hidden->audio_fd, AUDIO_GETFORMAT, &hwinfo) != -1) {
>+        /*
>+         * Use the device's native sample rate so the kernel doesn't have to
>+         * resample.
>+         */
>+        this->spec.freq = iscapture ?
>+            hwinfo.record.sample_rate : hwinfo.play.sample_rate;
>+        fprintf(stderr, "%d\n", this->spec.freq);
>+    }
>+#endif
>+
>     prinfo->encoding = AUDIO_ENCODING_NONE;
>+    prinfo->sample_rate = this->spec.freq;
>+    prinfo->channels = this->spec.channels;
> 
>     for (format = SDL_FirstAudioFormat(this->spec.format); format;) {
>         switch (format) {
>@@ -280,23 +294,19 @@
>         return SDL_SetError("No supported encoding for 0x%x", this->spec.format);
>     }
> 
>-    this->spec.format = format;
>-
>-    /* Calculate spec parameters based on our chosen format */
>-    SDL_CalculateAudioSpec(&this->spec);
>-
>-    info.mode = iscapture ? AUMODE_RECORD : AUMODE_PLAY;
>-    info.blocksize = this->spec.size;
>     info.hiwat = 5;
>     info.lowat = 3;
>-    prinfo->sample_rate = this->spec.freq;
>-    prinfo->channels = this->spec.channels;
>     (void) ioctl(this->hidden->audio_fd, AUDIO_SETINFO, &info);
> 
>     (void) ioctl(this->hidden->audio_fd, AUDIO_GETINFO, &info);
>+
>+    /* Final spec used for the device. */
>+    this->spec.format = format;
>     this->spec.freq = prinfo->sample_rate;
>     this->spec.channels = prinfo->channels;
> 
>+    SDL_CalculateAudioSpec(&this->spec);
>+
>     if (!iscapture) {
>         /* Allocate mixing buffer */
>         this->hidden->mixlen = this->spec.size;

Actions: View | Diff

Attachments on bug 5080: 4298 | 4299 | 4643

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.