Changeset 6056 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Dec 12, 2007 10:58:26 PM (17 years ago)

Author:

vboxsync

Message:

first version of a PulseAudio driver backend for Linux (still no pcm_in)

Location:

trunk/src/VBox/Devices/Audio

Files:

• alsaaudio.c (modified) (2 diffs)
• audio.c (modified) (8 diffs)
• audio.h (modified) (1 diff)
• audio_int.h (modified) (1 diff)

trunk/src/VBox/Devices/Audio/alsaaudio.c

@@ -179 +179 @@
         return SND_PCM_FORMAT_U16_LE;
 
+    case AUD_FMT_S32:
+        return SND_PCM_FORMAT_S32_LE;
+
+    case AUD_FMT_U32:
+        return SND_PCM_FORMAT_U32_LE;
+
     default:
         dolog ("Internal logic error: Bad audio format %d\n", fmt);
@@ -219 +225 @@
         *endianness = 1;
         *fmt = AUD_FMT_U16;
+        break;
+
+    case SND_PCM_FORMAT_S32_LE:
+        *endianness = 0;
+        *fmt = AUD_FMT_S32;
+        break;
+
+    case SND_PCM_FORMAT_U32_LE:
+        *endianness = 0;
+        *fmt = AUD_FMT_U32;
+        break;
+
+    case SND_PCM_FORMAT_S32_BE:
+        *endianness = 1;
+        *fmt = AUD_FMT_S32;
+        break;
+
+    case SND_PCM_FORMAT_U32_BE:
+        *endianness = 1;
+        *fmt = AUD_FMT_U32;
         break;
 

trunk/src/VBox/Devices/Audio/audio.c

@@ -68 +68 @@
     &alsa_audio_driver,
 #endif
+#ifdef VBOX_WITH_PULSE
+    &pulse_audio_driver,
+#endif
 #endif
 #ifdef RT_OS_DARWIN
@@ -258 +261 @@
         return "U16";
 
+    case AUD_FMT_U32:
+        return "U32";
+
     case AUD_FMT_S8:
         return "S8";
@@ -263 +269 @@
     case AUD_FMT_S16:
         return "S16";
+
+    case AUD_FMT_S32:
+        return "S32";
     }
 
@@ -280 +289 @@
         return AUD_FMT_U16;
     }
+    else if (!strcasecmp (s, "u32")) {
+        *defaultp = 0;
+        return AUD_FMT_U32;
+    }
     else if (!strcasecmp (s, "s8")) {
         *defaultp = 0;
@@ -287 +300 @@
         *defaultp = 0;
         return AUD_FMT_S16;
+    }
+    else if (!strcasecmp (s, "s32")) {
+        *defaultp = 0;
+        return AUD_FMT_S32;
     }
     else {
@@ -498 +515 @@
     case AUD_FMT_S16:
     case AUD_FMT_U16:
+    case AUD_FMT_S32:
+    case AUD_FMT_U32:
         break;
     default:
@@ -523 +542 @@
         bits = 16;
         break;
+
+    case AUD_FMT_S32:
+        sign = 1;
+    case AUD_FMT_U32:
+        bits = 32;
+        break;
     }
     return info->freq == as->freq
@@ -545 +570 @@
     case AUD_FMT_U16:
         bits = 16;
+        break;
+
+    case AUD_FMT_S32:
+        sign = 1;
+    case AUD_FMT_U32:
+        bits = 32;
         break;
     }

trunk/src/VBox/Devices/Audio/audio.h

@@ -39 +39 @@
     AUD_FMT_S8,
     AUD_FMT_U16,
-    AUD_FMT_S16
+    AUD_FMT_S16,
+    AUD_FMT_U32,
+    AUD_FMT_S32
 } audfmt_e;
 

trunk/src/VBox/Devices/Audio/audio_int.h

@@ -213 +213 @@
 extern struct audio_driver fmod_audio_driver;
 extern struct audio_driver alsa_audio_driver;
+extern struct audio_driver pulse_audio_driver;
 extern struct audio_driver coreaudio_audio_driver;
 extern struct audio_driver dsound_audio_driver;