[FFmpeg-cvslog] Merge commit '5a969f64b9cf40bad923c73b66c3031b0018e848'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Oct 24 19:17:02 2017 -0300| [6821b693ecced16346e901fab5d700e0b9d1d7d8] | committer: James Almer

Merge commit '5a969f64b9cf40bad923c73b66c3031b0018e848'

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

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6821b693ecced16346e901fab5d700e0b9d1d7d8
---

 configure          | 7 ++-----
 libavdevice/jack.c | 4 ----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index 7a53bc76c7..c86e5788fa 100755
--- a/configure
+++ b/configure
@@ -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 076078ce6d..e35a4a815a 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];


======================================================================

diff --cc configure
index 7a53bc76c7,f1488cf494..c86e5788fa
--- a/configure
+++ b/configure
@@@ -2023,12 -1638,8 +2023,11 @@@ SYSTEM_FUNCS=
      gmtime_r
      inet_aton
      isatty
-     jack_port_get_latency_range
 +    kbhit
      LoadLibrary
      localtime_r
 +    lstat
 +    lzo1x_999_compress
      mach_absolute_time
      MapViewOfFile
      memalign
@@@ -6218,29 -4828,18 +6217,27 @@@ check_type "dshow.h" IBaseFilte
    check_header dev/video/bktr/ioctl_bt848.h; } ||
  check_header dev/ic/bt8xx.h
  
 -check_header sys/soundcard.h
 +if check_struct sys/soundcard.h audio_buf_info bytes; then
 +    enable_safe sys/soundcard.h
 +else
 +    check_cc -D__BSD_VISIBLE -D__XSI_VISIBLE <<EOF && add_cppflags -D__BSD_VISIBLE -D__XSI_VISIBLE && enable_safe sys/soundcard.h
 +    #include <sys/soundcard.h>
 +    audio_buf_info abc;
 +EOF
 +fi
  check_header soundcard.h
  
 -enabled_any alsa_indev alsa_outdev &&
 +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_any sndio_indev sndio_outdev && check_lib sndio sndio.h sio_open -lsndio
 +enabled sndio && check_lib sndio sndio.h sio_open -lsndio
  
  if enabled libcdio; then
 +    use_pkg_config libcdio libcdio_paranoia "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open ||
 +    use_pkg_config libcdio libcdio_paranoia "cdio/paranoia/cdda.h cdio/paranoia/paranoia.h" cdio_cddap_open ||
      check_lib libcdio "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio ||
      check_lib libcdio "cdio/paranoia/cdda.h cdio/paranoia/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio ||
      die "ERROR: No usable libcdio/cdparanoia found"