RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

jack: Drop support for old (2012) JACK versions

This commit is contained in:
Diego Biurrun 2017-03-21 12:10:40 +01:00
parent 1bd986ed4b
commit 5a969f64b9
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

@ -1638,7 +1638,6 @@ SYSTEM_FUNCS="
gmtime_r
inet_aton
isatty
jack_port_get_latency_range
LoadLibrary
localtime_r
mach_absolute_time
@ -4835,10 +4834,8 @@ check_header soundcard.h
enabled_any alsa_indev alsa_outdev &&
check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound
if enabled libjack; then
check_pkg_config libjack jack jack/jack.h jack_port_get_latency_range ||
require_pkg_config libjack jack jack/jack.h jack_client_open
fi
enabled libjack &&
require_pkg_config libjack jack jack/jack.h jack_port_get_latency_range
enabled_any sndio_indev sndio_outdev && check_lib sndio sndio.h sio_open -lsndio

4
libavdevice/jack.c
View File

@ -93,13 +93,9 @@ static int process_callback(jack_nframes_t nframes, void *arg)
/* Copy and interleave audio data from the JACK buffer into the packet */
for (i = 0; i < self->nports; i++) {
#if HAVE_JACK_PORT_GET_LATENCY_RANGE
jack_latency_range_t range;
jack_port_get_latency_range(self->ports[i], JackCaptureLatency, &range);
latency += range.max;
#else
latency += jack_port_get_total_latency(self->client, self->ports[i]);
#endif
buffer = jack_port_get_buffer(self->ports[i], self->buffer_size);
for (j = 0; j < self->buffer_size; j++)
pkt_data[j * self->nports + i] = buffer[j];