Mercurial > mplayer.hg
annotate libao2/ao_sun.c @ 31916:6b45e5fb9dc4
Fix reading of VUK: actually fail if the key is incomplete instead
of continuing with uninitialized data.
author | reimar |
---|---|
date | Sat, 21 Aug 2010 10:02:50 +0000 |
parents | 32725ca88fed |
children | 4a3bfd196e17 |
rev | line source |
---|---|
28343 | 1 /* |
2 * SUN audio output driver | |
3 * | |
4 * This file is part of MPlayer. | |
5 * | |
6 * MPlayer is free software; you can redistribute it and/or modify | |
7 * it under the terms of the GNU General Public License as published by | |
8 * the Free Software Foundation; either version 2 of the License, or | |
9 * (at your option) any later version. | |
10 * | |
11 * MPlayer is distributed in the hope that it will be useful, | |
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 * GNU General Public License for more details. | |
15 * | |
16 * You should have received a copy of the GNU General Public License along | |
17 * with MPlayer; if not, write to the Free Software Foundation, Inc., | |
18 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | |
19 */ | |
20 | |
1041 | 21 #include <stdio.h> |
22 #include <stdlib.h> | |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
23 #include <string.h> |
1041 | 24 |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
25 #include <unistd.h> |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
26 #include <fcntl.h> |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
27 #include <errno.h> |
1041 | 28 #include <sys/ioctl.h> |
29 #include <sys/time.h> | |
30 #include <sys/types.h> | |
31 #include <sys/stat.h> | |
32 #include <sys/audioio.h> | |
7656
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
33 #ifdef AUDIO_SWFEATURE_MIXER /* solaris8 or newer? */ |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
34 # define HAVE_SYS_MIXER_H 1 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
35 #endif |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
36 #if HAVE_SYS_MIXER_H |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
37 # include <sys/mixer.h> |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
38 #endif |
1041 | 39 #ifdef __svr4__ |
40 #include <stropts.h> | |
41 #endif | |
42 | |
14123 | 43 #include "config.h" |
44 #include "mixer.h" | |
1041 | 45 |
46 #include "audio_out.h" | |
47 #include "audio_out_internal.h" | |
14247 | 48 #include "libaf/af_format.h" |
14123 | 49 #include "mp_msg.h" |
50 #include "help_mp.h" | |
1041 | 51 |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28823
diff
changeset
|
52 static const ao_info_t info = |
1041 | 53 { |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
54 "Sun audio output", |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
55 "sun", |
13549 | 56 "Juergen Keil", |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
57 "" |
1041 | 58 }; |
59 | |
60 LIBAO_EXTERN(sun) | |
61 | |
62 | |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
63 /* These defines are missing on NetBSD */ |
1041 | 64 #ifndef AUDIO_PRECISION_8 |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
65 #define AUDIO_PRECISION_8 8 |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
66 #define AUDIO_PRECISION_16 16 |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
67 #endif |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
68 #ifndef AUDIO_CHANNELS_MONO |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
69 #define AUDIO_CHANNELS_MONO 1 |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
70 #define AUDIO_CHANNELS_STEREO 2 |
1041 | 71 #endif |
72 | |
73 | |
5893
6a6107da2d82
Default to the mixer device matching the audio device used for audio output.
jkeil
parents:
5872
diff
changeset
|
74 static char *sun_mixer_device = NULL; |
3492
24b0fad7fccc
Use $AUDIODEV environment variable as the default audio device on solaris, if
jkeil
parents:
3137
diff
changeset
|
75 static char *audio_dev = NULL; |
1041 | 76 static int queued_bursts = 0; |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
77 static int queued_samples = 0; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
78 static int bytes_per_sample = 0; |
3095 | 79 static int byte_per_sec = 0; |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
80 static int audio_fd = -1; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
81 static enum { |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
82 RTSC_UNKNOWN = 0, |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
83 RTSC_ENABLED, |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
84 RTSC_DISABLED |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
85 } enable_sample_timing; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
86 |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
87 |
23334 | 88 static void flush_audio(int fd) { |
89 #ifdef AUDIO_FLUSH | |
90 ioctl(fd, AUDIO_FLUSH, 0); | |
91 #elif defined(__svr4__) | |
92 ioctl(fd, I_FLUSH, FLUSHW); | |
93 #endif | |
94 } | |
1041 | 95 |
1058 | 96 // convert an OSS audio format specification into a sun audio encoding |
14247 | 97 static int af2sunfmt(int format) |
1058 | 98 { |
14247 | 99 switch (format){ |
100 case AF_FORMAT_MU_LAW: | |
1308
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
101 return AUDIO_ENCODING_ULAW; |
14247 | 102 case AF_FORMAT_A_LAW: |
1308
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
103 return AUDIO_ENCODING_ALAW; |
14409
6d8634c0bdfa
Cleanup, removing internal conversions. Testing welcome.
reimar
parents:
14264
diff
changeset
|
104 case AF_FORMAT_S16_NE: |
1308
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
105 return AUDIO_ENCODING_LINEAR; |
1346
d6e6132bff35
AUDIO_ENCODING_LINEAR8 format is not available on sunos 5.5. Format is
jkeil
parents:
1320
diff
changeset
|
106 #ifdef AUDIO_ENCODING_LINEAR8 // Missing on SunOS 5.5.1... |
14247 | 107 case AF_FORMAT_U8: |
1308
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
108 return AUDIO_ENCODING_LINEAR8; |
1346
d6e6132bff35
AUDIO_ENCODING_LINEAR8 format is not available on sunos 5.5. Format is
jkeil
parents:
1320
diff
changeset
|
109 #endif |
14409
6d8634c0bdfa
Cleanup, removing internal conversions. Testing welcome.
reimar
parents:
14264
diff
changeset
|
110 case AF_FORMAT_S8: |
6d8634c0bdfa
Cleanup, removing internal conversions. Testing welcome.
reimar
parents:
14264
diff
changeset
|
111 return AUDIO_ENCODING_LINEAR; |
1058 | 112 #ifdef AUDIO_ENCODING_DVI // Missing on NetBSD... |
14247 | 113 case AF_FORMAT_IMA_ADPCM: |
1308
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
114 return AUDIO_ENCODING_DVI; |
1058 | 115 #endif |
1308
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
116 default: |
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
117 return AUDIO_ENCODING_NONE; |
1058 | 118 } |
119 } | |
120 | |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
121 // try to figure out, if the soundcard driver provides usable (precise) |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
122 // sample counter information |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
123 static int realtime_samplecounter_available(char *dev) |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
124 { |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
125 int fd = -1; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
126 audio_info_t info; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
127 int rtsc_ok = RTSC_DISABLED; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
128 int len; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
129 void *silence = NULL; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
130 struct timeval start, end; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
131 struct timespec delay; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
132 int usec_delay; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
133 unsigned last_samplecnt; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
134 unsigned increment; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
135 unsigned min_increment; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
136 |
1308
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
137 len = 44100 * 4 / 4; /* amount of data for 0.25sec of 44.1khz, stereo, |
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
138 * 16bit. 44kbyte can be sent to all supported |
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
139 * sun audio devices without blocking in the |
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
140 * "write" below. |
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
141 */ |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
142 silence = calloc(1, len); |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
143 if (silence == NULL) |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
144 goto error; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28823
diff
changeset
|
145 |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
146 if ((fd = open(dev, O_WRONLY)) < 0) |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
147 goto error; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
148 |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
149 AUDIO_INITINFO(&info); |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
150 info.play.sample_rate = 44100; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
151 info.play.channels = AUDIO_CHANNELS_STEREO; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
152 info.play.precision = AUDIO_PRECISION_16; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
153 info.play.encoding = AUDIO_ENCODING_LINEAR; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
154 info.play.samples = 0; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
155 if (ioctl(fd, AUDIO_SETINFO, &info)) { |
17932 | 156 if ( mp_msg_test(MSGT_AO,MSGL_V) ) |
13383
c1955840883d
mp_msg transition of unmaintained audio output drivers.
ivo
parents:
12148
diff
changeset
|
157 mp_msg(MSGT_AO, MSGL_ERR, MSGTR_AO_SUN_RtscSetinfoFailed); |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
158 goto error; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
159 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28823
diff
changeset
|
160 |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
161 if (write(fd, silence, len) != len) { |
17932 | 162 if ( mp_msg_test(MSGT_AO,MSGL_V) ) |
13383
c1955840883d
mp_msg transition of unmaintained audio output drivers.
ivo
parents:
12148
diff
changeset
|
163 mp_msg(MSGT_AO, MSGL_ERR, MSGTR_AO_SUN_RtscWriteFailed); |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
164 goto error; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
165 } |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
166 |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
167 if (ioctl(fd, AUDIO_GETINFO, &info)) { |
17932 | 168 if ( mp_msg_test(MSGT_AO,MSGL_V) ) |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
169 perror("rtsc: GETINFO1"); |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
170 goto error; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
171 } |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
172 |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
173 last_samplecnt = info.play.samples; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
174 min_increment = ~0; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
175 |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
176 gettimeofday(&start, NULL); |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
177 for (;;) { |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
178 delay.tv_sec = 0; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
179 delay.tv_nsec = 10000000; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
180 nanosleep(&delay, NULL); |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
181 gettimeofday(&end, NULL); |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
182 usec_delay = (end.tv_sec - start.tv_sec) * 1000000 |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
183 + end.tv_usec - start.tv_usec; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
184 |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
185 // stop monitoring sample counter after 0.2 seconds |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
186 if (usec_delay > 200000) |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
187 break; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
188 |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
189 if (ioctl(fd, AUDIO_GETINFO, &info)) { |
17932 | 190 if ( mp_msg_test(MSGT_AO,MSGL_V) ) |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
191 perror("rtsc: GETINFO2 failed"); |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
192 goto error; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
193 } |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
194 if (info.play.samples < last_samplecnt) { |
17932 | 195 if ( mp_msg_test(MSGT_AO,MSGL_V) ) |
17933 | 196 mp_msg(MSGT_AO,MSGL_V,"rtsc: %d > %d?\n", last_samplecnt, info.play.samples); |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
197 goto error; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
198 } |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
199 |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
200 if ((increment = info.play.samples - last_samplecnt) > 0) { |
17932 | 201 if ( mp_msg_test(MSGT_AO,MSGL_V) ) |
17933 | 202 mp_msg(MSGT_AO,MSGL_V,"ao_sun: sample counter increment: %d\n", increment); |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
203 if (increment < min_increment) { |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
204 min_increment = increment; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
205 if (min_increment < 2000) |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
206 break; // looks good |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
207 } |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
208 } |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
209 last_samplecnt = info.play.samples; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
210 } |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
211 |
1308
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
212 /* |
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
213 * For 44.1kkz, stereo, 16-bit format we would send sound data in 16kbytes |
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
214 * chunks (== 4096 samples) to the audio device. If we see a minimum |
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
215 * sample counter increment from the soundcard driver of less than |
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
216 * 2000 samples, we assume that the driver provides a useable realtime |
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
217 * sample counter in the AUDIO_INFO play.samples field. Timing based |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28823
diff
changeset
|
218 * on sample counts should be much more accurate than counting whole |
1308
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
219 * 16kbyte chunks. |
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
220 */ |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
221 if (min_increment < 2000) |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
222 rtsc_ok = RTSC_ENABLED; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
223 |
17932 | 224 if ( mp_msg_test(MSGT_AO,MSGL_V) ) |
17933 | 225 mp_msg(MSGT_AO,MSGL_V,"ao_sun: minimum sample counter increment per 10msec interval: %d\n" |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
226 "\t%susing sample counter based timing code\n", |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
227 min_increment, rtsc_ok == RTSC_ENABLED ? "" : "not "); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28823
diff
changeset
|
228 |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
229 |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
230 error: |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
231 if (silence != NULL) free(silence); |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
232 if (fd >= 0) { |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
233 // remove the 0 bytes from the above measurement from the |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
234 // audio driver's STREAMS queue |
23334 | 235 flush_audio(fd); |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
236 close(fd); |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
237 } |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
238 |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
239 return rtsc_ok; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
240 } |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
241 |
7656
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
242 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
243 // match the requested sample rate |sample_rate| against the |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
244 // sample rates supported by the audio device |dev|. Return |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
245 // a supported sample rate, if that sample rate is close to |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
246 // (< 1% difference) the requested rate; return 0 otherwise. |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
247 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
248 #define MAX_RATE_ERR 1 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
249 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
250 static unsigned |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
251 find_close_samplerate_match(int dev, unsigned sample_rate) |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
252 { |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
253 #if HAVE_SYS_MIXER_H |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
254 am_sample_rates_t *sr; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
255 unsigned i, num, err, best_err, best_rate; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
256 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
257 for (num = 16; num < 1024; num *= 2) { |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
258 sr = malloc(AUDIO_MIXER_SAMP_RATES_STRUCT_SIZE(num)); |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
259 if (!sr) |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
260 return 0; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
261 sr->type = AUDIO_PLAY; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
262 sr->flags = 0; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
263 sr->num_samp_rates = num; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
264 if (ioctl(dev, AUDIO_MIXER_GET_SAMPLE_RATES, sr)) { |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
265 free(sr); |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
266 return 0; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
267 } |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
268 if (sr->num_samp_rates <= num) |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
269 break; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
270 free(sr); |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
271 } |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
272 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
273 if (sr->flags & MIXER_SR_LIMITS) { |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
274 /* |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28823
diff
changeset
|
275 * HW can playback any rate between |
7656
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
276 * sr->samp_rates[0] .. sr->samp_rates[1] |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
277 */ |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
278 free(sr); |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
279 return 0; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
280 } else { |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
281 /* HW supports fixed sample rates only */ |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
282 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
283 best_err = 65535; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
284 best_rate = 0; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
285 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
286 for (i = 0; i < sr->num_samp_rates; i++) { |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
287 err = abs(sr->samp_rates[i] - sample_rate); |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
288 if (err == 0) { |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
289 /* |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
290 * exact supported sample rate match, no need to |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
291 * retry something else |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
292 */ |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
293 best_rate = 0; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
294 break; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
295 } |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
296 if (err < best_err) { |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
297 best_err = err; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
298 best_rate = sr->samp_rates[i]; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
299 } |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
300 } |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
301 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
302 free(sr); |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
303 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
304 if (best_rate > 0 && (100/MAX_RATE_ERR)*best_err < sample_rate) { |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
305 /* found a supported sample rate with <1% error? */ |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
306 return best_rate; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
307 } |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
308 return 0; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
309 } |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
310 #else /* old audioio driver, cannot return list of supported rates */ |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
311 /* XXX: hardcoded sample rates */ |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
312 unsigned i, err; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
313 unsigned audiocs_rates[] = { |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
314 5510, 6620, 8000, 9600, 11025, 16000, 18900, 22050, |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
315 27420, 32000, 33075, 37800, 44100, 48000, 0 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
316 }; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
317 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
318 for (i = 0; audiocs_rates[i]; i++) { |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
319 err = abs(audiocs_rates[i] - sample_rate); |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
320 if (err == 0) { |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28823
diff
changeset
|
321 /* |
7656
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
322 * exact supported sample rate match, no need to |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
323 * retry something elise |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
324 */ |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
325 return 0; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
326 } |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
327 if ((100/MAX_RATE_ERR)*err < audiocs_rates[i]) { |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
328 /* <1% error? */ |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
329 return audiocs_rates[i]; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
330 } |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
331 } |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
332 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
333 return 0; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
334 #endif |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
335 } |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
336 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
337 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
338 // return the highest sample rate supported by audio device |dev|. |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
339 static unsigned |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
340 find_highest_samplerate(int dev) |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
341 { |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
342 #if HAVE_SYS_MIXER_H |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
343 am_sample_rates_t *sr; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
344 unsigned i, num, max_rate; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
345 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
346 for (num = 16; num < 1024; num *= 2) { |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
347 sr = malloc(AUDIO_MIXER_SAMP_RATES_STRUCT_SIZE(num)); |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
348 if (!sr) |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
349 return 0; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
350 sr->type = AUDIO_PLAY; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
351 sr->flags = 0; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
352 sr->num_samp_rates = num; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
353 if (ioctl(dev, AUDIO_MIXER_GET_SAMPLE_RATES, sr)) { |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
354 free(sr); |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
355 return 0; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
356 } |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
357 if (sr->num_samp_rates <= num) |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
358 break; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
359 free(sr); |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
360 } |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
361 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
362 if (sr->flags & MIXER_SR_LIMITS) { |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
363 /* |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28823
diff
changeset
|
364 * HW can playback any rate between |
7656
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
365 * sr->samp_rates[0] .. sr->samp_rates[1] |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
366 */ |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
367 max_rate = sr->samp_rates[1]; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
368 } else { |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
369 /* HW supports fixed sample rates only */ |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
370 max_rate = 0; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
371 for (i = 0; i < sr->num_samp_rates; i++) { |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
372 if (sr->samp_rates[i] > max_rate) |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
373 max_rate = sr->samp_rates[i]; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
374 } |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
375 } |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
376 free(sr); |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
377 return max_rate; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
378 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
379 #else /* old audioio driver, cannot return list of supported rates */ |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
380 return 44100; /* should be supported even on old ISA SB cards */ |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
381 #endif |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
382 } |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
383 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
384 |
18915
99e20a22d5d0
modifies function declarations without parameters from ()
reynaldo
parents:
17933
diff
changeset
|
385 static void setup_device_paths(void) |
7378
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
386 { |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
387 if (audio_dev == NULL) { |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
388 if ((audio_dev = getenv("AUDIODEV")) == NULL) |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
389 audio_dev = "/dev/audio"; |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
390 } |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
391 |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
392 if (sun_mixer_device == NULL) { |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
393 if ((sun_mixer_device = mixer_device) == NULL || !sun_mixer_device[0]) { |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
394 sun_mixer_device = malloc(strlen(audio_dev) + 4); |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
395 strcpy(sun_mixer_device, audio_dev); |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
396 strcat(sun_mixer_device, "ctl"); |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
397 } |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
398 } |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
399 |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
400 if (ao_subdevice) audio_dev = ao_subdevice; |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
401 } |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
402 |
1041 | 403 // to set/get/query special features/parameters |
9633
12b1790038b0
64bit libao2 fix by Jens Axboe <mplayer-dev@kernel.dk>
alex
parents:
8027
diff
changeset
|
404 static int control(int cmd,void *arg){ |
1308
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
405 switch(cmd){ |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
406 case AOCONTROL_SET_DEVICE: |
1308
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
407 audio_dev=(char*)arg; |
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
408 return CONTROL_OK; |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
409 case AOCONTROL_QUERY_FORMAT: |
1308
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
410 return CONTROL_TRUE; |
4788
d678ce495a75
Moved HW dependent mixer stuff to libao and removed master switch
anders
parents:
3492
diff
changeset
|
411 case AOCONTROL_GET_VOLUME: |
d678ce495a75
Moved HW dependent mixer stuff to libao and removed master switch
anders
parents:
3492
diff
changeset
|
412 { |
7656
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
413 int fd; |
4788
d678ce495a75
Moved HW dependent mixer stuff to libao and removed master switch
anders
parents:
3492
diff
changeset
|
414 |
7378
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
415 if ( !sun_mixer_device ) /* control function is used before init? */ |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
416 setup_device_paths(); |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
417 |
4788
d678ce495a75
Moved HW dependent mixer stuff to libao and removed master switch
anders
parents:
3492
diff
changeset
|
418 fd=open( sun_mixer_device,O_RDONLY ); |
d678ce495a75
Moved HW dependent mixer stuff to libao and removed master switch
anders
parents:
3492
diff
changeset
|
419 if ( fd != -1 ) |
d678ce495a75
Moved HW dependent mixer stuff to libao and removed master switch
anders
parents:
3492
diff
changeset
|
420 { |
4907 | 421 ao_control_vol_t *vol = (ao_control_vol_t *)arg; |
7378
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
422 float volume; |
4788
d678ce495a75
Moved HW dependent mixer stuff to libao and removed master switch
anders
parents:
3492
diff
changeset
|
423 struct audio_info info; |
d678ce495a75
Moved HW dependent mixer stuff to libao and removed master switch
anders
parents:
3492
diff
changeset
|
424 ioctl( fd,AUDIO_GETINFO,&info); |
7378
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
425 volume = info.play.gain * 100. / AUDIO_MAX_GAIN; |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
426 if ( info.play.balance == AUDIO_MID_BALANCE ) { |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
427 vol->right = vol->left = volume; |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
428 } else if ( info.play.balance < AUDIO_MID_BALANCE ) { |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
429 vol->left = volume; |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
430 vol->right = volume * info.play.balance / AUDIO_MID_BALANCE; |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
431 } else { |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
432 vol->left = volume * (AUDIO_RIGHT_BALANCE-info.play.balance) |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
433 / AUDIO_MID_BALANCE; |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
434 vol->right = volume; |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
435 } |
4788
d678ce495a75
Moved HW dependent mixer stuff to libao and removed master switch
anders
parents:
3492
diff
changeset
|
436 close( fd ); |
d678ce495a75
Moved HW dependent mixer stuff to libao and removed master switch
anders
parents:
3492
diff
changeset
|
437 return CONTROL_OK; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28823
diff
changeset
|
438 } |
4788
d678ce495a75
Moved HW dependent mixer stuff to libao and removed master switch
anders
parents:
3492
diff
changeset
|
439 return CONTROL_ERROR; |
d678ce495a75
Moved HW dependent mixer stuff to libao and removed master switch
anders
parents:
3492
diff
changeset
|
440 } |
d678ce495a75
Moved HW dependent mixer stuff to libao and removed master switch
anders
parents:
3492
diff
changeset
|
441 case AOCONTROL_SET_VOLUME: |
d678ce495a75
Moved HW dependent mixer stuff to libao and removed master switch
anders
parents:
3492
diff
changeset
|
442 { |
4907 | 443 ao_control_vol_t *vol = (ao_control_vol_t *)arg; |
7656
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
444 int fd; |
4788
d678ce495a75
Moved HW dependent mixer stuff to libao and removed master switch
anders
parents:
3492
diff
changeset
|
445 |
7378
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
446 if ( !sun_mixer_device ) /* control function is used before init? */ |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
447 setup_device_paths(); |
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
448 |
4788
d678ce495a75
Moved HW dependent mixer stuff to libao and removed master switch
anders
parents:
3492
diff
changeset
|
449 fd=open( sun_mixer_device,O_RDONLY ); |
d678ce495a75
Moved HW dependent mixer stuff to libao and removed master switch
anders
parents:
3492
diff
changeset
|
450 if ( fd != -1 ) |
d678ce495a75
Moved HW dependent mixer stuff to libao and removed master switch
anders
parents:
3492
diff
changeset
|
451 { |
d678ce495a75
Moved HW dependent mixer stuff to libao and removed master switch
anders
parents:
3492
diff
changeset
|
452 struct audio_info info; |
7378
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
453 float volume; |
4788
d678ce495a75
Moved HW dependent mixer stuff to libao and removed master switch
anders
parents:
3492
diff
changeset
|
454 AUDIO_INITINFO(&info); |
7378
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
455 volume = vol->right > vol->left ? vol->right : vol->left; |
7422
69d6da12bc30
*bsd doesn't have info.output_muted - patch by Bj¸«Órn Sandell <biorn@dce.chalmers.se>
arpi
parents:
7379
diff
changeset
|
456 if ( volume != 0 ) { |
7379
7b3c73a0c2dd
Reconstruct the muting state for the playback from a l/r volume of 0.0.
jkeil
parents:
7378
diff
changeset
|
457 info.play.gain = volume * AUDIO_MAX_GAIN / 100; |
7b3c73a0c2dd
Reconstruct the muting state for the playback from a l/r volume of 0.0.
jkeil
parents:
7378
diff
changeset
|
458 if ( vol->right == vol->left ) |
7b3c73a0c2dd
Reconstruct the muting state for the playback from a l/r volume of 0.0.
jkeil
parents:
7378
diff
changeset
|
459 info.play.balance = AUDIO_MID_BALANCE; |
7b3c73a0c2dd
Reconstruct the muting state for the playback from a l/r volume of 0.0.
jkeil
parents:
7378
diff
changeset
|
460 else |
7b3c73a0c2dd
Reconstruct the muting state for the playback from a l/r volume of 0.0.
jkeil
parents:
7378
diff
changeset
|
461 info.play.balance = (vol->right - vol->left + volume) * AUDIO_RIGHT_BALANCE / (2*volume); |
7b3c73a0c2dd
Reconstruct the muting state for the playback from a l/r volume of 0.0.
jkeil
parents:
7378
diff
changeset
|
462 } |
7422
69d6da12bc30
*bsd doesn't have info.output_muted - patch by Bj¸«Órn Sandell <biorn@dce.chalmers.se>
arpi
parents:
7379
diff
changeset
|
463 #if !defined (__OpenBSD__) && !defined (__NetBSD__) |
69d6da12bc30
*bsd doesn't have info.output_muted - patch by Bj¸«Órn Sandell <biorn@dce.chalmers.se>
arpi
parents:
7379
diff
changeset
|
464 info.output_muted = (volume == 0); |
69d6da12bc30
*bsd doesn't have info.output_muted - patch by Bj¸«Órn Sandell <biorn@dce.chalmers.se>
arpi
parents:
7379
diff
changeset
|
465 #endif |
4788
d678ce495a75
Moved HW dependent mixer stuff to libao and removed master switch
anders
parents:
3492
diff
changeset
|
466 ioctl( fd,AUDIO_SETINFO,&info ); |
d678ce495a75
Moved HW dependent mixer stuff to libao and removed master switch
anders
parents:
3492
diff
changeset
|
467 close( fd ); |
d678ce495a75
Moved HW dependent mixer stuff to libao and removed master switch
anders
parents:
3492
diff
changeset
|
468 return CONTROL_OK; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28823
diff
changeset
|
469 } |
4788
d678ce495a75
Moved HW dependent mixer stuff to libao and removed master switch
anders
parents:
3492
diff
changeset
|
470 return CONTROL_ERROR; |
1308
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
471 } |
4907 | 472 } |
1308
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
473 return CONTROL_UNKNOWN; |
1041 | 474 } |
475 | |
476 // open & setup audio device | |
477 // return: 1=success 0=fail | |
478 static int init(int rate,int channels,int format,int flags){ | |
479 | |
1308
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
480 audio_info_t info; |
7656
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
481 int pass; |
1807
6da3b9428ff0
Sun audiocs HW does not support AFMT_U8, try to use AFMT_S8 instead. If AFMT_S8
jkeil
parents:
1456
diff
changeset
|
482 int ok; |
14409
6d8634c0bdfa
Cleanup, removing internal conversions. Testing welcome.
reimar
parents:
14264
diff
changeset
|
483 int convert_u8_s8; |
1041 | 484 |
7378
9fb2113b4869
- gui version of mplayer is using the audio 'control' function before(!) the
jkeil
parents:
6630
diff
changeset
|
485 setup_device_paths(); |
1209 | 486 |
1308
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
487 if (enable_sample_timing == RTSC_UNKNOWN |
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
488 && !getenv("AO_SUN_DISABLE_SAMPLE_TIMING")) { |
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
489 enable_sample_timing = realtime_samplecounter_available(audio_dev); |
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
490 } |
1041 | 491 |
17933 | 492 mp_msg(MSGT_AO,MSGL_STATUS,"ao2: %d Hz %d chans %s [0x%X]\n", |
14264 | 493 rate,channels,af_fmt2str_short(format),format); |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
494 |
1308
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
495 audio_fd=open(audio_dev, O_WRONLY); |
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
496 if(audio_fd<0){ |
13383
c1955840883d
mp_msg transition of unmaintained audio output drivers.
ivo
parents:
12148
diff
changeset
|
497 mp_msg(MSGT_AO, MSGL_ERR, MSGTR_AO_SUN_CantOpenAudioDev, audio_dev, strerror(errno)); |
1308
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
498 return 0; |
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
499 } |
1041 | 500 |
14409
6d8634c0bdfa
Cleanup, removing internal conversions. Testing welcome.
reimar
parents:
14264
diff
changeset
|
501 if (af2sunfmt(format) == AUDIO_ENCODING_NONE) |
6d8634c0bdfa
Cleanup, removing internal conversions. Testing welcome.
reimar
parents:
14264
diff
changeset
|
502 format = AF_FORMAT_S16_NE; |
6d8634c0bdfa
Cleanup, removing internal conversions. Testing welcome.
reimar
parents:
14264
diff
changeset
|
503 |
7656
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
504 for (ok = pass = 0; pass <= 5; pass++) { /* pass 6&7 not useful */ |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
505 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
506 AUDIO_INITINFO(&info); |
14249 | 507 info.play.encoding = af2sunfmt(ao_data.format = format); |
7656
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
508 info.play.precision = |
14409
6d8634c0bdfa
Cleanup, removing internal conversions. Testing welcome.
reimar
parents:
14264
diff
changeset
|
509 (format==AF_FORMAT_S16_NE |
7656
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
510 ? AUDIO_PRECISION_16 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
511 : AUDIO_PRECISION_8); |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
512 info.play.channels = ao_data.channels = channels; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
513 info.play.sample_rate = ao_data.samplerate = rate; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
514 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
515 convert_u8_s8 = 0; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
516 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
517 if (pass & 1) { |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
518 /* |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28823
diff
changeset
|
519 * on some sun audio drivers, 8-bit unsigned LINEAR8 encoding is |
7656
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
520 * not supported, but 8-bit signed encoding is. |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
521 * |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
522 * Try S8, and if it works, use our own U8->S8 conversion before |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
523 * sending the samples to the sound driver. |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
524 */ |
14409
6d8634c0bdfa
Cleanup, removing internal conversions. Testing welcome.
reimar
parents:
14264
diff
changeset
|
525 #ifdef AUDIO_ENCODING_LINEAR8 |
7656
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
526 if (info.play.encoding != AUDIO_ENCODING_LINEAR8) |
14409
6d8634c0bdfa
Cleanup, removing internal conversions. Testing welcome.
reimar
parents:
14264
diff
changeset
|
527 #endif |
7656
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
528 continue; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
529 info.play.encoding = AUDIO_ENCODING_LINEAR; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
530 convert_u8_s8 = 1; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
531 } |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
532 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
533 if (pass & 2) { |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
534 /* |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
535 * on some sun audio drivers, only certain fixed sample rates are |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
536 * supported. |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
537 * |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
538 * In case the requested sample rate is very close to one of the |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
539 * supported rates, use the fixed supported rate instead. |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
540 */ |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
541 if (!(info.play.sample_rate = |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28823
diff
changeset
|
542 find_close_samplerate_match(audio_fd, rate))) |
7656
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
543 continue; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
544 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
545 /* |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
546 * I'm not returning the correct sample rate in |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
547 * |ao_data.samplerate|, to avoid software resampling. |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
548 * |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
549 * ao_data.samplerate = info.play.sample_rate; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
550 */ |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
551 } |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
552 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
553 if (pass & 4) { |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
554 /* like "pass & 2", but use the highest supported sample rate */ |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
555 if (!(info.play.sample_rate |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
556 = ao_data.samplerate |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
557 = find_highest_samplerate(audio_fd))) |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
558 continue; |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
559 } |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
560 |
1807
6da3b9428ff0
Sun audiocs HW does not support AFMT_U8, try to use AFMT_S8 instead. If AFMT_S8
jkeil
parents:
1456
diff
changeset
|
561 ok = ioctl(audio_fd, AUDIO_SETINFO, &info) >= 0; |
6da3b9428ff0
Sun audiocs HW does not support AFMT_U8, try to use AFMT_S8 instead. If AFMT_S8
jkeil
parents:
1456
diff
changeset
|
562 if (ok) { |
7656
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
563 /* audio format accepted by audio driver */ |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
564 break; |
1807
6da3b9428ff0
Sun audiocs HW does not support AFMT_U8, try to use AFMT_S8 instead. If AFMT_S8
jkeil
parents:
1456
diff
changeset
|
565 } |
7656
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
566 |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
567 /* |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
568 * format not supported? |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
569 * retry with different encoding and/or sample rate |
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
570 */ |
1807
6da3b9428ff0
Sun audiocs HW does not support AFMT_U8, try to use AFMT_S8 instead. If AFMT_S8
jkeil
parents:
1456
diff
changeset
|
571 } |
7656
52009e5ef4fc
Handle playback of sample rates not supported by the sun audio hardware.
jkeil
parents:
7422
diff
changeset
|
572 |
1807
6da3b9428ff0
Sun audiocs HW does not support AFMT_U8, try to use AFMT_S8 instead. If AFMT_S8
jkeil
parents:
1456
diff
changeset
|
573 if (!ok) { |
14409
6d8634c0bdfa
Cleanup, removing internal conversions. Testing welcome.
reimar
parents:
14264
diff
changeset
|
574 char buf[128]; |
13383
c1955840883d
mp_msg transition of unmaintained audio output drivers.
ivo
parents:
12148
diff
changeset
|
575 mp_msg(MSGT_AO, MSGL_ERR, MSGTR_AO_SUN_UnsupSampleRate, |
14255
137896e25c24
100l, buf etc. in af_fmt2str call are already pointers...
reimar
parents:
14249
diff
changeset
|
576 channels, af_fmt2str(format, buf, 128), rate); |
1807
6da3b9428ff0
Sun audiocs HW does not support AFMT_U8, try to use AFMT_S8 instead. If AFMT_S8
jkeil
parents:
1456
diff
changeset
|
577 return 0; |
6da3b9428ff0
Sun audiocs HW does not support AFMT_U8, try to use AFMT_S8 instead. If AFMT_S8
jkeil
parents:
1456
diff
changeset
|
578 } |
6da3b9428ff0
Sun audiocs HW does not support AFMT_U8, try to use AFMT_S8 instead. If AFMT_S8
jkeil
parents:
1456
diff
changeset
|
579 |
14409
6d8634c0bdfa
Cleanup, removing internal conversions. Testing welcome.
reimar
parents:
14264
diff
changeset
|
580 if (convert_u8_s8) |
6d8634c0bdfa
Cleanup, removing internal conversions. Testing welcome.
reimar
parents:
14264
diff
changeset
|
581 ao_data.format = AF_FORMAT_S8; |
6d8634c0bdfa
Cleanup, removing internal conversions. Testing welcome.
reimar
parents:
14264
diff
changeset
|
582 |
1308
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
583 bytes_per_sample = channels * info.play.precision / 8; |
10325 | 584 ao_data.bps = byte_per_sec = bytes_per_sample * ao_data.samplerate; |
3095 | 585 ao_data.outburst = byte_per_sec > 100000 ? 16384 : 8192; |
1041 | 586 |
28654
aa7af4c30429
Move resetting audio_info_t samples, eof and error in ao_sun.c to reset(), avoids
reimar
parents:
28343
diff
changeset
|
587 reset(); |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
588 |
1308
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
589 return 1; |
1041 | 590 } |
591 | |
592 // close audio device | |
12145 | 593 static void uninit(int immed){ |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
594 // throw away buffered data in the audio driver's STREAMS queue |
12145 | 595 if (immed) |
23334 | 596 flush_audio(audio_fd); |
26312 | 597 else |
598 ioctl(audio_fd, AUDIO_DRAIN, 0); | |
1041 | 599 close(audio_fd); |
600 } | |
601 | |
602 // stop playing and empty buffers (for seeking/pause) | |
18915
99e20a22d5d0
modifies function declarations without parameters from ()
reynaldo
parents:
17933
diff
changeset
|
603 static void reset(void){ |
28654
aa7af4c30429
Move resetting audio_info_t samples, eof and error in ao_sun.c to reset(), avoids
reimar
parents:
28343
diff
changeset
|
604 audio_info_t info; |
26313 | 605 flush_audio(audio_fd); |
28654
aa7af4c30429
Move resetting audio_info_t samples, eof and error in ao_sun.c to reset(), avoids
reimar
parents:
28343
diff
changeset
|
606 |
aa7af4c30429
Move resetting audio_info_t samples, eof and error in ao_sun.c to reset(), avoids
reimar
parents:
28343
diff
changeset
|
607 AUDIO_INITINFO(&info); |
aa7af4c30429
Move resetting audio_info_t samples, eof and error in ao_sun.c to reset(), avoids
reimar
parents:
28343
diff
changeset
|
608 info.play.samples = 0; |
aa7af4c30429
Move resetting audio_info_t samples, eof and error in ao_sun.c to reset(), avoids
reimar
parents:
28343
diff
changeset
|
609 info.play.eof = 0; |
aa7af4c30429
Move resetting audio_info_t samples, eof and error in ao_sun.c to reset(), avoids
reimar
parents:
28343
diff
changeset
|
610 info.play.error = 0; |
aa7af4c30429
Move resetting audio_info_t samples, eof and error in ao_sun.c to reset(), avoids
reimar
parents:
28343
diff
changeset
|
611 ioctl(audio_fd, AUDIO_SETINFO, &info); |
aa7af4c30429
Move resetting audio_info_t samples, eof and error in ao_sun.c to reset(), avoids
reimar
parents:
28343
diff
changeset
|
612 |
1041 | 613 queued_bursts = 0; |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
614 queued_samples = 0; |
1041 | 615 } |
616 | |
617 // stop playing, keep buffers (for pause) | |
18915
99e20a22d5d0
modifies function declarations without parameters from ()
reynaldo
parents:
17933
diff
changeset
|
618 static void audio_pause(void) |
1041 | 619 { |
620 struct audio_info info; | |
621 AUDIO_INITINFO(&info); | |
622 info.play.pause = 1; | |
623 ioctl(audio_fd, AUDIO_SETINFO, &info); | |
624 } | |
625 | |
626 // resume playing, after audio_pause() | |
18915
99e20a22d5d0
modifies function declarations without parameters from ()
reynaldo
parents:
17933
diff
changeset
|
627 static void audio_resume(void) |
1041 | 628 { |
629 struct audio_info info; | |
630 AUDIO_INITINFO(&info); | |
631 info.play.pause = 0; | |
632 ioctl(audio_fd, AUDIO_SETINFO, &info); | |
633 } | |
634 | |
635 | |
636 // return: how many bytes can be played without blocking | |
18915
99e20a22d5d0
modifies function declarations without parameters from ()
reynaldo
parents:
17933
diff
changeset
|
637 static int get_space(void){ |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
638 audio_info_t info; |
1041 | 639 |
640 // check buffer | |
641 #ifdef HAVE_AUDIO_SELECT | |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
642 { |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
643 fd_set rfds; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
644 struct timeval tv; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
645 FD_ZERO(&rfds); |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
646 FD_SET(audio_fd, &rfds); |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
647 tv.tv_sec = 0; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
648 tv.tv_usec = 0; |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
649 if(!select(audio_fd+1, NULL, &rfds, NULL, &tv)) return 0; // not block! |
1041 | 650 } |
651 #endif | |
652 | |
23336 | 653 ioctl(audio_fd, AUDIO_GETINFO, &info); |
6630
daf0d43ccde2
Patch to improve bufferhandling on OpenBSD and NetBSD, by Bj¸«Órn Sandell and Bernd Ernesti <mplayer at lists.veego.de>
atmos4
parents:
5893
diff
changeset
|
654 #if !defined (__OpenBSD__) && !defined(__NetBSD__) |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
655 if (queued_bursts - info.play.eof > 2) |
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
656 return 0; |
23593
1bb33276e2de
Fix r23353, it broke ao_sun on non-BSD due to accidentially removing
reimar
parents:
23336
diff
changeset
|
657 return ao_data.outburst; |
23335
69696caa0b1b
Clean up some unused code and #ifdef mess in ao_sun.c
reimar
parents:
23334
diff
changeset
|
658 #else |
6630
daf0d43ccde2
Patch to improve bufferhandling on OpenBSD and NetBSD, by Bj¸«Órn Sandell and Bernd Ernesti <mplayer at lists.veego.de>
atmos4
parents:
5893
diff
changeset
|
659 return info.hiwat * info.blocksize - info.play.seek; |
daf0d43ccde2
Patch to improve bufferhandling on OpenBSD and NetBSD, by Bj¸«Órn Sandell and Bernd Ernesti <mplayer at lists.veego.de>
atmos4
parents:
5893
diff
changeset
|
660 #endif |
daf0d43ccde2
Patch to improve bufferhandling on OpenBSD and NetBSD, by Bj¸«Órn Sandell and Bernd Ernesti <mplayer at lists.veego.de>
atmos4
parents:
5893
diff
changeset
|
661 |
1041 | 662 } |
663 | |
664 // plays 'len' bytes of 'data' | |
665 // it should round it down to outburst*n | |
666 // return: number of bytes played | |
667 static int play(void* data,int len,int flags){ | |
3095 | 668 if (len < ao_data.outburst) return 0; |
669 len /= ao_data.outburst; | |
670 len *= ao_data.outburst; | |
1308
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
671 |
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
672 len = write(audio_fd, data, len); |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
673 if(len > 0) { |
1308
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
674 queued_samples += len / bytes_per_sample; |
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
675 if (write(audio_fd,data,0) < 0) |
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
676 perror("ao_sun: send EOF audio record"); |
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
677 else |
ffd63a75700c
Support playback of AFMT_S16_LE audio data on a big endian machine
jkeil
parents:
1209
diff
changeset
|
678 queued_bursts ++; |
1041 | 679 } |
680 return len; | |
681 } | |
682 | |
683 | |
3095 | 684 // return: delay in seconds between first and last sample in buffer |
18915
99e20a22d5d0
modifies function declarations without parameters from ()
reynaldo
parents:
17933
diff
changeset
|
685 static float get_delay(void){ |
1041 | 686 audio_info_t info; |
687 ioctl(audio_fd, AUDIO_GETINFO, &info); | |
6630
daf0d43ccde2
Patch to improve bufferhandling on OpenBSD and NetBSD, by Bj¸«Órn Sandell and Bernd Ernesti <mplayer at lists.veego.de>
atmos4
parents:
5893
diff
changeset
|
688 #if defined (__OpenBSD__) || defined(__NetBSD__) |
5872 | 689 return (float) info.play.seek/ (float)byte_per_sec ; |
690 #else | |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
691 if (info.play.samples && enable_sample_timing == RTSC_ENABLED) |
7714
6973a985ac2a
- ao_data.bps not set, confuses the A-V sync computation when the audio filters
jkeil
parents:
7656
diff
changeset
|
692 return (float)(queued_samples - info.play.samples) / (float)ao_data.samplerate; |
1196
fc51929ec8ea
Applied patch by J¸«ärgen Keil (jk@tools.de), improves smoothness of video playback.
atmosfear
parents:
1058
diff
changeset
|
693 else |
3137 | 694 return (float)((queued_bursts - info.play.eof) * ao_data.outburst) / (float)byte_per_sec; |
5872 | 695 #endif |
1041 | 696 } |