From 682e4a12f537d598cb116ba394ceeae1eafc281e Mon Sep 17 00:00:00 2001 From: root Date: Sun, 7 Oct 2012 00:37:20 -0700 Subject: Sun Oct 7 00:37:16 PDT 2012 --- multilib/jack2-multilib/PKGBUILD | 18 ++- .../jack2-multilib/ffado_setbuffsize-jack2.patch | 139 +++++++++++++++++++++ 2 files changed, 153 insertions(+), 4 deletions(-) create mode 100644 multilib/jack2-multilib/ffado_setbuffsize-jack2.patch (limited to 'multilib/jack2-multilib') diff --git a/multilib/jack2-multilib/PKGBUILD b/multilib/jack2-multilib/PKGBUILD index d133aad7a..7a1a5f2b7 100644 --- a/multilib/jack2-multilib/PKGBUILD +++ b/multilib/jack2-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76361 2012-09-16 15:00:40Z schiv $ +# $Id: PKGBUILD 77161 2012-10-06 07:18:34Z schiv $ # Maintainer: Ray Rashif # Contributor: SpepS @@ -15,7 +15,7 @@ pkgname=('jack2-multilib' 'jack2-dbus-multilib') #pkgname= # single build (overrides split) _tarname=jack pkgver=1.9.8 -pkgrel=3 +pkgrel=4 arch=('x86_64') url="http://jackaudio.org/" backup=(etc/security/limits.d/99-audio.conf) @@ -25,10 +25,12 @@ makedepends=('python2' 'doxygen' 'libffado' 'gcc-multilib') source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tgz" '99-audio.conf' - '40-hpet-permissions.rules') + '40-hpet-permissions.rules' + 'ffado_setbuffsize-jack2.patch') md5sums=('1dd2ff054cab79dfc11d134756f27165' 'ae65b7c9ebe0fff6c918ba9d97ae342d' - '471aad533ff56c5d3cbbf65ce32cadef') + '471aad533ff56c5d3cbbf65ce32cadef' + '1502d82fe2276d6f224fff6467a0b6f9') _pyfix() { sed -i 's:bin/env python:bin/env python2:' \ @@ -57,6 +59,14 @@ build() { export LINKFLAGS="$LDFLAGS" + # backport firewire stuff + # - needed for setbuffsize feature in latest stable ffado + # from https://github.com/jackaudio/jack2/commit/96e0251 + ( + cd $_tarname-$pkgver + patch -Np1 -i "$srcdir/ffado_setbuffsize-jack2.patch" + ) + # Some optimisation bug exists for current GCC # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53663 export CFLAGS="${CFLAGS/-O[0-9]/-O0}" diff --git a/multilib/jack2-multilib/ffado_setbuffsize-jack2.patch b/multilib/jack2-multilib/ffado_setbuffsize-jack2.patch new file mode 100644 index 000000000..0c74aad24 --- /dev/null +++ b/multilib/jack2-multilib/ffado_setbuffsize-jack2.patch @@ -0,0 +1,139 @@ +From 96e0251234a29a1360c05d5d7dc98b83436b8183 Mon Sep 17 00:00:00 2001 +From: Adrian Knoth +Date: Sat, 17 Mar 2012 22:36:30 +0100 +Subject: [PATCH] [firewire] Allow FFADO backend to change the buffer size + +This is a port of Jonathan Woithe's patch from jackd1. +With sufficiently recent versions of FFADO, it allows to change +the buffersize at runtime. +--- + linux/firewire/JackFFADODriver.cpp | 65 ++++++++++++++++++++++++++++++++---- + linux/firewire/JackFFADODriver.h | 6 ++++ + 2 files changed, 65 insertions(+), 6 deletions(-) + +diff --git a/linux/firewire/JackFFADODriver.cpp b/linux/firewire/JackFFADODriver.cpp +index b33e1cd..085b78a 100644 +--- a/linux/firewire/JackFFADODriver.cpp ++++ b/linux/firewire/JackFFADODriver.cpp +@@ -3,6 +3,7 @@ + Copyright (C) 2004 Grame + Copyright (C) 2007 Pieter Palmers + Copyright (C) 2009 Devin Anderson ++Copyright (C) 2012 Jonathan Woithe, Adrian Knoth + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +@@ -48,7 +49,10 @@ + namespace Jack + { + ++// Basic functionality requires API version 8. If version 9 or later ++// is present the buffers can be resized at runtime. + #define FIREWIRE_REQUIRED_FFADO_API_VERSION 8 ++#define FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE 9 + + #define jack_get_microseconds GetMicroSeconds + +@@ -281,19 +285,68 @@ + int + JackFFADODriver::SetBufferSize (jack_nframes_t nframes) + { +- printError("Buffer size change requested but not supported!!!"); ++ ffado_driver_t* driver = (ffado_driver_t*)fDriver; ++ signed int chn; ++ ++ // The speed of this function isn't critical; we can afford the ++ // time to check the FFADO API version. ++ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE || ++ ffado_streaming_set_period_size == NULL) { ++ printError("unsupported on current version of FFADO; please upgrade FFADO"); ++ return -1; ++ } + +- /* + driver->period_size = nframes; + driver->period_usecs = + (jack_time_t) floor ((((float) nframes) / driver->sample_rate) + * 1000000.0f); +- */ ++ ++ ++ // Reallocate the null and scratch buffers. ++ driver->nullbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t)); ++ if(driver->nullbuffer == NULL) { ++ printError("could not allocate memory for null buffer"); ++ return -1; ++ } ++ driver->scratchbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t)); ++ if(driver->scratchbuffer == NULL) { ++ printError("could not allocate memory for scratch buffer"); ++ return -1; ++ } ++ ++ // MIDI buffers need reallocating ++ for (chn = 0; chn < driver->capture_nchannels; chn++) { ++ if(driver->capture_channels[chn].stream_type == ffado_stream_type_midi) { ++ // setup the midi buffer ++ if (driver->capture_channels[chn].midi_buffer != NULL) ++ free(driver->capture_channels[chn].midi_buffer); ++ driver->capture_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t)); ++ } ++ } ++ for (chn = 0; chn < driver->playback_nchannels; chn++) { ++ if(driver->playback_channels[chn].stream_type == ffado_stream_type_midi) { ++ if (driver->playback_channels[chn].midi_buffer != NULL) ++ free(driver->playback_channels[chn].midi_buffer); ++ driver->playback_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t)); ++ } ++ } ++ ++ // Notify FFADO of the period size change ++ if (ffado_streaming_set_period_size(driver->dev, nframes) != 0) { ++ printError("could not alter FFADO device period size"); ++ return -1; ++ } ++ ++ // This is needed to give the shadow variables a chance to ++ // properly update to the changes. ++ sleep(1); + + /* tell the engine to change its buffer size */ +- //driver->engine->set_buffer_size (driver->engine, nframes); ++ JackAudioDriver::SetBufferSize(nframes); // Generic change, never fails + +- return -1; // unsupported ++ UpdateLatencies(); ++ ++ return 0; + } + + typedef void (*JackDriverFinishFunction) (jack_driver_t *); +@@ -306,7 +359,7 @@ + + assert(params); + +- if (ffado_get_api_version() != FIREWIRE_REQUIRED_FFADO_API_VERSION) { ++ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION) { + printError("Incompatible libffado version! (%s)", ffado_get_version()); + return NULL; + } +diff --git a/linux/firewire/JackFFADODriver.h b/linux/firewire/JackFFADODriver.h +index cb2a45d..790f4dd 100644 +--- a/linux/firewire/JackFFADODriver.h ++++ b/linux/firewire/JackFFADODriver.h +@@ -82,6 +82,12 @@ class JackFFADODriver : public JackAudioDriver + int Read(); + int Write(); + ++ // BufferSize can be changed ++ bool IsFixedBufferSize() ++ { ++ return false; ++ } ++ + int SetBufferSize(jack_nframes_t nframes); + }; + +-- +1.7.10 + -- cgit v1.2.3-54-g00ecf