1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
--- sys/oss/gstosssink.c.orig 2013-09-24 15:05:22.000000000 +0200
+++ sys/oss/gstosssink.c 2014-09-11 09:10:55.116013220 +0200
@@ -106,7 +106,10 @@
PROP_DEVICE,
};
-#define FORMATS "{" GST_AUDIO_NE(S16)","GST_AUDIO_NE(U16)", S8, U8 }"
+#define FORMATS "{" GST_AUDIO_NE(S32)","GST_AUDIO_NE(U32)"," \
+ GST_AUDIO_NE(S24)","GST_AUDIO_NE(U24)"," \
+ GST_AUDIO_NE(S16)","GST_AUDIO_NE(U16)"," \
+ "S8, U8 }"
static GstStaticPadTemplate osssink_sink_factory =
GST_STATIC_PAD_TEMPLATE ("sink",
@@ -321,6 +324,9 @@
case GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW:
{
switch (rfmt) {
+ case GST_AUDIO_FORMAT_S8:
+ result = AFMT_S8;
+ break;
case GST_AUDIO_FORMAT_U8:
result = AFMT_U8;
break;
@@ -330,15 +336,36 @@
case GST_AUDIO_FORMAT_S16BE:
result = AFMT_S16_BE;
break;
- case GST_AUDIO_FORMAT_S8:
- result = AFMT_S8;
- break;
case GST_AUDIO_FORMAT_U16LE:
result = AFMT_U16_LE;
break;
case GST_AUDIO_FORMAT_U16BE:
result = AFMT_U16_BE;
break;
+ case GST_AUDIO_FORMAT_S24LE:
+ result = AFMT_S24_LE;
+ break;
+ case GST_AUDIO_FORMAT_S24BE:
+ result = AFMT_S24_BE;
+ break;
+ case GST_AUDIO_FORMAT_U24LE:
+ result = AFMT_U24_LE;
+ break;
+ case GST_AUDIO_FORMAT_U24BE:
+ result = AFMT_U24_BE;
+ break;
+ case GST_AUDIO_FORMAT_S32LE:
+ result = AFMT_S32_LE;
+ break;
+ case GST_AUDIO_FORMAT_S32BE:
+ result = AFMT_S32_BE;
+ break;
+ case GST_AUDIO_FORMAT_U32LE:
+ result = AFMT_U32_LE;
+ break;
+ case GST_AUDIO_FORMAT_U32BE:
+ result = AFMT_U32_BE;
+ break;
default:
result = 0;
break;
@@ -441,7 +468,7 @@
rate = GST_AUDIO_INFO_RATE (&spec->info);
channels = GST_AUDIO_INFO_CHANNELS (&spec->info);
- if (width != 16 && width != 8)
+ if (width != 32 && width != 24 && width != 16 && width != 8)
goto dodgy_width;
SET_PARAM (oss, SNDCTL_DSP_SETFMT, tmp, "SETFMT");
|
