diff options
| author | Diego Biurrun <diego@biurrun.de> | 2017-03-21 12:10:40 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2017-03-28 09:11:00 +0200 |
| commit | 5a969f64b9cf40bad923c73b66c3031b0018e848 (patch) | |
| tree | a04f86183a5c12b76c54851fadb634f86c7a8173 | |
| parent | 1bd986ed4b0e95ded368a8eeb5c044853c090f9b (diff) | |
| download | ffmpeg-streaming-5a969f64b9cf40bad923c73b66c3031b0018e848.zip ffmpeg-streaming-5a969f64b9cf40bad923c73b66c3031b0018e848.tar.gz | |
jack: Drop support for old (2012) JACK versions
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | libavdevice/jack.c | 4 |
2 files changed, 2 insertions, 9 deletions
@@ -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 diff --git a/libavdevice/jack.c b/libavdevice/jack.c index 0b4deee..c31c4ce 100644 --- a/libavdevice/jack.c +++ b/libavdevice/jack.c @@ -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]; |
