cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add code similar to audio_out_oss to perform downsampling.

Browse Source
This commit is contained in:
espie 2002-05-28 14:32:31 +00:00
parent a53ab61a01
commit 4d55af8c59
1 changed files with 82 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
x11/ogle/patches/patch-libao_audio_out_solaris_c Normal file
View File

@ -0,0 +1,82 @@
$OpenBSD: patch-libao_audio_out_solaris_c,v 1.1 2002/05/28 14:32:31 espie Exp $
--- libao/audio_out_solaris.c.orig Mon Oct 22 03:23:49 2001
+++ libao/audio_out_solaris.c Tue May 28 16:28:30 2002
@@ -71,6 +71,37 @@ static inline int16_t convert (int32_t i
return i - 0x43c00000;
}
+unsigned char tr[235] =
+{
+ 0, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
+ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 81, 82, 83, 84,
+ 85, 86, 87, 88, 89, 90, 91, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
+ 104, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 118, 119, 120,
+ 121, 122, 123, 124, 125, 126, 127, 128, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
+ 153, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 167, 168, 169,
+ 170, 171, 172, 173, 174, 175, 176, 177, 179, 180, 181, 182, 183, 184, 185,
+ 186, 187, 188, 189, 190, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201,
+ 202, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 216, 217, 218,
+ 219, 220, 221, 222, 223, 224, 225, 226, 227, 229, 230, 231, 232, 233, 234,
+ 235, 236, 237, 238, 239, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250,
+ 251, 253, 254, 255
+};
+
+static inline int float_to_int48_44 (float * _f, int16_t * s16, int flags)
+{
+ int i;
+ int32_t * f = (int32_t *) _f;
+
+ for (i = 0; i < 235; i++) {
+ s16[2*i] = convert (f[tr[i]]);
+ s16[2*i+1] = convert (f[tr[i]+256]);
+ }
+ return i;
+}
+
static inline void float_to_int (float * _f, int16_t * s16, int flags)
{
int i;
@@ -97,6 +128,7 @@ int solaris_play (ao_instance_t * _insta
{
solaris_instance_t * instance = (solaris_instance_t *) _instance;
int16_t int16_samples[256*2];
+ static int downsample = 0;
#ifdef LIBA52_DOUBLE
float samples[256 * 2];
@@ -127,6 +159,15 @@ int solaris_play (ao_instance_t * _insta
perror ("Writing audio config block");
return 1;
}
+ if (info.play.sample_rate != instance->sample_rate &&
+ instance->sample_rate == 48000) {
+ info.play.sample_rate = 44100;
+ if (ioctl (instance->fd, AUDIO_SETINFO, &info) < 0) {
+ perror ("Writing audio config block");
+ return 1;
+ }
+ downsample = 1;
+ }
if ((info.play.sample_rate != instance->sample_rate) ||
(info.play.precision != 16) || (info.play.channels != 2)) {
@@ -149,8 +190,14 @@ int solaris_play (ao_instance_t * _insta
} else if (flags != instance->flags)
return 1;
- float_to_int (samples, int16_samples, flags);
- write (instance->fd, int16_samples, 256 * sizeof (int16_t) * 2);
+ if (downsample) {
+ int num;
+ num = float_to_int48_44(samples, int16_samples, flags);
+ write(instance->fd, int16_samples, num * sizeof (int16_t) * 2);
+ } else {
+ float_to_int (samples, int16_samples, flags);
+ write (instance->fd, int16_samples, 256 * sizeof (int16_t) * 2);
+ }
return 0;
}