diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-24 19:17:02 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-24 19:17:02 -0300 |
| commit | 6821b693ecced16346e901fab5d700e0b9d1d7d8 (patch) | |
| tree | 4906229bca63ad800cfb64a76392f7c3a5e5b1e6 | |
| parent | 4e9dc52a9703f84a0e996263018745afa1118aa0 (diff) | |
| parent | 5a969f64b9cf40bad923c73b66c3031b0018e848 (diff) | |
| download | ffmpeg-streaming-6821b693ecced16346e901fab5d700e0b9d1d7d8.zip ffmpeg-streaming-6821b693ecced16346e901fab5d700e0b9d1d7d8.tar.gz | |
Merge commit '5a969f64b9cf40bad923c73b66c3031b0018e848'
* commit '5a969f64b9cf40bad923c73b66c3031b0018e848':
jack: Drop support for old (2012) JACK versions
Merged-by: James Almer <jamrial@gmail.com>
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | libavdevice/jack.c | 4 |
2 files changed, 2 insertions, 9 deletions
@@ -2023,7 +2023,6 @@ SYSTEM_FUNCS=" gmtime_r inet_aton isatty - jack_port_get_latency_range kbhit LoadLibrary localtime_r @@ -6231,10 +6230,8 @@ check_header soundcard.h enabled alsa && use_pkg_config alsa alsa "alsa/asoundlib.h" snd_pcm_htimestamp || 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 sndio && check_lib sndio sndio.h sio_open -lsndio diff --git a/libavdevice/jack.c b/libavdevice/jack.c index 076078c..e35a4a8 100644 --- a/libavdevice/jack.c +++ b/libavdevice/jack.c @@ -94,13 +94,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]; |
