annotate libao2/ao_jack.c @ 29986:31e6eb42db99

spelling cosmetics
author diego
date Mon, 14 Dec 2009 03:01:40 +0000
parents 2eff450157cd
children 32725ca88fed
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
27509
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 25650
diff changeset
1 /*
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 25650
diff changeset
2 * JACK audio output driver for MPlayer
12662
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
3 *
23734
acfe034e5386 ISO8859-1 --> UTF-8
diego
parents: 23457
diff changeset
4 * Copyleft 2001 by Felix Bünemann (atmosfear@users.sf.net)
acfe034e5386 ISO8859-1 --> UTF-8
diego
parents: 23457
diff changeset
5 * and Reimar Döffinger (Reimar.Doeffinger@stud.uni-karlsruhe.de)
27509
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 25650
diff changeset
6 *
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 25650
diff changeset
7 * This file is part of MPlayer.
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 25650
diff changeset
8 *
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 25650
diff changeset
9 * MPlayer is free software; you can redistribute it and/or modify
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 25650
diff changeset
10 * it under the terms of the GNU General Public License as published by
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 25650
diff changeset
11 * the Free Software Foundation; either version 2 of the License, or
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 25650
diff changeset
12 * (at your option) any later version.
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 25650
diff changeset
13 *
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 25650
diff changeset
14 * MPlayer is distributed in the hope that it will be useful,
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 25650
diff changeset
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 25650
diff changeset
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 25650
diff changeset
17 * GNU General Public License for more details.
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 25650
diff changeset
18 *
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 25650
diff changeset
19 * You should have received a copy of the GNU General Public License along
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 25650
diff changeset
20 * along with MPlayer; if not, write to the Free Software
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 25650
diff changeset
21 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
12662
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
22 */
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
23
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
24 #include <stdio.h>
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
25 #include <stdlib.h>
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
26 #include <string.h>
15641
1bb5111490cd Create a unique client name so that multiple instances work.
reimar
parents: 15630
diff changeset
27 #include <unistd.h>
12662
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
28
14479
cae0dbeb44bb af_format.h needs config.h to be included first.
reimar
parents: 14245
diff changeset
29 #include "config.h"
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
30 #include "mp_msg.h"
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
31 #include "help_mp.h"
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
32
12662
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
33 #include "audio_out.h"
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
34 #include "audio_out_internal.h"
14245
815f03b7cee5 removing AFMT_ dependancy
alex
parents: 14123
diff changeset
35 #include "libaf/af_format.h"
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
36 #include "osdep/timer.h"
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
37 #include "subopt-helper.h"
12662
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
38
28882
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
39 #include "libavutil/fifo.h"
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
40
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
41 #include <jack/jack.h>
12662
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
42
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29126
diff changeset
43 static const ao_info_t info =
12662
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
44 {
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
45 "JACK audio output",
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
46 "jack",
23734
acfe034e5386 ISO8859-1 --> UTF-8
diego
parents: 23457
diff changeset
47 "Reimar Döffinger <Reimar.Doeffinger@stud.uni-karlsruhe.de>",
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
48 "based on ao_sdl.c"
12662
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
49 };
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
50
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
51 LIBAO_EXTERN(jack)
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
52
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
53 //! maximum number of channels supported, avoids lots of mallocs
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
54 #define MAX_CHANS 6
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
55 static jack_port_t *ports[MAX_CHANS];
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
56 static int num_ports; ///< Number of used ports == number of channels
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
57 static jack_client_t *client;
15630
7c67124786a0 Fix latency calculation and buffersize setting.
reimar
parents: 15605
diff changeset
58 static float jack_latency;
16104
fc2459a18bf3 improved audio delay estimation, supposed to help make the video smoother
reimar
parents: 15868
diff changeset
59 static int estimate;
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
60 static volatile int paused = 0; ///< set if paused
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
61 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
62
16104
fc2459a18bf3 improved audio delay estimation, supposed to help make the video smoother
reimar
parents: 15868
diff changeset
63 static volatile float callback_interval = 0;
fc2459a18bf3 improved audio delay estimation, supposed to help make the video smoother
reimar
parents: 15868
diff changeset
64 static volatile float callback_time = 0;
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
65
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
66 //! 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
67 //! after a short time of playback
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
68 #define CHUNK_SIZE (16 * 1024)
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
69 //! number of "virtual" chunks the buffer consists of
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
70 #define NUM_CHUNKS 8
28882
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
71 #define BUFFSIZE (NUM_CHUNKS * CHUNK_SIZE)
15605
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 //! buffer for audio data
28882
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
74 static AVFifoBuffer *buffer;
12662
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
75
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
76 /**
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
77 * \brief insert len bytes into buffer
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
78 * \param data data to insert
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
79 * \param len length of data
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
80 * \return number of bytes inserted into buffer
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
81 *
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
82 * If there is not enough room, the buffer is filled up
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
83 */
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
84 static int write_buffer(unsigned char* data, int len) {
29126
f951680cfea2 Simplify: use av_fifo_space
reimar
parents: 28882
diff changeset
85 int free = av_fifo_space(buffer);
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
86 if (len > free) len = free;
28882
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
87 return av_fifo_generic_write(buffer, data, len, NULL);
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
88 }
13012
2d188ebe0f3b Update ao_jack for new bio2jack API, improve check in configure.
diego
parents: 12702
diff changeset
89
25648
2438052a176e Another small simplification. Slightly worse performance in the case
reimar
parents: 25647
diff changeset
90 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
91
28882
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
92 struct deinterleave {
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
93 float **bufs;
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
94 int num_bufs;
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
95 int cur_buf;
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
96 int pos;
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
97 };
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
98
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
99 static void deinterleave(void *info, void *src, int len) {
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
100 struct deinterleave *di = info;
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
101 float *s = src;
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
102 int i;
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
103 len /= sizeof(float);
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
104 for (i = 0; i < len; i++) {
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
105 di->bufs[di->cur_buf++][di->pos] = s[i];
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
106 if (di->cur_buf >= di->num_bufs) {
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
107 di->cur_buf = 0;
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
108 di->pos++;
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
109 }
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
110 }
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
111 }
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
112
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
113 /**
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
114 * \brief read data from buffer and splitting it into channels
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
115 * \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
116 * \param cnt number of samples to read per channel
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
117 * \param num_bufs number of channels to split the data into
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
118 * \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
119 * little data in the buffer
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
120 *
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
121 * 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
122 * 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
123 * 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
124 * with silence.
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
125 */
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
126 static int read_buffer(float **bufs, int cnt, int num_bufs) {
28882
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
127 struct deinterleave di = {bufs, num_bufs, 0, 0};
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
128 int buffered = av_fifo_size(buffer);
25647
e93a3c68757f Slightly simplify read_buffer code
reimar
parents: 25646
diff changeset
129 if (cnt * sizeof(float) * num_bufs > buffered) {
25648
2438052a176e Another small simplification. Slightly worse performance in the case
reimar
parents: 25647
diff changeset
130 silence(bufs, cnt, num_bufs);
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
131 cnt = buffered / sizeof(float) / num_bufs;
25647
e93a3c68757f Slightly simplify read_buffer code
reimar
parents: 25646
diff changeset
132 }
28882
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
133 av_fifo_generic_read(buffer, &di, cnt * num_bufs * sizeof(float), deinterleave);
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
134 return cnt;
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
135 }
12662
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
136
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
137 // end ring buffer stuff
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
138
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
139 static int control(int cmd, void *arg) {
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
140 return CONTROL_UNKNOWN;
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
141 }
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
142
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
143 /**
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
144 * \brief fill the buffers with silence
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
145 * \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
146 * \param cnt number of samples in each buffer
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
147 * \param num_bufs number of buffers
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
148 */
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
149 static void silence(float **bufs, int cnt, int num_bufs) {
25646
01f762da9c87 Simplify: use memset
reimar
parents: 25645
diff changeset
150 int i;
01f762da9c87 Simplify: use memset
reimar
parents: 25645
diff changeset
151 for (i = 0; i < num_bufs; i++)
01f762da9c87 Simplify: use memset
reimar
parents: 25645
diff changeset
152 memset(bufs[i], 0, cnt * sizeof(float));
12662
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
153 }
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
154
15605
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 JACK Callback function
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
157 * \param nframes number of frames to fill into buffers
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
158 * \param arg unused
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
159 * \return currently always 0
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 * Write silence into buffers if paused or an underrun occured
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
162 */
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
163 static int outputaudio(jack_nframes_t nframes, void *arg) {
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
164 float *bufs[MAX_CHANS];
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
165 int i;
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
166 for (i = 0; i < num_ports; i++)
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
167 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
168 if (paused || underrun)
cb83184bdc70 respect AOPLAY_FINAL_CHUNK and do not discard samples read from buffer
reimar
parents: 18807
diff changeset
169 silence(bufs, nframes, num_ports);
cb83184bdc70 respect AOPLAY_FINAL_CHUNK and do not discard samples read from buffer
reimar
parents: 18807
diff changeset
170 else
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
171 if (read_buffer(bufs, nframes, num_ports) < nframes)
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
172 underrun = 1;
16104
fc2459a18bf3 improved audio delay estimation, supposed to help make the video smoother
reimar
parents: 15868
diff changeset
173 if (estimate) {
fc2459a18bf3 improved audio delay estimation, supposed to help make the video smoother
reimar
parents: 15868
diff changeset
174 float now = (float)GetTimer() / 1000000.0;
fc2459a18bf3 improved audio delay estimation, supposed to help make the video smoother
reimar
parents: 15868
diff changeset
175 float diff = callback_time + callback_interval - now;
16140
0671f92d2cb4 reset estimation also on too negative diff
reimar
parents: 16104
diff changeset
176 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
177 callback_time += callback_interval;
fc2459a18bf3 improved audio delay estimation, supposed to help make the video smoother
reimar
parents: 15868
diff changeset
178 else
fc2459a18bf3 improved audio delay estimation, supposed to help make the video smoother
reimar
parents: 15868
diff changeset
179 callback_time = now;
fc2459a18bf3 improved audio delay estimation, supposed to help make the video smoother
reimar
parents: 15868
diff changeset
180 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
181 }
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
182 return 0;
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
183 }
12662
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
184
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
185 /**
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
186 * \brief print suboption usage help
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
187 */
18915
99e20a22d5d0 modifies function declarations without parameters from ()
reynaldo
parents: 18885
diff changeset
188 static void print_help (void)
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
189 {
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
190 mp_msg (MSGT_AO, MSGL_FATAL,
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
191 "\n-ao jack commandline help:\n"
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
192 "Example: mplayer -ao jack:port=myout\n"
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
193 " connects MPlayer to the jack ports named myout\n"
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
194 "\nOptions:\n"
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
195 " port=<port name>\n"
16104
fc2459a18bf3 improved audio delay estimation, supposed to help make the video smoother
reimar
parents: 15868
diff changeset
196 " Connects to the given ports instead of the default physical ones\n"
16253
d7b41311866a name suboption for jack to set client name
reimar
parents: 16140
diff changeset
197 " name=<client name>\n"
d7b41311866a name suboption for jack to set client name
reimar
parents: 16140
diff changeset
198 " 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
199 " estimate\n"
28206
678a664a79ea Replace deprecated jack_client_new with jack_client_open.
reimar
parents: 27509
diff changeset
200 " Estimates the amount of data in buffers (experimental)\n"
678a664a79ea Replace deprecated jack_client_new with jack_client_open.
reimar
parents: 27509
diff changeset
201 " autostart\n"
678a664a79ea Replace deprecated jack_client_new with jack_client_open.
reimar
parents: 27509
diff changeset
202 " Automatically start JACK server if necessary\n"
678a664a79ea Replace deprecated jack_client_new with jack_client_open.
reimar
parents: 27509
diff changeset
203 );
12662
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
204 }
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
205
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
206 static int init(int rate, int channels, int format, int flags) {
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
207 const char **matching_ports = NULL;
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
208 char *port_name = NULL;
16253
d7b41311866a name suboption for jack to set client name
reimar
parents: 16140
diff changeset
209 char *client_name = NULL;
28206
678a664a79ea Replace deprecated jack_client_new with jack_client_open.
reimar
parents: 27509
diff changeset
210 int autostart = 0;
29586
2eff450157cd The suboption parser now takes a const options list, so mark them all const.
reimar
parents: 29263
diff changeset
211 const opt_t subopts[] = {
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
212 {"port", OPT_ARG_MSTRZ, &port_name, NULL},
16253
d7b41311866a name suboption for jack to set client name
reimar
parents: 16140
diff changeset
213 {"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
214 {"estimate", OPT_ARG_BOOL, &estimate, NULL},
28206
678a664a79ea Replace deprecated jack_client_new with jack_client_open.
reimar
parents: 27509
diff changeset
215 {"autostart", OPT_ARG_BOOL, &autostart, NULL},
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
216 {NULL}
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
217 };
28206
678a664a79ea Replace deprecated jack_client_new with jack_client_open.
reimar
parents: 27509
diff changeset
218 jack_options_t open_options = JackUseExactName;
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
219 int port_flags = JackPortIsInput;
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
220 int i;
16104
fc2459a18bf3 improved audio delay estimation, supposed to help make the video smoother
reimar
parents: 15868
diff changeset
221 estimate = 1;
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
222 if (subopt_parse(ao_subdevice, subopts) != 0) {
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
223 print_help();
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
224 return 0;
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
225 }
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
226 if (channels > MAX_CHANS) {
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
227 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
228 goto err_out;
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
229 }
16253
d7b41311866a name suboption for jack to set client name
reimar
parents: 16140
diff changeset
230 if (!client_name) {
18885
5c8acc972551 rm unnecesary casts from void* - part 4
reynaldo
parents: 18808
diff changeset
231 client_name = malloc(40);
25645
56f7c73054a7 Fix indentation
reimar
parents: 25644
diff changeset
232 sprintf(client_name, "MPlayer [%d]", getpid());
16253
d7b41311866a name suboption for jack to set client name
reimar
parents: 16140
diff changeset
233 }
28206
678a664a79ea Replace deprecated jack_client_new with jack_client_open.
reimar
parents: 27509
diff changeset
234 if (!autostart)
678a664a79ea Replace deprecated jack_client_new with jack_client_open.
reimar
parents: 27509
diff changeset
235 open_options |= JackNoStartServer;
678a664a79ea Replace deprecated jack_client_new with jack_client_open.
reimar
parents: 27509
diff changeset
236 client = jack_client_open(client_name, open_options, NULL);
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
237 if (!client) {
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
238 mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] cannot open server\n");
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
239 goto err_out;
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
240 }
28882
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
241 buffer = av_fifo_alloc(BUFFSIZE);
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
242 jack_set_process_callback(client, outputaudio, 0);
12662
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
243
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
244 // list matching ports
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
245 if (!port_name)
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
246 port_flags |= JackPortIsPhysical;
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
247 matching_ports = jack_get_ports(client, port_name, NULL, port_flags);
25649
5cf7cb85128f Slightly deobfuscate
reimar
parents: 25648
diff changeset
248 if (!matching_ports || !matching_ports[0]) {
15605
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 }
25650
da94a5973768 Make code slightly less confusing to me
reimar
parents: 25649
diff changeset
252 i = 1;
da94a5973768 Make code slightly less confusing to me
reimar
parents: 25649
diff changeset
253 while (matching_ports[i]) i++;
da94a5973768 Make code slightly less confusing to me
reimar
parents: 25649
diff changeset
254 if (channels > i) channels = i;
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
255 num_ports = channels;
12662
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
256
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
257 // create out output ports
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
258 for (i = 0; i < num_ports; i++) {
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
259 char pname[30];
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
260 snprintf(pname, 30, "out_%d", i);
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
261 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
262 if (!ports[i]) {
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
263 mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] not enough ports available\n");
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
264 goto err_out;
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
265 }
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
266 }
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
267 if (jack_activate(client)) {
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
268 mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] activate failed\n");
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
269 goto err_out;
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
270 }
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
271 for (i = 0; i < num_ports; i++) {
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
272 if (jack_connect(client, jack_port_name(ports[i]), matching_ports[i])) {
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
273 mp_msg(MSGT_AO, MSGL_FATAL, "[JACK] connecting failed\n");
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
274 goto err_out;
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
275 }
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
276 }
15630
7c67124786a0 Fix latency calculation and buffersize setting.
reimar
parents: 15605
diff changeset
277 rate = jack_get_sample_rate(client);
7c67124786a0 Fix latency calculation and buffersize setting.
reimar
parents: 15605
diff changeset
278 jack_latency = (float)(jack_port_get_total_latency(client, ports[0]) +
7c67124786a0 Fix latency calculation and buffersize setting.
reimar
parents: 15605
diff changeset
279 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
280 callback_interval = 0;
12662
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
281
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
282 ao_data.channels = channels;
15630
7c67124786a0 Fix latency calculation and buffersize setting.
reimar
parents: 15605
diff changeset
283 ao_data.samplerate = rate;
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
284 ao_data.format = AF_FORMAT_FLOAT_NE;
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
285 ao_data.bps = channels * rate * sizeof(float);
15630
7c67124786a0 Fix latency calculation and buffersize setting.
reimar
parents: 15605
diff changeset
286 ao_data.buffersize = CHUNK_SIZE * NUM_CHUNKS;
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
287 ao_data.outburst = CHUNK_SIZE;
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
288 free(matching_ports);
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
289 free(port_name);
16253
d7b41311866a name suboption for jack to set client name
reimar
parents: 16140
diff changeset
290 free(client_name);
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
291 return 1;
12662
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
292
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
293 err_out:
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
294 free(matching_ports);
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
295 free(port_name);
16253
d7b41311866a name suboption for jack to set client name
reimar
parents: 16140
diff changeset
296 free(client_name);
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
297 if (client)
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
298 jack_client_close(client);
28882
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
299 av_fifo_free(buffer);
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
300 buffer = NULL;
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
301 return 0;
12662
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
302 }
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
303
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
304 // close audio device
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
305 static void uninit(int immed) {
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
306 if (!immed)
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
307 usec_sleep(get_delay() * 1000 * 1000);
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
308 // 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
309 reset();
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
310 usec_sleep(100 * 1000);
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
311 jack_client_close(client);
28882
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
312 av_fifo_free(buffer);
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
313 buffer = NULL;
12662
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
314 }
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
315
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
316 /**
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
317 * \brief stop playing and empty buffers (for seeking/pause)
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
318 */
18915
99e20a22d5d0 modifies function declarations without parameters from ()
reynaldo
parents: 18885
diff changeset
319 static void reset(void) {
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
320 paused = 1;
28882
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
321 av_fifo_reset(buffer);
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
322 paused = 0;
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
323 }
12662
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
324
15605
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 * \brief stop playing, keep buffers (for pause)
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
327 */
18915
99e20a22d5d0 modifies function declarations without parameters from ()
reynaldo
parents: 18885
diff changeset
328 static void audio_pause(void) {
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
329 paused = 1;
12662
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
330 }
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
331
15605
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 * \brief resume playing, after audio_pause()
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
334 */
18915
99e20a22d5d0 modifies function declarations without parameters from ()
reynaldo
parents: 18885
diff changeset
335 static void audio_resume(void) {
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
336 paused = 0;
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
337 }
12662
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
338
18915
99e20a22d5d0 modifies function declarations without parameters from ()
reynaldo
parents: 18885
diff changeset
339 static int get_space(void) {
29126
f951680cfea2 Simplify: use av_fifo_space
reimar
parents: 28882
diff changeset
340 return av_fifo_space(buffer);
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
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 * \brief write data into buffer and reset underrun flag
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
345 */
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
346 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
347 if (!(flags & AOPLAY_FINAL_CHUNK))
25645
56f7c73054a7 Fix indentation
reimar
parents: 25644
diff changeset
348 len -= len % ao_data.outburst;
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
349 underrun = 0;
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
350 return write_buffer(data, len);
12662
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
351 }
05d46af5e2bf JACK audio support through bio2jack by Kamil Strzelecki <esack@o2.pl>
alex
parents:
diff changeset
352
18915
99e20a22d5d0 modifies function declarations without parameters from ()
reynaldo
parents: 18885
diff changeset
353 static float get_delay(void) {
28882
15f93fd5cd48 Reuse libavutil fifo code instead of reimplementing it over and over.
reimar
parents: 28823
diff changeset
354 int buffered = av_fifo_size(buffer); // could be less
15630
7c67124786a0 Fix latency calculation and buffersize setting.
reimar
parents: 15605
diff changeset
355 float in_jack = jack_latency;
16104
fc2459a18bf3 improved audio delay estimation, supposed to help make the video smoother
reimar
parents: 15868
diff changeset
356 if (estimate && callback_interval > 0) {
fc2459a18bf3 improved audio delay estimation, supposed to help make the video smoother
reimar
parents: 15868
diff changeset
357 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
358 in_jack += callback_interval - elapsed;
fc2459a18bf3 improved audio delay estimation, supposed to help make the video smoother
reimar
parents: 15868
diff changeset
359 if (in_jack < 0) in_jack = 0;
fc2459a18bf3 improved audio delay estimation, supposed to help make the video smoother
reimar
parents: 15868
diff changeset
360 }
15605
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
361 return (float)buffered / (float)ao_data.bps + in_jack;
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
362 }
904787c80946 New ao_jack without bio2jack dependency.
reimar
parents: 15009
diff changeset
363