annotate libao2/ao_jack.c @ 16105:a274b6bd2e23

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