|
Lines 1-72
Link Here
|
| 1 |
--- sys/oss/gstosshelper.c.orig 2014-01-14 13:03:14.000000000 +0100 |
1 |
--- sys/oss/gstosshelper.c.orig Sun Apr 2 03:23:53 2006 |
| 2 |
+++ sys/oss/gstosshelper.c 2014-09-11 09:10:55.115013111 +0200 |
2 |
+++ sys/oss/gstosshelper.c Sun Apr 2 03:25:44 2006 |
| 3 |
@@ -95,9 +95,13 @@ |
3 |
@@ -343,13 +344,17 @@ gst_oss_helper_rate_check_rate (GstOssPr |
| 4 |
format_mask = AFMT_U8 | AFMT_S8; |
|
|
| 5 |
|
| 6 |
if (G_BYTE_ORDER == G_LITTLE_ENDIAN) |
| 7 |
- format_mask |= AFMT_S16_LE | AFMT_U16_LE; |
| 8 |
+ format_mask |= AFMT_S16_LE | AFMT_U16_LE |
| 9 |
+ | AFMT_S24_LE | AFMT_U24_LE |
| 10 |
+ | AFMT_S32_LE | AFMT_U32_LE; |
| 11 |
else |
| 12 |
- format_mask |= AFMT_S16_BE | AFMT_U16_BE; |
| 13 |
+ format_mask |= AFMT_S16_BE | AFMT_U16_BE |
| 14 |
+ | AFMT_S24_BE | AFMT_U24_BE |
| 15 |
+ | AFMT_S32_BE | AFMT_U32_BE; |
| 16 |
|
| 17 |
caps = gst_caps_new_empty (); |
| 18 |
|
| 19 |
@@ -169,6 +173,9 @@ |
| 20 |
const gchar *format; |
| 21 |
|
| 22 |
switch (format_bit) { |
| 23 |
+ case AFMT_S8: |
| 24 |
+ format = "S8"; |
| 25 |
+ break; |
| 26 |
case AFMT_U8: |
| 27 |
format = "U8"; |
| 28 |
break; |
| 29 |
@@ -178,15 +185,36 @@ |
| 30 |
case AFMT_S16_BE: |
| 31 |
format = "S16BE"; |
| 32 |
break; |
| 33 |
- case AFMT_S8: |
| 34 |
- format = "S8"; |
| 35 |
- break; |
| 36 |
case AFMT_U16_LE: |
| 37 |
format = "U16LE"; |
| 38 |
break; |
| 39 |
case AFMT_U16_BE: |
| 40 |
format = "U16BE"; |
| 41 |
break; |
| 42 |
+ case AFMT_S24_LE: |
| 43 |
+ format = "S24LE"; |
| 44 |
+ break; |
| 45 |
+ case AFMT_S24_BE: |
| 46 |
+ format = "S24BE"; |
| 47 |
+ break; |
| 48 |
+ case AFMT_U24_LE: |
| 49 |
+ format = "U24LE"; |
| 50 |
+ break; |
| 51 |
+ case AFMT_U24_BE: |
| 52 |
+ format = "U24BE"; |
| 53 |
+ break; |
| 54 |
+ case AFMT_S32_LE: |
| 55 |
+ format = "S32LE"; |
| 56 |
+ break; |
| 57 |
+ case AFMT_S32_BE: |
| 58 |
+ format = "S32BE"; |
| 59 |
+ break; |
| 60 |
+ case AFMT_U32_LE: |
| 61 |
+ format = "U32LE"; |
| 62 |
+ break; |
| 63 |
+ case AFMT_U32_BE: |
| 64 |
+ format = "U32BE"; |
| 65 |
+ break; |
| 66 |
default: |
| 67 |
g_assert_not_reached (); |
| 68 |
return NULL; |
| 69 |
@@ -324,13 +352,17 @@ |
| 70 |
int format; |
4 |
int format; |
| 71 |
int n_channels; |
5 |
int n_channels; |
| 72 |
int ret; |
6 |
int ret; |
|
Lines 82-86
Link Here
|
| 82 |
+ /* Reset rate to lowest supported rate. */ |
16 |
+ /* Reset rate to lowest supported rate. */ |
| 83 |
+ ioctl (probe->fd, SNDCTL_DSP_SPEED, &rst); |
17 |
+ ioctl (probe->fd, SNDCTL_DSP_SPEED, &rst); |
| 84 |
ret = ioctl (probe->fd, SNDCTL_DSP_SETFMT, &format); |
18 |
ret = ioctl (probe->fd, SNDCTL_DSP_SETFMT, &format); |
| 85 |
if (ret < 0 || format != probe->format) { |
19 |
if (ret < 0) |
| 86 |
GST_DEBUG ("unsupported format: %d (%d)", probe->format, format); |
20 |
return -1; |