summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/java/com/jogamp/common/av/AudioFormat.java179
-rw-r--r--src/java/com/jogamp/common/av/AudioSink.java150
-rw-r--r--src/java/com/jogamp/common/av/AudioSinkFactory.java2
-rw-r--r--src/java/jogamp/common/av/JavaSoundAudioSink.java9
-rw-r--r--src/java/jogamp/common/av/NullAudioSink.java1
5 files changed, 186 insertions, 155 deletions
diff --git a/src/java/com/jogamp/common/av/AudioFormat.java b/src/java/com/jogamp/common/av/AudioFormat.java
new file mode 100644
index 0000000..db23021
--- /dev/null
+++ b/src/java/com/jogamp/common/av/AudioFormat.java
@@ -0,0 +1,179 @@
+/**
+ * Copyright 2013-2023 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list
+ * of conditions and the following disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+package com.jogamp.common.av;
+
+/**
+ * Specifies the linear audio PCM format.
+ */
+public class AudioFormat {
+ /**
+ * @param sampleRate sample rate in Hz (1/s)
+ * @param sampleSize sample size in bits
+ * @param channelCount number of channels
+ * @param signed true if signed number, false for unsigned
+ * @param fixedP true for fixed point value, false for unsigned floating point value with a sampleSize of 32 (float) or 64 (double)
+ * @param planar true for planar data package (each channel in own data buffer), false for packed data channels interleaved in one buffer.
+ * @param littleEndian true for little-endian, false for big endian
+ */
+ public AudioFormat(final int sampleRate, final int sampleSize, final int channelCount, final boolean signed, final boolean fixedP, final boolean planar, final boolean littleEndian) {
+ this.sampleRate = sampleRate;
+ this.sampleSize = sampleSize;
+ this.channelCount = channelCount;
+ this.signed = signed;
+ this.fixedP = fixedP;
+ this.planar = planar;
+ this.littleEndian = littleEndian;
+ if( !fixedP ) {
+ if( sampleSize != 32 && sampleSize != 64 ) {
+ throw new IllegalArgumentException("Floating point: sampleSize "+sampleSize+" bits");
+ }
+ if( !signed ) {
+ throw new IllegalArgumentException("Floating point: unsigned");
+ }
+ }
+ }
+
+ /** Sample rate in Hz (1/s). */
+ public final int sampleRate;
+ /** Sample size in bits. */
+ public final int sampleSize;
+ /** Number of channels. */
+ public final int channelCount;
+ public final boolean signed;
+ /** Fixed or floating point values. Floating point 'float' has {@link #sampleSize} 32, 'double' has {@link #sampleSize} 64. */
+ public final boolean fixedP;
+ /** Planar or packed samples. If planar, each channel has their own data buffer. If packed, channel data is interleaved in one buffer. */
+ public final boolean planar;
+ public final boolean littleEndian;
+
+
+ //
+ // Time <-> Bytes
+ //
+
+ /**
+ * Returns the byte size of the given milliseconds
+ * according to {@link #sampleSize}, {@link #channelCount} and {@link #sampleRate}.
+ * <p>
+ * Time -> Byte Count
+ * </p>
+ */
+ public final int getDurationsByteSize(final int millisecs) {
+ final int bytesPerSample = sampleSize >>> 3; // /8
+ return millisecs * ( channelCount * bytesPerSample * ( sampleRate / 1000 ) );
+ }
+
+ /**
+ * Returns the duration in milliseconds of the given byte count
+ * according to {@link #sampleSize}, {@link #channelCount} and {@link #sampleRate}.
+ * <p>
+ * Byte Count -> Time
+ * </p>
+ */
+ public final int getBytesDuration(final int byteCount) {
+ final int bytesPerSample = sampleSize >>> 3; // /8
+ return byteCount / ( channelCount * bytesPerSample * ( sampleRate / 1000 ) );
+ }
+
+ /**
+ * Returns the duration in milliseconds of the given sample count per frame and channel
+ * according to the {@link #sampleRate}, i.e.
+ * <pre>
+ * ( 1000f * sampleCount ) / sampleRate
+ * </pre>
+ * <p>
+ * Sample Count -> Time
+ * </p>
+ * @param sampleCount sample count per frame and channel
+ */
+ public final float getSamplesDuration(final int sampleCount) {
+ return ( 1000f * sampleCount ) / sampleRate;
+ }
+
+ /**
+ * Returns the rounded frame count of the given milliseconds and frame duration.
+ * <pre>
+ * Math.max( 1, millisecs / frameDuration + 0.5f )
+ * </pre>
+ * <p>
+ * Note: <code>frameDuration</code> can be derived by <i>sample count per frame and channel</i>
+ * via {@link #getSamplesDuration(int)}.
+ * </p>
+ * <p>
+ * Frame Time -> Frame Count
+ * </p>
+ * @param millisecs time in milliseconds
+ * @param frameDuration duration per frame in milliseconds.
+ */
+ public final int getFrameCount(final int millisecs, final float frameDuration) {
+ return Math.max(1, (int) ( millisecs / frameDuration + 0.5f ));
+ }
+
+ /**
+ * Returns the byte size of given sample count
+ * according to the {@link #sampleSize}, i.e.:
+ * <pre>
+ * sampleCount * ( sampleSize / 8 )
+ * </pre>
+ * <p>
+ * Note: To retrieve the byte size for all channels,
+ * you need to pre-multiply <code>sampleCount</code> with {@link #channelCount}.
+ * </p>
+ * <p>
+ * Sample Count -> Byte Count
+ * </p>
+ * @param sampleCount sample count
+ */
+ public final int getSamplesByteCount(final int sampleCount) {
+ return sampleCount * ( sampleSize >>> 3 );
+ }
+
+ /**
+ * Returns the sample count of given byte count
+ * according to the {@link #sampleSize}, i.e.:
+ * <pre>
+ * ( byteCount * 8 ) / sampleSize
+ * </pre>
+ * <p>
+ * Note: If <code>byteCount</code> covers all channels and you request the sample size per channel,
+ * you need to divide the result by <code>sampleCount</code> by {@link #channelCount}.
+ * </p>
+ * <p>
+ * Byte Count -> Sample Count
+ * </p>
+ * @param byteCount number of bytes
+ */
+ public final int getBytesSampleCount(final int byteCount) {
+ return ( byteCount << 3 ) / sampleSize;
+ }
+
+ @Override
+ public String toString() {
+ return "AudioFormat[sampleRate "+sampleRate+", sampleSize "+sampleSize+", channelCount "+channelCount+
+ ", signed "+signed+", fixedP "+fixedP+", "+(planar?"planar":"packed")+", "+(littleEndian?"little":"big")+"-endian]"; }
+} \ No newline at end of file
diff --git a/src/java/com/jogamp/common/av/AudioSink.java b/src/java/com/jogamp/common/av/AudioSink.java
index d41e05b..317b0ac 100644
--- a/src/java/com/jogamp/common/av/AudioSink.java
+++ b/src/java/com/jogamp/common/av/AudioSink.java
@@ -46,156 +46,6 @@ public interface AudioSink {
/** Audio queue limit w/o video in milliseconds. {@value} ms, i.e. 32 frames per 32 ms. See {@link #init(AudioFormat, float, int, int, int)}.*/
public static final int DefaultQueueLimitAudioOnly = 32 * 32; // 1024 ms
- /**
- * Specifies the linear audio PCM format.
- */
- public static class AudioFormat {
- /**
- * @param sampleRate sample rate in Hz (1/s)
- * @param sampleSize sample size in bits
- * @param channelCount number of channels
- * @param signed true if signed number, false for unsigned
- * @param fixedP true for fixed point value, false for unsigned floating point value with a sampleSize of 32 (float) or 64 (double)
- * @param planar true for planar data package (each channel in own data buffer), false for packed data channels interleaved in one buffer.
- * @param littleEndian true for little-endian, false for big endian
- */
- public AudioFormat(final int sampleRate, final int sampleSize, final int channelCount, final boolean signed, final boolean fixedP, final boolean planar, final boolean littleEndian) {
- this.sampleRate = sampleRate;
- this.sampleSize = sampleSize;
- this.channelCount = channelCount;
- this.signed = signed;
- this.fixedP = fixedP;
- this.planar = planar;
- this.littleEndian = littleEndian;
- if( !fixedP ) {
- if( sampleSize != 32 && sampleSize != 64 ) {
- throw new IllegalArgumentException("Floating point: sampleSize "+sampleSize+" bits");
- }
- if( !signed ) {
- throw new IllegalArgumentException("Floating point: unsigned");
- }
- }
- }
-
- /** Sample rate in Hz (1/s). */
- public final int sampleRate;
- /** Sample size in bits. */
- public final int sampleSize;
- /** Number of channels. */
- public final int channelCount;
- public final boolean signed;
- /** Fixed or floating point values. Floating point 'float' has {@link #sampleSize} 32, 'double' has {@link #sampleSize} 64. */
- public final boolean fixedP;
- /** Planar or packed samples. If planar, each channel has their own data buffer. If packed, channel data is interleaved in one buffer. */
- public final boolean planar;
- public final boolean littleEndian;
-
-
- //
- // Time <-> Bytes
- //
-
- /**
- * Returns the byte size of the given milliseconds
- * according to {@link #sampleSize}, {@link #channelCount} and {@link #sampleRate}.
- * <p>
- * Time -> Byte Count
- * </p>
- */
- public final int getDurationsByteSize(final int millisecs) {
- final int bytesPerSample = sampleSize >>> 3; // /8
- return millisecs * ( channelCount * bytesPerSample * ( sampleRate / 1000 ) );
- }
-
- /**
- * Returns the duration in milliseconds of the given byte count
- * according to {@link #sampleSize}, {@link #channelCount} and {@link #sampleRate}.
- * <p>
- * Byte Count -> Time
- * </p>
- */
- public final int getBytesDuration(final int byteCount) {
- final int bytesPerSample = sampleSize >>> 3; // /8
- return byteCount / ( channelCount * bytesPerSample * ( sampleRate / 1000 ) );
- }
-
- /**
- * Returns the duration in milliseconds of the given sample count per frame and channel
- * according to the {@link #sampleRate}, i.e.
- * <pre>
- * ( 1000f * sampleCount ) / sampleRate
- * </pre>
- * <p>
- * Sample Count -> Time
- * </p>
- * @param sampleCount sample count per frame and channel
- */
- public final float getSamplesDuration(final int sampleCount) {
- return ( 1000f * sampleCount ) / sampleRate;
- }
-
- /**
- * Returns the rounded frame count of the given milliseconds and frame duration.
- * <pre>
- * Math.max( 1, millisecs / frameDuration + 0.5f )
- * </pre>
- * <p>
- * Note: <code>frameDuration</code> can be derived by <i>sample count per frame and channel</i>
- * via {@link #getSamplesDuration(int)}.
- * </p>
- * <p>
- * Frame Time -> Frame Count
- * </p>
- * @param millisecs time in milliseconds
- * @param frameDuration duration per frame in milliseconds.
- */
- public final int getFrameCount(final int millisecs, final float frameDuration) {
- return Math.max(1, (int) ( millisecs / frameDuration + 0.5f ));
- }
-
- /**
- * Returns the byte size of given sample count
- * according to the {@link #sampleSize}, i.e.:
- * <pre>
- * sampleCount * ( sampleSize / 8 )
- * </pre>
- * <p>
- * Note: To retrieve the byte size for all channels,
- * you need to pre-multiply <code>sampleCount</code> with {@link #channelCount}.
- * </p>
- * <p>
- * Sample Count -> Byte Count
- * </p>
- * @param sampleCount sample count
- */
- public final int getSamplesByteCount(final int sampleCount) {
- return sampleCount * ( sampleSize >>> 3 );
- }
-
- /**
- * Returns the sample count of given byte count
- * according to the {@link #sampleSize}, i.e.:
- * <pre>
- * ( byteCount * 8 ) / sampleSize
- * </pre>
- * <p>
- * Note: If <code>byteCount</code> covers all channels and you request the sample size per channel,
- * you need to divide the result by <code>sampleCount</code> by {@link #channelCount}.
- * </p>
- * <p>
- * Byte Count -> Sample Count
- * </p>
- * @param byteCount number of bytes
- */
- public final int getBytesSampleCount(final int byteCount) {
- return ( byteCount << 3 ) / sampleSize;
- }
-
- @Override
- public String toString() {
- return "AudioDataFormat[sampleRate "+sampleRate+", sampleSize "+sampleSize+", channelCount "+channelCount+
- ", signed "+signed+", fixedP "+fixedP+", "+(planar?"planar":"packed")+", "+(littleEndian?"little":"big")+"-endian]"; }
- }
/** Default {@link AudioFormat}, [type PCM, sampleRate 44100, sampleSize 16, channelCount 2, signed, fixedP, !planar, littleEndian]. */
public static final AudioFormat DefaultFormat = new AudioFormat(44100, 16, 2, true /* signed */,
true /* fixed point */, false /* planar */, true /* littleEndian */);
diff --git a/src/java/com/jogamp/common/av/AudioSinkFactory.java b/src/java/com/jogamp/common/av/AudioSinkFactory.java
index 70e6229..f4a320b 100644
--- a/src/java/com/jogamp/common/av/AudioSinkFactory.java
+++ b/src/java/com/jogamp/common/av/AudioSinkFactory.java
@@ -32,7 +32,7 @@ import com.jogamp.common.util.ReflectionUtil;
import jogamp.common.av.NullAudioSink;
public class AudioSinkFactory {
- private static final String ALAudioSinkClazzName = "jogamp.openal.util.ALAudioSink";
+ private static final String ALAudioSinkClazzName = "com.jogamp.openal.util.ALAudioSink";
private static final String JavaAudioSinkClazzName = "jogamp.common.av.JavaSoundAudioSink";
public static AudioSink createDefault(final ClassLoader cl) {
diff --git a/src/java/jogamp/common/av/JavaSoundAudioSink.java b/src/java/jogamp/common/av/JavaSoundAudioSink.java
index 48a2a4d..f5f9eb8 100644
--- a/src/java/jogamp/common/av/JavaSoundAudioSink.java
+++ b/src/java/jogamp/common/av/JavaSoundAudioSink.java
@@ -34,6 +34,7 @@ import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.DataLine;
import javax.sound.sampled.SourceDataLine;
+import com.jogamp.common.av.AudioFormat;
import com.jogamp.common.av.AudioSink;
/***
@@ -60,7 +61,7 @@ public class JavaSoundAudioSink implements AudioSink {
private int bufferCount;
private final byte [] sampleData = new byte[BUFFER_SIZE];
private boolean available = false;
- private AudioSink.AudioFormat chosenFormat = null;
+ private AudioFormat chosenFormat = null;
private volatile boolean playRequested = false;
private float volume = 1.0f;
@@ -122,7 +123,7 @@ public class JavaSoundAudioSink implements AudioSink {
}
@Override
- public AudioSink.AudioFormat getPreferredFormat() {
+ public AudioFormat getPreferredFormat() {
return DefaultFormat;
}
@@ -132,12 +133,12 @@ public class JavaSoundAudioSink implements AudioSink {
}
@Override
- public final boolean isSupported(final AudioSink.AudioFormat format) {
+ public final boolean isSupported(final AudioFormat format) {
return true;
}
@Override
- public boolean init(final AudioSink.AudioFormat requestedFormat, final float frameDuration, final int initialQueueSize, final int queueGrowAmount, final int queueLimit) {
+ public boolean init(final AudioFormat requestedFormat, final float frameDuration, final int initialQueueSize, final int queueGrowAmount, final int queueLimit) {
if( !staticAvailable ) {
return false;
}
diff --git a/src/java/jogamp/common/av/NullAudioSink.java b/src/java/jogamp/common/av/NullAudioSink.java
index 6b918d9..36681bb 100644
--- a/src/java/jogamp/common/av/NullAudioSink.java
+++ b/src/java/jogamp/common/av/NullAudioSink.java
@@ -29,6 +29,7 @@ package jogamp.common.av;
import java.nio.ByteBuffer;
+import com.jogamp.common.av.AudioFormat;
import com.jogamp.common.av.AudioSink;
public class NullAudioSink implements AudioSink {