From ce6616f3986c828e97281d0d2783f320eb0b244f Mon Sep 17 00:00:00 2001 From: James Ball Date: Sat, 22 May 2021 18:42:30 +0100 Subject: [PATCH 1/2] Implement highly experimental frequency detection --- src/main/java/sh/ball/audio/AudioPlayer.java | 82 ++- .../java/sh/ball/audio/FrequencyAnalyser.java | 105 ++++ .../java/sh/ball/audio/FrequencyListener.java | 6 + src/main/java/sh/ball/audio/Renderer.java | 2 + .../java/sh/ball/audio/fft/FFTFactory.java | 279 ++++++++++ src/main/java/sh/ball/audio/fft/LICENSE.txt | 502 ++++++++++++++++++ .../java/sh/ball/audio/fft/Transform.java | 60 +++ src/main/java/sh/ball/gui/Controller.java | 10 +- 8 files changed, 1037 insertions(+), 9 deletions(-) create mode 100644 src/main/java/sh/ball/audio/FrequencyAnalyser.java create mode 100644 src/main/java/sh/ball/audio/FrequencyListener.java create mode 100644 src/main/java/sh/ball/audio/fft/FFTFactory.java create mode 100644 src/main/java/sh/ball/audio/fft/LICENSE.txt create mode 100644 src/main/java/sh/ball/audio/fft/Transform.java diff --git a/src/main/java/sh/ball/audio/AudioPlayer.java b/src/main/java/sh/ball/audio/AudioPlayer.java index c83af1bd..6b51be61 100644 --- a/src/main/java/sh/ball/audio/AudioPlayer.java +++ b/src/main/java/sh/ball/audio/AudioPlayer.java @@ -14,6 +14,7 @@ import xt.audio.Structs.XtMix; import xt.audio.Structs.XtStreamParams; import java.io.*; +import java.util.ArrayList; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ArrayBlockingQueue; @@ -25,6 +26,8 @@ import sh.ball.shapes.Vector2; import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioInputStream; import java.util.List; +import java.util.concurrent.Semaphore; +import java.util.concurrent.locks.ReentrantLock; public class AudioPlayer implements Renderer, AudioInputStream> { @@ -37,6 +40,8 @@ public class AudioPlayer implements Renderer, AudioInputStream> { private final XtFormat format; private final BlockingQueue> frameQueue = new ArrayBlockingQueue<>(BUFFER_SIZE); private final Map effects = new HashMap<>(); + private final ReentrantLock lock = new ReentrantLock(); + private final List listeners = new ArrayList<>(); private ByteArrayOutputStream outputStream; private boolean recording = false; @@ -58,6 +63,7 @@ public class AudioPlayer implements Renderer, AudioInputStream> { private int render(XtStream stream, XtBuffer buffer, Object user) throws InterruptedException { XtSafeBuffer safe = XtSafeBuffer.get(stream); safe.lock(buffer); + lock.lock(); float[] output = (float[]) safe.getOutput(); for (int f = 0; f < buffer.frames; f++) { @@ -73,9 +79,7 @@ public class AudioPlayer implements Renderer, AudioInputStream> { output[f * format.channels.outputs] = leftChannel; output[f * format.channels.outputs + 1] = rightChannel; - if (recording) { - writeVector(leftChannel, rightChannel); - } + writeChannels(leftChannel, rightChannel); audioFramesDrawn++; @@ -90,17 +94,33 @@ public class AudioPlayer implements Renderer, AudioInputStream> { } } safe.unlock(buffer); + lock.unlock(); return 0; } - private void writeVector(float leftChannel, float rightChannel) { + private void writeChannels(float leftChannel, float rightChannel) { int left = (int)(leftChannel * Short.MAX_VALUE); int right = (int)(rightChannel * Short.MAX_VALUE); - outputStream.write((byte) left); - outputStream.write((byte)(left >> 8)); - outputStream.write((byte) right); - outputStream.write((byte)(right >> 8)); + byte b0 = (byte) left; + byte b1 = (byte)(left >> 8); + byte b2 = (byte) right; + byte b3 = (byte)(right >> 8); + + if (recording) { + outputStream.write(b0); + outputStream.write(b1); + outputStream.write(b2); + outputStream.write(b3); + } + + for (Listener listener : listeners) { + listener.write(b0); + listener.write(b1); + listener.write(b2); + listener.write(b3); + listener.notifyIfFull(); + } framesRecorded++; } @@ -194,6 +214,24 @@ public class AudioPlayer implements Renderer, AudioInputStream> { effects.remove(identifier); } + @Override + public void read(byte[] buffer) throws InterruptedException { + Listener listener = new Listener(buffer); + try { + lock.lock(); + listeners.add(listener); + } finally { + lock.unlock(); + } + listener.waitUntilFull(); + try { + lock.lock(); + listeners.remove(listener); + } finally { + lock.unlock(); + } + } + @Override public void startRecord() { outputStream = new ByteArrayOutputStream(); @@ -211,4 +249,32 @@ public class AudioPlayer implements Renderer, AudioInputStream> { return new AudioInputStream(new ByteArrayInputStream(input), audioFormat, framesRecorded); } + + private static class Listener { + private final byte[] buffer; + private final Semaphore sema; + + private int offset; + + private Listener(byte[] buffer) { + this.buffer = buffer; + this.sema = new Semaphore(0); + } + + private void waitUntilFull() throws InterruptedException { + sema.acquire(); + } + + private void notifyIfFull() { + if (offset >= buffer.length) { + sema.release(); + } + } + + private void write(byte b) { + if (offset < buffer.length) { + buffer[offset++] = b; + } + } + } } diff --git a/src/main/java/sh/ball/audio/FrequencyAnalyser.java b/src/main/java/sh/ball/audio/FrequencyAnalyser.java new file mode 100644 index 00000000..6681fb4c --- /dev/null +++ b/src/main/java/sh/ball/audio/FrequencyAnalyser.java @@ -0,0 +1,105 @@ +package sh.ball.audio; + +import sh.ball.audio.fft.FFTFactory; +import sh.ball.audio.fft.Transform; + +import java.util.ArrayList; +import java.util.List; + +public class FrequencyAnalyser implements Runnable { + + private static final float NORMALIZATION_FACTOR_2_BYTES = Short.MAX_VALUE + 1.0f; + + private final Renderer renderer; + private final List listeners = new ArrayList<>(); + private final int frameSize; + private final int sampleRate; + + public FrequencyAnalyser(Renderer renderer, int frameSize, int sampleRate) { + this.renderer = renderer; + this.frameSize = frameSize; + this.sampleRate = sampleRate; + } + + public void addListener(FrequencyListener listener) { + listeners.add(listener); + } + + private void notifyListeners(double frequency) { + for (FrequencyListener listener : listeners) { + listener.updateFrequency(frequency); + } + } + + // Adapted from https://stackoverflow.com/questions/53997426/java-how-to-get-current-frequency-of-audio-input + @Override + public void run() { + final byte[] buf = new byte[2 << 16]; // <--- increase this for higher frequency resolution + final int numberOfSamples = (buf.length / 2) / frameSize; + Transform fft = FFTFactory.getInstance().create(numberOfSamples); + + int frequencyBin = sampleRate / (numberOfSamples / 2); + + while (true) { + try { + renderer.read(buf); + } catch (InterruptedException e) { + e.printStackTrace(); + } + // the stream represents each sample as two bytes -> decode + final float[] samples = decode(buf); + final float[][] transformed = fft.transform(samples); + final float[] realPart = transformed[0]; + final float[] imaginaryPart = transformed[1]; + final double[] magnitudes = toMagnitudes(realPart, imaginaryPart); + + int maxIndex = 0; + double max = Double.NEGATIVE_INFINITY; + for (int i = 1; i < magnitudes.length / 2; i++) { + if (i * frequencyBin < 20 || i * frequencyBin > 20000) { + continue; + } + if (magnitudes[i] > max) { + maxIndex = i; + max = magnitudes[i]; + } + } + + System.out.println((maxIndex + 1) * frequencyBin * 1.05); + } + } + + private float[] decode(final byte[] buf) { + final float[] fbuf = new float[(buf.length / 2) / frameSize]; + int byteNum = 0; + int i = 0; + for (int pos = 0; pos < buf.length; pos += frameSize) { + if (byteNum < 2) { + int sample = byteToIntLittleEndian(buf, pos, frameSize); + // normalize to [0,1] (not strictly necessary, but makes things easier) + fbuf[i] = sample / NORMALIZATION_FACTOR_2_BYTES; + i++; + } + byteNum++; + byteNum %= 4; + } + return fbuf; + } + + private double[] toMagnitudes(final float[] realPart, final float[] imaginaryPart) { + final double[] powers = new double[realPart.length / 2]; + for (int i = 0; i < powers.length; i++) { + powers[i] = Math.sqrt(realPart[i] * realPart[i] + imaginaryPart[i] * imaginaryPart[i]); + } + return powers; + } + + private static int byteToIntLittleEndian(final byte[] buf, final int offset, final int bytesPerSample) { + int sample = 0; + for (int byteIndex = 0; byteIndex < bytesPerSample; byteIndex++) { + final int aByte = buf[offset + byteIndex] & 0xff; + sample += aByte << 8 * (byteIndex); + } + return sample; + } +} diff --git a/src/main/java/sh/ball/audio/FrequencyListener.java b/src/main/java/sh/ball/audio/FrequencyListener.java new file mode 100644 index 00000000..bf6519e6 --- /dev/null +++ b/src/main/java/sh/ball/audio/FrequencyListener.java @@ -0,0 +1,6 @@ +package sh.ball.audio; + +public interface FrequencyListener { + + void updateFrequency(double frequency); +} diff --git a/src/main/java/sh/ball/audio/Renderer.java b/src/main/java/sh/ball/audio/Renderer.java index 124eb734..669b95a2 100644 --- a/src/main/java/sh/ball/audio/Renderer.java +++ b/src/main/java/sh/ball/audio/Renderer.java @@ -14,6 +14,8 @@ public interface Renderer extends Runnable { void removeEffect(Object identifier); + void read(byte[] buffer) throws InterruptedException; + void startRecord(); T stopRecord(); diff --git a/src/main/java/sh/ball/audio/fft/FFTFactory.java b/src/main/java/sh/ball/audio/fft/FFTFactory.java new file mode 100644 index 00000000..f7d271ce --- /dev/null +++ b/src/main/java/sh/ball/audio/fft/FFTFactory.java @@ -0,0 +1,279 @@ +/* + * ================================================= + * Copyright 2011 tagtraum industries incorporated + * All rights reserved. + * ================================================= + */ + +// FROM: https://github.com/hendriks73/jipes/blob/master/src/main/java/com/tagtraum/jipes/math/FFTFactory.java +// LICENSE: https://github.com/hendriks73/jipes/blob/master/LICENSE.txt +// GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 + +package sh.ball.audio.fft; + +/** + *

Factory for FFTransforms. Using the factory allows for sliding-in a faster, perhaps + * native implementation (like it's done in beaTunes). + *

+ *

In order to use a factory other than the default factory, you need to specify + * its classname with the system property com.tagtraum.jipes.math.FFTFactory. + * I.e. + *

-Dcom.tagtraum.jipes.math.FFTFactory=YOUR.CLASSNAME.HERE + *

+ * + * @author Hendrik Schreiber + */ +public abstract class FFTFactory { + + public static final String FACTORYCLASS_PROPERTY_NAME = FFTFactory.class.getName(); + private static FFTFactory instance; + + protected FFTFactory() { + } + + /** + * Creates a factory for FFT Transform objects. + * + * @return factory instance + */ + public synchronized static FFTFactory getInstance() { + if (instance == null) { + final String factoryClassname = System.getProperty(FACTORYCLASS_PROPERTY_NAME); + if (factoryClassname != null) { + try { + instance = (FFTFactory) Class.forName(factoryClassname, true, Thread.currentThread().getContextClassLoader()).newInstance(); + } catch (Exception e) { + e.printStackTrace(); + } + } + if (instance == null) { + // fall back to built-in factory + instance = new JavaFFTFactory(); + } + } + return instance; + } + + /** + * Creates an instance of the fast Fourier transform (FFT). + * By specifying the number of samples implementations can pre-create lookup tables to speed + * up the actual transform. + * + * @param numberOfSamples number of samples the FFT instance should be able to process + * @return FFT instance + */ + public abstract Transform create(int numberOfSamples); + + /** + * Default implementation for a Java FFT factory. + */ + private static class JavaFFTFactory extends FFTFactory { + + private JavaFFT last; + + @Override + public synchronized Transform create(final int numberOfSamples) { + if (last != null && last.numberOfSamples == numberOfSamples) return last; + last = new JavaFFT(numberOfSamples); + return last; + } + } + + /** + * Default implementation for a Java FFT. + */ + private static class JavaFFT implements Transform { + + private static final int MAX_FAST_BITS = 16; + private static final int[][] FFT_BIT_TABLE = new int[MAX_FAST_BITS][]; + private final int numberOfSamples; + private final int[] reverseIndices; + private float[] frequencies; + + static { + int len = 2; + for (int b = 1; b <= MAX_FAST_BITS; b++) { + FFT_BIT_TABLE[b - 1] = new int[len]; + for (int i = 0; i < len; i++) { + FFT_BIT_TABLE[b - 1][i] = reverseBits(i, b); + } + len <<= 1; + } + } + + private JavaFFT(final int numberOfSamples) { + if (!isPowerOfTwo(numberOfSamples)) throw new IllegalArgumentException("N is not a power of 2"); + if (numberOfSamples <=0) throw new IllegalArgumentException("N must be greater than 0"); + this.numberOfSamples = numberOfSamples; + final int numberOfBits = getNumberOfNeededBits(numberOfSamples); + this.reverseIndices = new int[numberOfSamples]; + for (int i = 0; i < numberOfSamples; i++) { + final int j = fastReverseBits(i, numberOfBits); + this.reverseIndices[i] = j; + } + this.frequencies = new float[numberOfSamples]; + for (int index=0; index>= 1; + } + return rev; + } + + private static int fastReverseBits(final int index, final int numberOfBits) { + if (numberOfBits <= MAX_FAST_BITS) + return FFT_BIT_TABLE[numberOfBits - 1][index]; + else + return reverseBits(index, numberOfBits); + } + + private static boolean isPowerOfTwo(final int number) { + return (number & (number - 1)) == 0; + } + + @Override + public boolean equals(final Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + final JavaFFT javaFFT = (JavaFFT) o; + if (numberOfSamples != javaFFT.numberOfSamples) return false; + return true; + } + + @Override + public int hashCode() { + return numberOfSamples; + } + + @Override + public String toString() { + return "JavaFFT{" + + "N=" + numberOfSamples + + '}'; + } + } + + +} diff --git a/src/main/java/sh/ball/audio/fft/LICENSE.txt b/src/main/java/sh/ball/audio/fft/LICENSE.txt new file mode 100644 index 00000000..f166cc57 --- /dev/null +++ b/src/main/java/sh/ball/audio/fft/LICENSE.txt @@ -0,0 +1,502 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! \ No newline at end of file diff --git a/src/main/java/sh/ball/audio/fft/Transform.java b/src/main/java/sh/ball/audio/fft/Transform.java new file mode 100644 index 00000000..e5b5ba4b --- /dev/null +++ b/src/main/java/sh/ball/audio/fft/Transform.java @@ -0,0 +1,60 @@ +/* + * ================================================= + * Copyright 2011 tagtraum industries incorporated + * All rights reserved. + * ================================================= + */ + +// FROM: https://github.com/hendriks73/jipes/blob/master/src/main/java/com/tagtraum/jipes/math/Transform.java +// LICENSE: https://github.com/hendriks73/jipes/blob/master/LICENSE.txt +// GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 + +package sh.ball.audio.fft; + +/** + * Transform that can be obtained for example through a {@link FFTFactory}. + *

+ * The forward transform is typically from the time domain to the frequency domain, + * the inverse the other way around. Note that not all methods of this interface are necessarily implemented + * by its implementing classes. Unsupported methods throw {@link UnsupportedOperationException}s. + *

+ * Date: 1/15/11 + * Time: 8:03 PM + * + * @author Hendrik Schreiber + */ +public interface Transform { + + /** + * Performs transform on real values. + * + * @param real input array of real numbers + * @return array with the real and the imaginary part of the transform, the third float array contains + * the normalized frequencies, i.e. 1.0 is equal to the sample rate of the input + * @throws UnsupportedOperationException should the implementation not support this operation + */ + public float[][] transform(float[] real) throws UnsupportedOperationException; + + /** + * Performs a complex transform. + * + * @param real input array of floats + * @param imaginary input array of floats + * @return array with the real and the imaginary part of the transform, the third float array contains + * the normalized frequencies, i.e. 1.0 is equal to the sample rate of the input + * @throws UnsupportedOperationException should the implementation not support this operation + */ + public float[][] transform(float[] real, float[] imaginary) throws UnsupportedOperationException; + + + /** + * Performs an inverse transform. + * + * @param real input array of floats + * @param imaginary input array of floats + * @return array with the real and the imaginary part of the transform + * @throws UnsupportedOperationException should the implementation not support this operation + */ + public float[][] inverseTransform(float[] real, float[] imaginary) throws UnsupportedOperationException; + +} \ No newline at end of file diff --git a/src/main/java/sh/ball/gui/Controller.java b/src/main/java/sh/ball/gui/Controller.java index c145d3c1..797d9b6d 100644 --- a/src/main/java/sh/ball/gui/Controller.java +++ b/src/main/java/sh/ball/gui/Controller.java @@ -1,6 +1,8 @@ package sh.ball.gui; import javafx.scene.control.*; +import sh.ball.audio.FrequencyAnalyser; +import sh.ball.audio.FrequencyListener; import sh.ball.audio.Renderer; import sh.ball.audio.effect.Effect; import sh.ball.audio.effect.EffectType; @@ -42,7 +44,7 @@ import sh.ball.parser.ParserFactory; import sh.ball.shapes.Shape; import sh.ball.shapes.Vector2; -public class Controller implements Initializable { +public class Controller implements Initializable, FrequencyListener { private static final int SAMPLE_RATE = 192000; private static final InputStream DEFAULT_OBJ = Controller.class.getResourceAsStream("/models/cube.obj"); @@ -220,6 +222,7 @@ public class Controller implements Initializable { executor.submit(producer); new Thread(renderer).start(); + new Thread(new FrequencyAnalyser<>(renderer, 2, SAMPLE_RATE)).start(); } private void toggleRecord() { @@ -338,4 +341,9 @@ public class Controller implements Initializable { protected void setObjRotate(Vector3 vector) { producer.setFrameSettings(ObjSettingsFactory.rotation(vector)); } + + @Override + public void updateFrequency(double frequency) { + + } } From 6e4f58d1d399d48bba7d587ecf6579afc606c72f Mon Sep 17 00:00:00 2001 From: James Ball Date: Sun, 23 May 2021 13:01:12 +0100 Subject: [PATCH 2/2] Replace old FFT classes with more complete one and implement frequency analyser --- pom.xml | 2 +- .../java/sh/ball/audio/FrequencyAnalyser.java | 68 +- .../java/sh/ball/audio/FrequencyListener.java | 2 +- src/main/java/sh/ball/audio/fft/FFT.java | 736 ++++++++++++++++++ .../java/sh/ball/audio/fft/FFTFactory.java | 279 ------- src/main/java/sh/ball/audio/fft/LICENSE.txt | 502 ------------ .../java/sh/ball/audio/fft/Transform.java | 60 -- src/main/java/sh/ball/gui/Controller.java | 13 +- src/main/resources/fxml/osci-render.fxml | 15 +- 9 files changed, 794 insertions(+), 883 deletions(-) create mode 100644 src/main/java/sh/ball/audio/fft/FFT.java delete mode 100644 src/main/java/sh/ball/audio/fft/FFTFactory.java delete mode 100644 src/main/java/sh/ball/audio/fft/LICENSE.txt delete mode 100644 src/main/java/sh/ball/audio/fft/Transform.java diff --git a/pom.xml b/pom.xml index 580dcf2c..c03a5dd9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ sh.ball osci-render - 1.4.1 + 1.5.0 osci-render diff --git a/src/main/java/sh/ball/audio/FrequencyAnalyser.java b/src/main/java/sh/ball/audio/FrequencyAnalyser.java index 6681fb4c..4e40ddb1 100644 --- a/src/main/java/sh/ball/audio/FrequencyAnalyser.java +++ b/src/main/java/sh/ball/audio/FrequencyAnalyser.java @@ -1,7 +1,6 @@ package sh.ball.audio; -import sh.ball.audio.fft.FFTFactory; -import sh.ball.audio.fft.Transform; +import sh.ball.audio.fft.FFT; import java.util.ArrayList; import java.util.List; @@ -25,20 +24,16 @@ public class FrequencyAnalyser implements Runnable { listeners.add(listener); } - private void notifyListeners(double frequency) { + private void notifyListeners(double leftFrequency, double rightFrequency) { for (FrequencyListener listener : listeners) { - listener.updateFrequency(frequency); + listener.updateFrequency(leftFrequency, rightFrequency); } } // Adapted from https://stackoverflow.com/questions/53997426/java-how-to-get-current-frequency-of-audio-input @Override public void run() { - final byte[] buf = new byte[2 << 16]; // <--- increase this for higher frequency resolution - final int numberOfSamples = (buf.length / 2) / frameSize; - Transform fft = FFTFactory.getInstance().create(numberOfSamples); - - int frequencyBin = sampleRate / (numberOfSamples / 2); + byte[] buf = new byte[2 << 18]; // <--- increase this for higher frequency resolution while (true) { try { @@ -46,39 +41,52 @@ public class FrequencyAnalyser implements Runnable { } catch (InterruptedException e) { e.printStackTrace(); } - // the stream represents each sample as two bytes -> decode - final float[] samples = decode(buf); - final float[][] transformed = fft.transform(samples); - final float[] realPart = transformed[0]; - final float[] imaginaryPart = transformed[1]; - final double[] magnitudes = toMagnitudes(realPart, imaginaryPart); + double[] leftSamples = decode(buf, true); + double[] rightSamples = decode(buf, false); - int maxIndex = 0; - double max = Double.NEGATIVE_INFINITY; - for (int i = 1; i < magnitudes.length / 2; i++) { - if (i * frequencyBin < 20 || i * frequencyBin > 20000) { + FFT leftFft = new FFT(leftSamples, null, false, true); + FFT rightFft = new FFT(rightSamples, null, false, true); + + double[] leftMags = leftFft.getMagnitudeSpectrum(); + double[] rightMags = rightFft.getMagnitudeSpectrum(); + double[] bins = leftFft.getBinLabels(sampleRate); + + int maxLeftIndex = 0; + double maxLeft = Double.NEGATIVE_INFINITY; + int maxRightIndex = 0; + double maxRight = Double.NEGATIVE_INFINITY; + for (int i = 1; i < leftMags.length; i++) { + if (bins[i] < 20 || bins[i] > 20000) { continue; } - if (magnitudes[i] > max) { - maxIndex = i; - max = magnitudes[i]; + if (leftMags[i] > maxLeft) { + maxLeftIndex = i; + maxLeft = leftMags[i]; + } + if (rightMags[i] > maxRight) { + maxRightIndex = i; + maxRight = rightMags[i]; } } - System.out.println((maxIndex + 1) * frequencyBin * 1.05); + notifyListeners(bins[maxLeftIndex], bins[maxRightIndex]); } } - private float[] decode(final byte[] buf) { - final float[] fbuf = new float[(buf.length / 2) / frameSize]; + private double[] decode(final byte[] buf, boolean decodeLeft) { + final double[] fbuf = new double[(buf.length / 2) / frameSize]; int byteNum = 0; int i = 0; for (int pos = 0; pos < buf.length; pos += frameSize) { - if (byteNum < 2) { - int sample = byteToIntLittleEndian(buf, pos, frameSize); - // normalize to [0,1] (not strictly necessary, but makes things easier) - fbuf[i] = sample / NORMALIZATION_FACTOR_2_BYTES; - i++; + int sample = byteToIntLittleEndian(buf, pos, frameSize); + // normalize to [0,1] (not strictly necessary, but makes things easier) + double normalSample = sample / NORMALIZATION_FACTOR_2_BYTES; + if (decodeLeft) { + if (byteNum < 2) { + fbuf[i++] = normalSample; + } + } else if (byteNum >= 2) { + fbuf[i++] = normalSample; } byteNum++; byteNum %= 4; diff --git a/src/main/java/sh/ball/audio/FrequencyListener.java b/src/main/java/sh/ball/audio/FrequencyListener.java index bf6519e6..a850e134 100644 --- a/src/main/java/sh/ball/audio/FrequencyListener.java +++ b/src/main/java/sh/ball/audio/FrequencyListener.java @@ -2,5 +2,5 @@ package sh.ball.audio; public interface FrequencyListener { - void updateFrequency(double frequency); + void updateFrequency(double leftFrequency, double rightFrequency); } diff --git a/src/main/java/sh/ball/audio/fft/FFT.java b/src/main/java/sh/ball/audio/fft/FFT.java new file mode 100644 index 00000000..a780f5eb --- /dev/null +++ b/src/main/java/sh/ball/audio/fft/FFT.java @@ -0,0 +1,736 @@ +/* + * @(#)FFT.java 1.0 April 5, 2005. + * + * Cory McKay + * McGill Univarsity + * + * https://sourceforge.net/p/jaudio/svn/2/tree/jAudio%201.0/src/jAudioFeatureExtractor/jAudioTools/FFT.java + * + * GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. + */ + +package sh.ball.audio.fft; + + +/** + * This class performs a complex to complex Fast Fourier Transform. Forward and inverse + * transforms may both be performed. The transforms may be performed with or without + * the application of a Hanning window. + * + *

The FFT is performed by this class' constructor. The real and imaginary results + * are both stored, and the magnitude spectrum, power spectrum and phase angles may + * also be accessed (along with appropriate frequency bin labels for the magnitude + * and power spectra). + * + * @author Cory McKay + */ +public class FFT +{ + /* FIELDS ******************************************************************/ + + + // The results of the FFT. + private double[] real_output; + private double[] imaginary_output; + + // The phase angles + private double[] output_angle; + + // Magnitude and power spectra + private double[] output_magnitude; + private double[] output_power; + + + /* CONSTRUCTOR *************************************************************/ + + + /** + * Performs the Fourier transform and stores the real and imaginary results. + * Input signals are zero-padded if they do not have a length equal to a + * power of 2. + * + * @param real_input The real part of the signal to be transformed. + * @param imaginary_input The imaginary part of the signal to be. + * transformed. This may be null if the signal + * is entirely real. + * @param inverse_transform A value of false implies that a forward + * transform is to be applied, and a value of + * true means that an inverse transform is tob + * be applied. + * @param use_hanning_window A value of true means that a Hanning window + * will be applied to the real_input. A value + * of valse will result in the application of + * a Hanning window. + * @throws Exception Throws an exception if the real and imaginary + * inputs are of different sizes or if less than + * three input samples are provided. + */ + public FFT( double[] real_input, + double[] imaginary_input, + boolean inverse_transform, + boolean use_hanning_window ) { + // Throw an exception if non-matching input signals are provided + if (imaginary_input != null) + if (real_input.length != imaginary_input.length) + throw new RuntimeException("Imaginary and real inputs are of different sizes."); + + // Throw an exception if less than three samples are provided + if (real_input.length < 3) + throw new RuntimeException( "Only " + real_input.length + " samples provided.\n" + + "At least three are needed." ); + + // Verify that the input size has a number of samples that is a + // power of 2. If not, then increase the size of the array using + // zero-padding. Also creates a zero filled imaginary component + // of the input if none was specified. + int valid_size = ensureIsPowerOfN(real_input.length, 2); + if (valid_size != real_input.length) + { + double[] temp = new double[valid_size]; + for (int i = 0; i < real_input.length; i++) + temp[i] = real_input[i]; + for (int i = real_input.length; i < valid_size; i++) + temp[i] = 0.0; + real_input = temp; + + if (imaginary_input == null) + { + imaginary_input = new double[valid_size]; + for (int i = 0; i < imaginary_input.length; i++) + imaginary_input[i] = 0.0; + } + else + { + temp = new double[valid_size]; + for (int i = 0; i < imaginary_input.length; i++) + temp[i] = imaginary_input[i]; + for (int i = imaginary_input.length; i < valid_size; i++) + temp[i] = 0.0; + imaginary_input = temp; + } + } + else if (imaginary_input == null) + { + imaginary_input = new double[valid_size]; + for (int i = 0; i < imaginary_input.length; i++) + imaginary_input[i] = 0.0; + } + + // Instantiate the arrays to hold the output and copy the input + // to them, since the algorithm used here is self-processing + real_output = new double[valid_size]; + System.arraycopy(real_input, 0, real_output, 0, valid_size); + imaginary_output = new double[valid_size]; + System.arraycopy(imaginary_input, 0, imaginary_output, 0, valid_size); + + // Apply a Hanning window to the real values if this option is + // selected + if (use_hanning_window) + { + for (int i = 0; i < real_output.length; i++) + { + double hanning = 0.5 - 0.5 * Math.cos(2 * Math.PI * i / valid_size); + real_output[i] *= hanning; + } + } + + // Determine whether this is a forward or inverse transform + int forward_transform = 1; + if (inverse_transform) + forward_transform = -1; + + // Reorder the input data into reverse binary order + double scale = 1.0; + int j = 0; + for (int i = 0; i < valid_size; ++i) + { + if (j >= i) + { + double tempr = real_output[j] * scale; + double tempi = imaginary_output[j] * scale; + real_output[j] = real_output[i] * scale; + imaginary_output[j] = imaginary_output[i] * scale; + real_output[i] = tempr; + imaginary_output[i] = tempi; + } + int m = valid_size / 2; + while (m >= 1 && j >= m) + { + j -= m; + m /= 2; + } + j += m; + } + + // Perform the spectral recombination stage by stage + int stage = 0; + int max_spectra_for_stage; + int step_size; + for( max_spectra_for_stage = 1, step_size = 2 * max_spectra_for_stage; + max_spectra_for_stage < valid_size; + max_spectra_for_stage = step_size, step_size = 2 * max_spectra_for_stage) + { + double delta_angle = forward_transform * Math.PI / max_spectra_for_stage; + + // Loop once for each individual spectra + for (int spectra_count = 0; spectra_count < max_spectra_for_stage; ++spectra_count) + { + double angle = spectra_count * delta_angle; + double real_correction = Math.cos(angle); + double imag_correction = Math.sin(angle); + + int right = 0; + for (int left = spectra_count; left < valid_size; left += step_size) + { + right = left + max_spectra_for_stage; + double temp_real = real_correction * real_output[right] - + imag_correction * imaginary_output[right]; + double temp_imag = real_correction * imaginary_output[right] + + imag_correction * real_output[right]; + real_output[right] = real_output[left] - temp_real; + imaginary_output[right] = imaginary_output[left] - temp_imag; + real_output[left] += temp_real; + imaginary_output[left] += temp_imag; + } + } + max_spectra_for_stage = step_size; + } + + // Set the angle and magnitude to null originally + output_angle = null; + output_power = null; + output_magnitude = null; + } + + /* PUBLIC METHODS **********************************************************/ + + /** + * Returns the magnitudes spectrum. It only makes sense to call + * this method if this object was instantiated as a forward Fourier + * transform. + * + *

Only the left side of the spectrum is returned, as the folded + * portion of the spectrum is redundant for the purpose of the magnitude + * spectrum. This means that the bins only go up to half of the + * sampling rate. + * + * @return The magnitude of each frequency bin. + */ + public double[] getMagnitudeSpectrum() + { + // Only calculate the magnitudes if they have not yet been calculated + if (output_magnitude == null) + { + int number_unfolded_bins = imaginary_output.length / 2; + output_magnitude = new double[number_unfolded_bins]; + for(int i = 0; i < output_magnitude.length; i++) + output_magnitude[i] = ( Math.sqrt(real_output[i] * real_output[i] + imaginary_output[i] * imaginary_output[i]) ) / real_output.length; + } + + // Return the magnitudes + return output_magnitude; + } + + + /** + * Returns the power spectrum. It only makes sense to call + * this method if this object was instantiated as a forward Fourier + * transform. + * + *

Only the left side of the spectrum is returned, as the folded + * portion of the spectrum is redundant for the purpose of the power + * spectrum. This means that the bins only go up to half of the + * sampling rate. + * + * @return The magnitude of each frequency bin. + */ + public double[] getPowerSpectrum() + { + // Only calculate the powers if they have not yet been calculated + if (output_power == null) + { + int number_unfolded_bins = imaginary_output.length / 2; + output_power = new double[number_unfolded_bins]; + for(int i = 0; i < output_power.length; i++) + output_power[i] = (real_output[i] * real_output[i] + imaginary_output[i] * imaginary_output[i]) / real_output.length; + } + + // Return the power + return output_power; + } + + + /** + * Returns the phase angle for each frequency bin. It only makes sense to + * call this method if this object was instantiated as a forward Fourier + * transform. + * + *

Only the left side of the spectrum is returned, as the folded + * portion of the spectrum is redundant for the purpose of the phase + * angles. This means that the bins only go up to half of the + * sampling rate. + * + * @return The phase angle for each frequency bin in degrees. + */ + public double[] getPhaseAngles() + { + // Only calculate the angles if they have not yet been calculated + if (output_angle == null) + { + int number_unfolded_bins = imaginary_output.length / 2; + output_angle = new double[number_unfolded_bins]; + for(int i = 0; i < output_angle.length; i++) + { + if(imaginary_output[i] == 0.0 && real_output[i] == 0.0) + output_angle[i] = 0.0; + else + output_angle[i] = Math.atan(imaginary_output[i] / real_output[i]) * 180.0 / Math.PI; + + if(real_output[i] < 0.0 && imaginary_output[i] == 0.0) + output_angle[i] = 180.0; + else if(real_output[i] < 0.0 && imaginary_output[i] == -0.0) + output_angle[i] = -180.0; + else if(real_output[i] < 0.0 && imaginary_output[i] > 0.0) + output_angle[i] += 180.0; + else if(real_output[i] < 0.0 && imaginary_output[i] < 0.0) + output_angle[i] += -180.0; + } + } + + // Return the phase angles + return output_angle; + } + + + /** + * Returns the frequency bin labels for each bin referred to by the + * real values, imaginary values, magnitudes and phase angles as + * determined by the given sampling rate. + * + * @param sampling_rate The sampling rate that was used to perform + * the FFT. + * @return The bin labels. + */ + public double[] getBinLabels(double sampling_rate) + { + int number_bins = real_output.length; + double bin_width = sampling_rate / (double) number_bins; + int number_unfolded_bins = imaginary_output.length / 2; + double[] labels = new double[number_unfolded_bins]; + labels[0] = 0.0; + for (int bin = 1; bin < labels.length; bin++) + labels[bin] = bin * bin_width; + return labels; + } + + + /** + * Returns the real values as calculated by the FFT. + * + * @return The real values. + */ + public double[] getRealValues() + { + return real_output; + } + + + /** + * Returns the real values as calculated by the FFT. + * + * @return The real values. + */ + public double[] getImaginaryValues() + { + return imaginary_output; + } + + /* PRIVATE METHODS *********************************************************/ + + /** + * If the given x is a power of the given n, then x is returned. + * If not, then the next value above the given x that is a power + * of n is returned. + * + *

IMPORTANT: Both x and n must be greater than zero. + * + * @param x The value to ensure is a power of n. + * @param n The power to base x's validation on. + */ + private static int ensureIsPowerOfN(int x, int n) + { + double log_value = logBaseN((double) x, (double) n); + int log_int = (int) log_value; + int valid_size = pow(n, log_int); + if (valid_size != x) + valid_size = pow(n, log_int + 1); + return valid_size; + } + + /** + * Returns the logarithm of the specified base of the given number. + * + *

IMPORTANT: Both x and n must be greater than zero. + * + * @param x The value to find the log of. + * @param n The base of the logarithm. + */ + private static double logBaseN(double x, double n) + { + return (Math.log10(x) / Math.log10(n)); + } + + /** + * Returns the given a raised to the power of the given b. + * + *

IMPORTANT: b must be greater than zero. + * + * @param a The base. + * @param b The exponent. + */ + private static int pow(int a, int b) + { + int result = a; + for (int i = 1; i < b; i++) + result *= a; + return result; + } +} \ No newline at end of file diff --git a/src/main/java/sh/ball/audio/fft/FFTFactory.java b/src/main/java/sh/ball/audio/fft/FFTFactory.java deleted file mode 100644 index f7d271ce..00000000 --- a/src/main/java/sh/ball/audio/fft/FFTFactory.java +++ /dev/null @@ -1,279 +0,0 @@ -/* - * ================================================= - * Copyright 2011 tagtraum industries incorporated - * All rights reserved. - * ================================================= - */ - -// FROM: https://github.com/hendriks73/jipes/blob/master/src/main/java/com/tagtraum/jipes/math/FFTFactory.java -// LICENSE: https://github.com/hendriks73/jipes/blob/master/LICENSE.txt -// GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 - -package sh.ball.audio.fft; - -/** - *

Factory for FFTransforms. Using the factory allows for sliding-in a faster, perhaps - * native implementation (like it's done in beaTunes). - *

- *

In order to use a factory other than the default factory, you need to specify - * its classname with the system property com.tagtraum.jipes.math.FFTFactory. - * I.e. - *

-Dcom.tagtraum.jipes.math.FFTFactory=YOUR.CLASSNAME.HERE - *

- * - * @author Hendrik Schreiber - */ -public abstract class FFTFactory { - - public static final String FACTORYCLASS_PROPERTY_NAME = FFTFactory.class.getName(); - private static FFTFactory instance; - - protected FFTFactory() { - } - - /** - * Creates a factory for FFT Transform objects. - * - * @return factory instance - */ - public synchronized static FFTFactory getInstance() { - if (instance == null) { - final String factoryClassname = System.getProperty(FACTORYCLASS_PROPERTY_NAME); - if (factoryClassname != null) { - try { - instance = (FFTFactory) Class.forName(factoryClassname, true, Thread.currentThread().getContextClassLoader()).newInstance(); - } catch (Exception e) { - e.printStackTrace(); - } - } - if (instance == null) { - // fall back to built-in factory - instance = new JavaFFTFactory(); - } - } - return instance; - } - - /** - * Creates an instance of the fast Fourier transform (FFT). - * By specifying the number of samples implementations can pre-create lookup tables to speed - * up the actual transform. - * - * @param numberOfSamples number of samples the FFT instance should be able to process - * @return FFT instance - */ - public abstract Transform create(int numberOfSamples); - - /** - * Default implementation for a Java FFT factory. - */ - private static class JavaFFTFactory extends FFTFactory { - - private JavaFFT last; - - @Override - public synchronized Transform create(final int numberOfSamples) { - if (last != null && last.numberOfSamples == numberOfSamples) return last; - last = new JavaFFT(numberOfSamples); - return last; - } - } - - /** - * Default implementation for a Java FFT. - */ - private static class JavaFFT implements Transform { - - private static final int MAX_FAST_BITS = 16; - private static final int[][] FFT_BIT_TABLE = new int[MAX_FAST_BITS][]; - private final int numberOfSamples; - private final int[] reverseIndices; - private float[] frequencies; - - static { - int len = 2; - for (int b = 1; b <= MAX_FAST_BITS; b++) { - FFT_BIT_TABLE[b - 1] = new int[len]; - for (int i = 0; i < len; i++) { - FFT_BIT_TABLE[b - 1][i] = reverseBits(i, b); - } - len <<= 1; - } - } - - private JavaFFT(final int numberOfSamples) { - if (!isPowerOfTwo(numberOfSamples)) throw new IllegalArgumentException("N is not a power of 2"); - if (numberOfSamples <=0) throw new IllegalArgumentException("N must be greater than 0"); - this.numberOfSamples = numberOfSamples; - final int numberOfBits = getNumberOfNeededBits(numberOfSamples); - this.reverseIndices = new int[numberOfSamples]; - for (int i = 0; i < numberOfSamples; i++) { - final int j = fastReverseBits(i, numberOfBits); - this.reverseIndices[i] = j; - } - this.frequencies = new float[numberOfSamples]; - for (int index=0; index>= 1; - } - return rev; - } - - private static int fastReverseBits(final int index, final int numberOfBits) { - if (numberOfBits <= MAX_FAST_BITS) - return FFT_BIT_TABLE[numberOfBits - 1][index]; - else - return reverseBits(index, numberOfBits); - } - - private static boolean isPowerOfTwo(final int number) { - return (number & (number - 1)) == 0; - } - - @Override - public boolean equals(final Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - final JavaFFT javaFFT = (JavaFFT) o; - if (numberOfSamples != javaFFT.numberOfSamples) return false; - return true; - } - - @Override - public int hashCode() { - return numberOfSamples; - } - - @Override - public String toString() { - return "JavaFFT{" + - "N=" + numberOfSamples + - '}'; - } - } - - -} diff --git a/src/main/java/sh/ball/audio/fft/LICENSE.txt b/src/main/java/sh/ball/audio/fft/LICENSE.txt deleted file mode 100644 index f166cc57..00000000 --- a/src/main/java/sh/ball/audio/fft/LICENSE.txt +++ /dev/null @@ -1,502 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! \ No newline at end of file diff --git a/src/main/java/sh/ball/audio/fft/Transform.java b/src/main/java/sh/ball/audio/fft/Transform.java deleted file mode 100644 index e5b5ba4b..00000000 --- a/src/main/java/sh/ball/audio/fft/Transform.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * ================================================= - * Copyright 2011 tagtraum industries incorporated - * All rights reserved. - * ================================================= - */ - -// FROM: https://github.com/hendriks73/jipes/blob/master/src/main/java/com/tagtraum/jipes/math/Transform.java -// LICENSE: https://github.com/hendriks73/jipes/blob/master/LICENSE.txt -// GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 - -package sh.ball.audio.fft; - -/** - * Transform that can be obtained for example through a {@link FFTFactory}. - *

- * The forward transform is typically from the time domain to the frequency domain, - * the inverse the other way around. Note that not all methods of this interface are necessarily implemented - * by its implementing classes. Unsupported methods throw {@link UnsupportedOperationException}s. - *

- * Date: 1/15/11 - * Time: 8:03 PM - * - * @author Hendrik Schreiber - */ -public interface Transform { - - /** - * Performs transform on real values. - * - * @param real input array of real numbers - * @return array with the real and the imaginary part of the transform, the third float array contains - * the normalized frequencies, i.e. 1.0 is equal to the sample rate of the input - * @throws UnsupportedOperationException should the implementation not support this operation - */ - public float[][] transform(float[] real) throws UnsupportedOperationException; - - /** - * Performs a complex transform. - * - * @param real input array of floats - * @param imaginary input array of floats - * @return array with the real and the imaginary part of the transform, the third float array contains - * the normalized frequencies, i.e. 1.0 is equal to the sample rate of the input - * @throws UnsupportedOperationException should the implementation not support this operation - */ - public float[][] transform(float[] real, float[] imaginary) throws UnsupportedOperationException; - - - /** - * Performs an inverse transform. - * - * @param real input array of floats - * @param imaginary input array of floats - * @return array with the real and the imaginary part of the transform - * @throws UnsupportedOperationException should the implementation not support this operation - */ - public float[][] inverseTransform(float[] real, float[] imaginary) throws UnsupportedOperationException; - -} \ No newline at end of file diff --git a/src/main/java/sh/ball/gui/Controller.java b/src/main/java/sh/ball/gui/Controller.java index 797d9b6d..96a0eb29 100644 --- a/src/main/java/sh/ball/gui/Controller.java +++ b/src/main/java/sh/ball/gui/Controller.java @@ -1,5 +1,6 @@ package sh.ball.gui; +import javafx.application.Platform; import javafx.scene.control.*; import sh.ball.audio.FrequencyAnalyser; import sh.ball.audio.FrequencyListener; @@ -62,6 +63,8 @@ public class Controller implements Initializable, FrequencyListener { private Stage stage; + @FXML + private Label frequencyLabel; @FXML private Button chooseFileButton; @FXML @@ -222,7 +225,9 @@ public class Controller implements Initializable, FrequencyListener { executor.submit(producer); new Thread(renderer).start(); - new Thread(new FrequencyAnalyser<>(renderer, 2, SAMPLE_RATE)).start(); + FrequencyAnalyser, AudioInputStream> analyser = new FrequencyAnalyser<>(renderer, 2, SAMPLE_RATE); + analyser.addListener(this); + new Thread(analyser).start(); } private void toggleRecord() { @@ -343,7 +348,9 @@ public class Controller implements Initializable, FrequencyListener { } @Override - public void updateFrequency(double frequency) { - + public void updateFrequency(double leftFrequency, double rightFrequency) { + Platform.runLater(() -> + frequencyLabel.setText(String.format("L Frequency: %d Hz\nR Frequency: %d Hz", Math.round(leftFrequency), Math.round(rightFrequency))) + ); } } diff --git a/src/main/resources/fxml/osci-render.fxml b/src/main/resources/fxml/osci-render.fxml index 31ca8c08..05b78667 100644 --- a/src/main/resources/fxml/osci-render.fxml +++ b/src/main/resources/fxml/osci-render.fxml @@ -12,7 +12,7 @@ - + @@ -20,8 +20,8 @@ -