Mercurial > mplayer.hg
annotate libao2/ao_jack.c @ 26907:f0d0b666ee35
Fix compilation with internal dvdnav
author | rtogni |
---|---|
date | Sat, 31 May 2008 13:42:09 +0000 |
parents | da94a5973768 |
children | d97a607821f1 |
rev | line source |
---|---|
15605 | 1 /* |
2 * ao_jack.c - libao2 JACK Audio Output Driver for MPlayer | |
12662
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
3 * |
15605 | 4 * This driver is under the same license as MPlayer. |
5 * (http://www.mplayerhq.hu) | |
12662
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
6 * |
23734 | 7 * Copyleft 2001 by Felix Bünemann (atmosfear@users.sf.net) |
8 * and Reimar Döffinger (Reimar.Doeffinger@stud.uni-karlsruhe.de) | |
12662
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
9 */ |
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
10 |
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
11 #include <stdio.h> |
15605 | 12 #include <stdlib.h> |
13 #include <string.h> | |
15641
1bb5111490cd
Create a unique client name so that multiple instances work.
reimar
parents:
15630
diff
changeset
|
14 #include <unistd.h> |
12662
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
15 |
14479 | 16 #include "config.h" |
15605 | 17 #include "mp_msg.h" |
18 #include "help_mp.h" | |
19 | |
12662
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
20 #include "audio_out.h" |
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
21 #include "audio_out_internal.h" |
14245 | 22 #include "libaf/af_format.h" |
15605 | 23 #include "osdep/timer.h" |
24 #include "subopt-helper.h" | |
12662
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
25 |
15605 | 26 #include "libvo/fastmemcpy.h" |
27 | |
28 #include <jack/jack.h> | |
12662
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
29 |
15605 | 30 static ao_info_t info = |
12662
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
31 { |
15605 | 32 "JACK audio output", |
33 "jack", | |
23734 | 34 "Reimar Döffinger <Reimar.Doeffinger@stud.uni-karlsruhe.de>", |
15605 | 35 "based on ao_sdl.c" |
12662
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
36 }; |
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
37 |
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
38 LIBAO_EXTERN(jack) |
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
39 |
15605 | 40 //! maximum number of channels supported, avoids lots of mallocs |
41 #define MAX_CHANS 6 | |
42 static jack_port_t *ports[MAX_CHANS]; | |
43 static int num_ports; ///< Number of used ports == number of channels | |
44 static jack_client_t *client; | |
15630 | 45 static float jack_latency; |
16104
fc2459a18bf3
improved audio delay estimation, supposed to help make the video smoother
reimar
parents:
15868
diff
changeset
|
46 static int estimate; |
15605 | 47 static volatile int paused = 0; ///< set if paused |
48 static volatile int underrun = 0; ///< signals if an underrun occured | |
12662
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
49 |
16104
fc2459a18bf3
improved audio delay estimation, supposed to help make the video smoother
reimar
parents:
15868
diff
changeset
|
50 static volatile float callback_interval = 0; |
fc2459a18bf3
improved audio delay estimation, supposed to help make the video smoother
reimar
parents:
15868
diff
changeset
|
51 static volatile float callback_time = 0; |
15605 | 52 |
53 //! size of one chunk, if this is too small MPlayer will start to "stutter" | |
54 //! after a short time of playback | |
55 #define CHUNK_SIZE (16 * 1024) | |
56 //! number of "virtual" chunks the buffer consists of | |
57 #define NUM_CHUNKS 8 | |
58 // This type of ring buffer may never fill up completely, at least | |
59 // one byte must always be unused. | |
60 // For performance reasons (alignment etc.) one whole chunk always stays | |
61 // empty, not only one byte. | |
62 #define BUFFSIZE ((NUM_CHUNKS + 1) * CHUNK_SIZE) | |
63 | |
64 //! buffer for audio data | |
65 static unsigned char *buffer = NULL; | |
66 | |
67 //! buffer read position, may only be modified by playback thread or while it is stopped | |
68 static volatile int read_pos; | |
69 //! buffer write position, may only be modified by MPlayer's thread | |
70 static volatile int write_pos; | |
71 | |
72 /** | |
73 * \brief get the number of free bytes in the buffer | |
74 * \return number of free bytes in buffer | |
75 * | |
76 * may only be called by MPlayer's thread | |
77 * return value may change between immediately following two calls, | |
78 * and the real number of free bytes might be larger! | |
79 */ | |
18915
99e20a22d5d0
modifies function declarations without parameters from ()
reynaldo
parents:
18885
diff
changeset
|
80 static int buf_free(void) { |
15605 | 81 int free = read_pos - write_pos - CHUNK_SIZE; |
82 if (free < 0) free += BUFFSIZE; | |
83 return free; | |
84 } | |
85 | |
86 /** | |
87 * \brief get amount of data available in the buffer | |
88 * \return number of bytes available in buffer | |
89 * | |
90 * may only be called by the playback thread | |
91 * return value may change between immediately following two calls, | |
92 * and the real number of buffered bytes might be larger! | |
93 */ | |
18915
99e20a22d5d0
modifies function declarations without parameters from ()
reynaldo
parents:
18885
diff
changeset
|
94 static int buf_used(void) { |
15605 | 95 int used = write_pos - read_pos; |
96 if (used < 0) used += BUFFSIZE; | |
97 return used; | |
98 } | |
12662
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
99 |
15605 | 100 /** |
101 * \brief insert len bytes into buffer | |
102 * \param data data to insert | |
103 * \param len length of data | |
104 * \return number of bytes inserted into buffer | |
105 * | |
106 * If there is not enough room, the buffer is filled up | |
107 */ | |
108 static int write_buffer(unsigned char* data, int len) { | |
109 int first_len = BUFFSIZE - write_pos; | |
110 int free = buf_free(); | |
111 if (len > free) len = free; | |
112 if (first_len > len) first_len = len; | |
113 // till end of buffer | |
23457
a124f3abc1ec
Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents:
18915
diff
changeset
|
114 fast_memcpy (&buffer[write_pos], data, first_len); |
15605 | 115 if (len > first_len) { // we have to wrap around |
116 // remaining part from beginning of buffer | |
23457
a124f3abc1ec
Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents:
18915
diff
changeset
|
117 fast_memcpy (buffer, &data[first_len], len - first_len); |
15605 | 118 } |
119 write_pos = (write_pos + len) % BUFFSIZE; | |
120 return len; | |
121 } | |
13012
2d188ebe0f3b
Update ao_jack for new bio2jack API, improve check in configure.
diego
parents:
12702
diff
changeset
|
122 |
25648
2438052a176e
Another small simplification. Slightly worse performance in the case
reimar
parents:
25647
diff
changeset
|
123 static void silence(float **bufs, int cnt, int num_bufs); |
2438052a176e
Another small simplification. Slightly worse performance in the case
reimar
parents:
25647
diff
changeset
|
124 |
15605 | 125 /** |
126 * \brief read data from buffer and splitting it into channels | |
127 * \param bufs num_bufs float buffers, each will contain the data of one channel | |
128 * \param cnt number of samples to read per channel | |
129 * \param num_bufs number of channels to split the data into | |
130 * \return number of samples read per channel, equals cnt unless there was too | |
131 * little data in the buffer | |
132 * | |
133 * Assumes the data in the buffer is of type float, the number of bytes | |
134 * read is res * num_bufs * sizeof(float), where res is the return value. | |
18808
cb83184bdc70
respect AOPLAY_FINAL_CHUNK and do not discard samples read from buffer
reimar
parents:
18807
diff
changeset
|
135 * If there is not enough data in the buffer remaining parts will be filled |
cb83184bdc70
respect AOPLAY_FINAL_CHUNK and do not discard samples read from buffer
reimar
parents:
18807
diff
changeset
|
136 * with silence. |
15605 | 137 */ |
138 static int read_buffer(float **bufs, int cnt, int num_bufs) { | |
139 int buffered = buf_used(); | |
140 int i, j; | |
25647 | 141 if (cnt * sizeof(float) * num_bufs > buffered) { |
25648
2438052a176e
Another small simplification. Slightly worse performance in the case
reimar
parents:
25647
diff
changeset
|
142 silence(bufs, cnt, num_bufs); |
15605 | 143 cnt = buffered / sizeof(float) / num_bufs; |
25647 | 144 } |
15605 | 145 for (i = 0; i < cnt; i++) { |
146 for (j = 0; j < num_bufs; j++) { | |
25647 | 147 bufs[j][i] = *(float *)&buffer[read_pos]; |
15605 | 148 read_pos = (read_pos + sizeof(float)) % BUFFSIZE; |
149 } | |
150 } | |
151 return cnt; | |
152 } | |
12662
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
153 |
15605 | 154 // end ring buffer stuff |
155 | |
156 static int control(int cmd, void *arg) { | |
157 return CONTROL_UNKNOWN; | |
158 } | |
159 | |
160 /** | |
161 * \brief fill the buffers with silence | |
162 * \param bufs num_bufs float buffers, each will contain the data of one channel | |
163 * \param cnt number of samples in each buffer | |
164 * \param num_bufs number of buffers | |
165 */ | |
166 static void silence(float **bufs, int cnt, int num_bufs) { | |
25646 | 167 int i; |
168 for (i = 0; i < num_bufs; i++) | |
169 memset(bufs[i], 0, cnt * sizeof(float)); | |
12662
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
170 } |
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
171 |
15605 | 172 /** |
173 * \brief JACK Callback function | |
174 * \param nframes number of frames to fill into buffers | |
175 * \param arg unused | |
176 * \return currently always 0 | |
177 * | |
178 * Write silence into buffers if paused or an underrun occured | |
179 */ | |
180 static int outputaudio(jack_nframes_t nframes, void *arg) { | |
181 float *bufs[MAX_CHANS]; | |
182 int i; | |
183 for (i = 0; i < num_ports; i++) | |
184 bufs[i] = jack_port_get_buffer(ports[i], nframes); | |
18808
cb83184bdc70
respect AOPLAY_FINAL_CHUNK and do not discard samples read from buffer
reimar
parents:
18807
diff
changeset
|
185 if (paused || underrun) |
cb83184bdc70
respect AOPLAY_FINAL_CHUNK and do not discard samples read from buffer
reimar
parents:
18807
diff
changeset
|
186 silence(bufs, nframes, num_ports); |
cb83184bdc70
respect AOPLAY_FINAL_CHUNK and do not discard samples read from buffer
reimar
parents:
18807
diff
changeset
|
187 else |
15605 | 188 if (read_buffer(bufs, nframes, num_ports) < nframes) |
189 underrun = 1; | |
16104
fc2459a18bf3
improved audio delay estimation, supposed to help make the video smoother
reimar
parents:
15868
diff
changeset
|
190 if (estimate) { |
fc2459a18bf3
improved audio delay estimation, supposed to help make the video smoother
reimar
parents:
15868
diff
changeset
|
191 float now = (float)GetTimer() / 1000000.0; |
fc2459a18bf3
improved audio delay estimation, supposed to help make the video smoother
reimar
parents:
15868
diff
changeset
|
192 float diff = callback_time + callback_interval - now; |
16140 | 193 if ((diff > -0.002) && (diff < 0.002)) |
16104
fc2459a18bf3
improved audio delay estimation, supposed to help make the video smoother
reimar
parents:
15868
diff
changeset
|
194 callback_time += callback_interval; |
fc2459a18bf3
improved audio delay estimation, supposed to help make the video smoother
reimar
parents:
15868
diff
changeset
|
195 else |
fc2459a18bf3
improved audio delay estimation, supposed to help make the video smoother
reimar
parents:
15868
diff
changeset
|
196 callback_time = now; |
fc2459a18bf3
improved audio delay estimation, supposed to help make the video smoother
reimar
parents:
15868
diff
changeset
|
197 callback_interval = (float)nframes / (float)ao_data.samplerate; |
fc2459a18bf3
improved audio delay estimation, supposed to help make the video smoother
reimar
parents:
15868
diff
changeset
|
198 } |
15605 | 199 return 0; |
200 } | |
12662
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
201 |
15605 | 202 /** |
203 * \brief print suboption usage help | |
204 */ | |
18915
99e20a22d5d0
modifies function declarations without parameters from ()
reynaldo
parents:
18885
diff
changeset
|
205 static void print_help (void) |
15605 | 206 { |
207 mp_msg (MSGT_AO, MSGL_FATAL, | |
208 "\n-ao jack commandline help:\n" | |
209 "Example: mplayer -ao jack:port=myout\n" | |
210 " connects MPlayer to the jack ports named myout\n" | |
211 "\nOptions:\n" | |
212 " port=<port name>\n" | |
16104
fc2459a18bf3
improved audio delay estimation, supposed to help make the video smoother
reimar
parents:
15868
diff
changeset
|
213 " Connects to the given ports instead of the default physical ones\n" |
16253 | 214 " name=<client name>\n" |
215 " Client name to pass to JACK\n" | |
16104
fc2459a18bf3
improved audio delay estimation, supposed to help make the video smoother
reimar
parents:
15868
diff
changeset
|
216 " estimate\n" |
fc2459a18bf3
improved audio delay estimation, supposed to help make the video smoother
reimar
parents:
15868
diff
changeset
|
217 " Estimates the amount of data in buffers (experimental)\n"); |
12662
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
218 } |
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
219 |
15605 | 220 static int init(int rate, int channels, int format, int flags) { |
221 const char **matching_ports = NULL; | |
222 char *port_name = NULL; | |
16253 | 223 char *client_name = NULL; |
15605 | 224 opt_t subopts[] = { |
225 {"port", OPT_ARG_MSTRZ, &port_name, NULL}, | |
16253 | 226 {"name", OPT_ARG_MSTRZ, &client_name, NULL}, |
16104
fc2459a18bf3
improved audio delay estimation, supposed to help make the video smoother
reimar
parents:
15868
diff
changeset
|
227 {"estimate", OPT_ARG_BOOL, &estimate, NULL}, |
15605 | 228 {NULL} |
229 }; | |
230 int port_flags = JackPortIsInput; | |
231 int i; | |
16104
fc2459a18bf3
improved audio delay estimation, supposed to help make the video smoother
reimar
parents:
15868
diff
changeset
|
232 estimate = 1; |
15605 | 233 if (subopt_parse(ao_subdevice, subopts) != 0) { |
234 print_help(); | |
235 return 0; | |
236 } | |
237 if (channels > MAX_CHANS) { | |
238 mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] Invalid number of channels: %i\n", channels); | |
239 goto err_out; | |
240 } | |
16253 | 241 if (!client_name) { |
18885 | 242 client_name = malloc(40); |
25645 | 243 sprintf(client_name, "MPlayer [%d]", getpid()); |
16253 | 244 } |
15641
1bb5111490cd
Create a unique client name so that multiple instances work.
reimar
parents:
15630
diff
changeset
|
245 client = jack_client_new(client_name); |
15605 | 246 if (!client) { |
247 mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] cannot open server\n"); | |
248 goto err_out; | |
249 } | |
15868 | 250 reset(); |
15605 | 251 jack_set_process_callback(client, outputaudio, 0); |
12662
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
252 |
15605 | 253 // list matching ports |
254 if (!port_name) | |
255 port_flags |= JackPortIsPhysical; | |
256 matching_ports = jack_get_ports(client, port_name, NULL, port_flags); | |
25649 | 257 if (!matching_ports || !matching_ports[0]) { |
15605 | 258 mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] no physical ports available\n"); |
259 goto err_out; | |
260 } | |
25650 | 261 i = 1; |
262 while (matching_ports[i]) i++; | |
263 if (channels > i) channels = i; | |
15605 | 264 num_ports = channels; |
12662
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
265 |
15605 | 266 // create out output ports |
267 for (i = 0; i < num_ports; i++) { | |
268 char pname[30]; | |
269 snprintf(pname, 30, "out_%d", i); | |
270 ports[i] = jack_port_register(client, pname, JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0); | |
271 if (!ports[i]) { | |
272 mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] not enough ports available\n"); | |
273 goto err_out; | |
274 } | |
275 } | |
276 if (jack_activate(client)) { | |
277 mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] activate failed\n"); | |
278 goto err_out; | |
279 } | |
280 for (i = 0; i < num_ports; i++) { | |
281 if (jack_connect(client, jack_port_name(ports[i]), matching_ports[i])) { | |
282 mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] connecting failed\n"); | |
283 goto err_out; | |
284 } | |
285 } | |
15630 | 286 rate = jack_get_sample_rate(client); |
287 jack_latency = (float)(jack_port_get_total_latency(client, ports[0]) + | |
288 jack_get_buffer_size(client)) / (float)rate; | |
16104
fc2459a18bf3
improved audio delay estimation, supposed to help make the video smoother
reimar
parents:
15868
diff
changeset
|
289 callback_interval = 0; |
25644 | 290 buffer = malloc(BUFFSIZE); |
12662
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
291 |
15605 | 292 ao_data.channels = channels; |
15630 | 293 ao_data.samplerate = rate; |
15605 | 294 ao_data.format = AF_FORMAT_FLOAT_NE; |
295 ao_data.bps = channels * rate * sizeof(float); | |
15630 | 296 ao_data.buffersize = CHUNK_SIZE * NUM_CHUNKS; |
15605 | 297 ao_data.outburst = CHUNK_SIZE; |
298 free(matching_ports); | |
299 free(port_name); | |
16253 | 300 free(client_name); |
15605 | 301 return 1; |
12662
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
302 |
15605 | 303 err_out: |
304 free(matching_ports); | |
305 free(port_name); | |
16253 | 306 free(client_name); |
15605 | 307 if (client) |
308 jack_client_close(client); | |
309 free(buffer); | |
310 buffer = NULL; | |
311 return 0; | |
12662
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
312 } |
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
313 |
15605 | 314 // close audio device |
315 static void uninit(int immed) { | |
316 if (!immed) | |
317 usec_sleep(get_delay() * 1000 * 1000); | |
318 // HACK, make sure jack doesn't loop-output dirty buffers | |
15868 | 319 reset(); |
15605 | 320 usec_sleep(100 * 1000); |
321 jack_client_close(client); | |
322 free(buffer); | |
323 buffer = NULL; | |
12662
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
324 } |
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
325 |
15605 | 326 /** |
327 * \brief stop playing and empty buffers (for seeking/pause) | |
328 */ | |
18915
99e20a22d5d0
modifies function declarations without parameters from ()
reynaldo
parents:
18885
diff
changeset
|
329 static void reset(void) { |
15605 | 330 paused = 1; |
331 read_pos = 0; | |
332 write_pos = 0; | |
333 paused = 0; | |
334 } | |
12662
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
335 |
15605 | 336 /** |
337 * \brief stop playing, keep buffers (for pause) | |
338 */ | |
18915
99e20a22d5d0
modifies function declarations without parameters from ()
reynaldo
parents:
18885
diff
changeset
|
339 static void audio_pause(void) { |
15605 | 340 paused = 1; |
12662
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
341 } |
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
342 |
15605 | 343 /** |
344 * \brief resume playing, after audio_pause() | |
345 */ | |
18915
99e20a22d5d0
modifies function declarations without parameters from ()
reynaldo
parents:
18885
diff
changeset
|
346 static void audio_resume(void) { |
15605 | 347 paused = 0; |
348 } | |
12662
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
349 |
18915
99e20a22d5d0
modifies function declarations without parameters from ()
reynaldo
parents:
18885
diff
changeset
|
350 static int get_space(void) { |
15605 | 351 return buf_free(); |
12662
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
352 } |
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
353 |
15605 | 354 /** |
355 * \brief write data into buffer and reset underrun flag | |
356 */ | |
357 static int play(void *data, int len, int flags) { | |
18808
cb83184bdc70
respect AOPLAY_FINAL_CHUNK and do not discard samples read from buffer
reimar
parents:
18807
diff
changeset
|
358 if (!(flags & AOPLAY_FINAL_CHUNK)) |
25645 | 359 len -= len % ao_data.outburst; |
15605 | 360 underrun = 0; |
361 return write_buffer(data, len); | |
12662
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
362 } |
05d46af5e2bf
JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff
changeset
|
363 |
18915
99e20a22d5d0
modifies function declarations without parameters from ()
reynaldo
parents:
18885
diff
changeset
|
364 static float get_delay(void) { |
15605 | 365 int buffered = BUFFSIZE - CHUNK_SIZE - buf_free(); // could be less |
15630 | 366 float in_jack = jack_latency; |
16104
fc2459a18bf3
improved audio delay estimation, supposed to help make the video smoother
reimar
parents:
15868
diff
changeset
|
367 if (estimate && callback_interval > 0) { |
fc2459a18bf3
improved audio delay estimation, supposed to help make the video smoother
reimar
parents:
15868
diff
changeset
|
368 float elapsed = (float)GetTimer() / 1000000.0 - callback_time; |
fc2459a18bf3
improved audio delay estimation, supposed to help make the video smoother
reimar
parents:
15868
diff
changeset
|
369 in_jack += callback_interval - elapsed; |
fc2459a18bf3
improved audio delay estimation, supposed to help make the video smoother
reimar
parents:
15868
diff
changeset
|
370 if (in_jack < 0) in_jack = 0; |
fc2459a18bf3
improved audio delay estimation, supposed to help make the video smoother
reimar
parents:
15868
diff
changeset
|
371 } |
15605 | 372 return (float)buffered / (float)ao_data.bps + in_jack; |
373 } | |
374 |