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

Merge commit '5a969f64b9cf40bad923c73b66c3031b0018e848' 

* commit '5a969f64b9cf40bad923c73b66c3031b0018e848':
  jack: Drop support for old (2012) JACK versions

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-10-24 19:17:02 -03:00
parent 4e9dc52a97 5a969f64b9
commit 6821b693ec
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

@ -2023,7 +2023,6 @@ SYSTEM_FUNCS="
gmtime_r gmtime_r
inet_aton inet_aton
isatty isatty
jack_port_get_latency_range
kbhit kbhit
LoadLibrary LoadLibrary
localtime_r localtime_r
@ -6231,10 +6230,8 @@ check_header soundcard.h
enabled alsa && use_pkg_config alsa alsa "alsa/asoundlib.h" snd_pcm_htimestamp || enabled alsa && use_pkg_config alsa alsa "alsa/asoundlib.h" snd_pcm_htimestamp ||
check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound check_lib alsa alsa/asoundlib.h snd_pcm_htimestamp -lasound
if enabled libjack; then enabled libjack &&
check_pkg_config libjack jack jack/jack.h jack_port_get_latency_range || require_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 sndio && check_lib sndio sndio.h sio_open -lsndio enabled sndio && check_lib sndio sndio.h sio_open -lsndio

4
libavdevice/jack.c
View File

@ -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 */ /* Copy and interleave audio data from the JACK buffer into the packet */
for (i = 0; i < self->nports; i++) { for (i = 0; i < self->nports; i++) {
#if HAVE_JACK_PORT_GET_LATENCY_RANGE
jack_latency_range_t range; jack_latency_range_t range;
jack_port_get_latency_range(self->ports[i], JackCaptureLatency, &range); jack_port_get_latency_range(self->ports[i], JackCaptureLatency, &range);
latency += range.max; 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); buffer = jack_port_get_buffer(self->ports[i], self->buffer_size);
for (j = 0; j < self->buffer_size; j++) for (j = 0; j < self->buffer_size; j++)
pkt_data[j * self->nports + i] = buffer[j]; pkt_data[j * self->nports + i] = buffer[j];