From 5f72e750d6650059f9a5ce028e95984bb8f34c81 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Wed, 17 May 2023 08:15:43 +0200 Subject: Common av classes (*AudioSink, ..) are promoted to gluegen (commit 270172bcbd91f96d4a38a3d73e23d744f57a25b8) and joal (commit 03f4bb63ce8a358b1c2ef303480e1887d72ecb2e) --- .../jogamp/opengl/demos/av/CrossFadePlayer.java | 2 +- .../classes/com/jogamp/opengl/util/TimeFrameI.java | 81 -- .../com/jogamp/opengl/util/av/AudioSink.java | 436 --------- .../jogamp/opengl/util/av/AudioSinkFactory.java | 70 -- .../com/jogamp/opengl/util/av/GLMediaPlayer.java | 4 +- .../opengl/util/texture/TextureSequence.java | 2 +- .../android/av/AndroidGLMediaPlayerAPI14.java | 2 +- .../jogamp/opengl/openal/av/ALAudioSink.java | 993 --------------------- .../jogamp/opengl/openal/av/ALDummyUsage.java | 16 - .../jogamp/opengl/util/av/GLMediaPlayerImpl.java | 6 +- .../jogamp/opengl/util/av/JavaSoundAudioSink.java | 228 ----- .../jogamp/opengl/util/av/NullAudioSink.java | 181 ---- .../jogamp/opengl/util/av/NullGLMediaPlayer.java | 2 - .../opengl/util/av/impl/FFMPEGMediaPlayer.java | 11 +- 14 files changed, 13 insertions(+), 2021 deletions(-) delete mode 100644 src/jogl/classes/com/jogamp/opengl/util/TimeFrameI.java delete mode 100644 src/jogl/classes/com/jogamp/opengl/util/av/AudioSink.java delete mode 100644 src/jogl/classes/com/jogamp/opengl/util/av/AudioSinkFactory.java delete mode 100644 src/jogl/classes/jogamp/opengl/openal/av/ALAudioSink.java delete mode 100644 src/jogl/classes/jogamp/opengl/openal/av/ALDummyUsage.java delete mode 100644 src/jogl/classes/jogamp/opengl/util/av/JavaSoundAudioSink.java delete mode 100644 src/jogl/classes/jogamp/opengl/util/av/NullAudioSink.java (limited to 'src') diff --git a/src/demos/com/jogamp/opengl/demos/av/CrossFadePlayer.java b/src/demos/com/jogamp/opengl/demos/av/CrossFadePlayer.java index 0270ee709..210db4fbd 100644 --- a/src/demos/com/jogamp/opengl/demos/av/CrossFadePlayer.java +++ b/src/demos/com/jogamp/opengl/demos/av/CrossFadePlayer.java @@ -28,9 +28,9 @@ package com.jogamp.opengl.demos.av; +import com.jogamp.common.av.AudioSink; import com.jogamp.common.net.Uri; import com.jogamp.common.util.InterruptSource; -import com.jogamp.opengl.util.av.AudioSink; import com.jogamp.opengl.util.av.GLMediaPlayer; import com.jogamp.opengl.util.av.GLMediaPlayer.GLMediaEventListener; import com.jogamp.opengl.util.av.GLMediaPlayer.StreamException; diff --git a/src/jogl/classes/com/jogamp/opengl/util/TimeFrameI.java b/src/jogl/classes/com/jogamp/opengl/util/TimeFrameI.java deleted file mode 100644 index 99def6f5c..000000000 --- a/src/jogl/classes/com/jogamp/opengl/util/TimeFrameI.java +++ /dev/null @@ -1,81 +0,0 @@ -/** - * Copyright 2013 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.opengl.util; - -/** - * Integer time frame in milliseconds, maybe specialized for texture/video, audio, .. animated content. - *

- * Type and value range has been chosen to suit embedded CPUs - * and characteristics of audio / video streaming and animations. - * Milliseconds of type integer with a maximum value of {@link Integer#MAX_VALUE} - * will allow tracking time up 2,147,483.647 seconds or - * 24 days 20 hours 31 minutes and 23 seconds. - *

- *

- * Milliseconds granularity is also more than enough to deal with A-V synchronization, - * where the threshold usually lies within 22ms. - *

- *

- * Milliseconds granularity for displaying video frames might seem inaccurate - * for each single frame, i.e. 60Hz != 16ms, however, accumulated values diminish - * this error and vertical sync is achieved by build-in V-Sync of the video drivers. - *

- */ -public class TimeFrameI { - /** Constant marking an invalid PTS, i.e. Integer.MIN_VALUE == 0x80000000 == {@value}. Sync w/ native code. */ - public static final int INVALID_PTS = 0x80000000; - - /** Constant marking the end of the stream PTS, i.e. Integer.MIN_VALUE - 1 == 0x7FFFFFFF == {@value}. Sync w/ native code. */ - public static final int END_OF_STREAM_PTS = 0x7FFFFFFF; - - protected int pts; - protected int duration; - - public TimeFrameI() { - pts = INVALID_PTS; - duration = 0; - } - public TimeFrameI(final int pts, final int duration) { - this.pts = pts; - this.duration = duration; - } - - /** Get this frame's presentation timestamp (PTS) in milliseconds. */ - public final int getPTS() { return pts; } - /** Set this frame's presentation timestamp (PTS) in milliseconds. */ - public final void setPTS(final int pts) { this.pts = pts; } - /** Get this frame's duration in milliseconds. */ - public final int getDuration() { return duration; } - /** Set this frame's duration in milliseconds. */ - public final void setDuration(final int duration) { this.duration = duration; } - - @Override - public String toString() { - return "TimeFrame[pts " + pts + " ms, l " + duration + " ms]"; - } -} diff --git a/src/jogl/classes/com/jogamp/opengl/util/av/AudioSink.java b/src/jogl/classes/com/jogamp/opengl/util/av/AudioSink.java deleted file mode 100644 index fd6172e13..000000000 --- a/src/jogl/classes/com/jogamp/opengl/util/av/AudioSink.java +++ /dev/null @@ -1,436 +0,0 @@ -/** - * Copyright 2013 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.opengl.util.av; - -import java.nio.ByteBuffer; - -import com.jogamp.opengl.util.TimeFrameI; - -import jogamp.opengl.Debug; - -public interface AudioSink { - public static final boolean DEBUG = Debug.debug("AudioSink"); - - /** Default frame duration in millisecond, i.e. 1 frame per {@value} ms. */ - public static final int DefaultFrameDuration = 32; - - /** Initial audio queue size in milliseconds. {@value} ms, i.e. 16 frames per 32 ms. See {@link #init(AudioFormat, float, int, int, int)}.*/ - public static final int DefaultInitialQueueSize = 16 * 32; // 512 ms - /** Audio queue grow size in milliseconds. {@value} ms, i.e. 16 frames per 32 ms. See {@link #init(AudioFormat, float, int, int, int)}.*/ - public static final int DefaultQueueGrowAmount = 16 * 32; // 512 ms - /** Audio queue limit w/ video in milliseconds. {@value} ms, i.e. 96 frames per 32 ms. See {@link #init(AudioFormat, float, int, int, int)}.*/ - public static final int DefaultQueueLimitWithVideo = 96 * 32; // 3072 ms - /** 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}. - *

- * Time -> Byte Count - *

- */ - 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}. - *

- * Byte Count -> Time - *

- */ - 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. - * 
-         *    ( 1000f * sampleCount ) / sampleRate
-         *
- *

- * Sample Count -> Time - *

- * @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. - * 
-         *     Math.max( 1, millisecs / frameDuration + 0.5f )
-         *
- *

- * Note: frameDuration can be derived by sample count per frame and channel - * via {@link #getSamplesDuration(int)}. - *

- *

- * Frame Time -> Frame Count - *

- * @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.: - * 
-         *  sampleCount * ( sampleSize / 8 )
-         *
- *

- * Note: To retrieve the byte size for all channels, - * you need to pre-multiply sampleCount with {@link #channelCount}. - *

- *

- * Sample Count -> Byte Count - *

- * @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.: - * 
-         *  ( byteCount * 8 ) / sampleSize
-         *
- *

- * Note: If byteCount covers all channels and you request the sample size per channel, - * you need to divide the result by sampleCount by {@link #channelCount}. - *

- *

- * Byte Count -> Sample Count - *

- * @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 */); - - public static abstract class AudioFrame extends TimeFrameI { - protected int byteSize; - - public AudioFrame() { - this.byteSize = 0; - } - public AudioFrame(final int pts, final int duration, final int byteCount) { - super(pts, duration); - this.byteSize=byteCount; - } - - /** Get this frame's size in bytes. */ - public final int getByteSize() { return byteSize; } - /** Set this frame's size in bytes. */ - public final void setByteSize(final int size) { this.byteSize=size; } - - @Override - public String toString() { - return "AudioFrame[pts " + pts + " ms, l " + duration + " ms, "+byteSize + " bytes]"; - } - } - public static class AudioDataFrame extends AudioFrame { - protected final ByteBuffer data; - - public AudioDataFrame(final int pts, final int duration, final ByteBuffer bytes, final int byteCount) { - super(pts, duration, byteCount); - if( byteCount > bytes.remaining() ) { - throw new IllegalArgumentException("Give size "+byteCount+" exceeds remaining bytes in ls "+bytes+". "+this); - } - this.data=bytes; - } - - /** Get this frame's data. */ - public final ByteBuffer getData() { return data; } - - @Override - public String toString() { - return "AudioDataFrame[pts " + pts + " ms, l " + duration + " ms, "+byteSize + " bytes, " + data + "]"; - } - } - - /** - * Returns the initialized state of this instance. - *

- * The initialized state is affected by this instance - * overall availability, i.e. after instantiation, - * as well as by {@link #destroy()}. - *

- */ - public boolean isInitialized(); - - /** Returns the playback speed. */ - public float getPlaySpeed(); - - /** - * Sets the playback speed. - *

- * To simplify test, play speed is normalized, i.e. - *

- *

- * @return true if successful, otherwise false, i.e. due to unsupported value range of implementation. - */ - public boolean setPlaySpeed(float s); - - /** Returns the volume. */ - public float getVolume(); - - /** - * Sets the volume [0f..1f]. - *

- * To simplify test, volume is normalized, i.e. - *

- *

- * @return true if successful, otherwise false, i.e. due to unsupported value range of implementation. - */ - public boolean setVolume(float v); - - /** - * Returns the preferred {@link AudioFormat} by this sink. - *

- * The preferred format is guaranteed to be supported - * and shall reflect this sinks most native format, - * i.e. best performance w/o data conversion. - *

- *

- * Known {@link #AudioFormat} attributes considered by implementations: - *

- *

- * @see #initSink(AudioFormat) - * @see #isSupported(AudioFormat) - */ - public AudioFormat getPreferredFormat(); - - /** Return the maximum number of supported channels. */ - public int getMaxSupportedChannels(); - - /** - * Returns true if the given format is supported by the sink, otherwise false. - * @see #initSink(AudioFormat) - * @see #getPreferredFormat() - */ - public boolean isSupported(AudioFormat format); - - /** - * Initializes the sink. - *

- * Implementation must match the given requestedFormat {@link AudioFormat}. - *

- *

- * Caller shall validate requestedFormat via {@link #isSupported(AudioFormat)} - * beforehand and try to find a suitable supported one. - * {@link #getPreferredFormat()} and {@link #getMaxSupportedChannels()} may help. - *

- * @param requestedFormat the requested {@link AudioFormat}. - * @param frameDuration average or fixed frame duration in milliseconds - * helping a caching {@link AudioFrame} based implementation to determine the frame count in the queue. - * See {@link #DefaultFrameDuration}. - * @param initialQueueSize initial time in milliseconds to queue in this sink, see {@link #DefaultInitialQueueSize}. - * @param queueGrowAmount time in milliseconds to grow queue if full, see {@link #DefaultQueueGrowAmount}. - * @param queueLimit maximum time in milliseconds the queue can hold (and grow), see {@link #DefaultQueueLimitWithVideo} and {@link #DefaultQueueLimitAudioOnly}. - * @return true if successful, otherwise false - */ - public boolean init(AudioFormat requestedFormat, float frameDuration, - int initialQueueSize, int queueGrowAmount, int queueLimit); - - /** - * Returns the {@link AudioFormat} as chosen by {@link #init(AudioFormat, float, int, int, int)}, - * i.e. it shall match the requestedFormat. - */ - public AudioFormat getChosenFormat(); - - /** - * Returns true, if {@link #play()} has been requested and the sink is still playing, - * otherwise false. - */ - public boolean isPlaying(); - - /** - * Play buffers queued via {@link #enqueueData(AudioFrame)} from current internal position. - * If no buffers are yet queued or the queue runs empty, playback is being continued when buffers are enqueued later on. - * @see #enqueueData(AudioFrame) - * @see #pause() - */ - public void play(); - - /** - * Pause playing buffers while keeping enqueued data incl. it's internal position. - * @see #play() - * @see #flush() - * @see #enqueueData(AudioFrame) - */ - public void pause(); - - /** - * Flush all queued buffers, implies {@link #pause()}. - *

- * {@link #init(AudioFormat, float, int, int, int)} must be called first. - *

- * @see #play() - * @see #pause() - * @see #enqueueData(AudioFrame) - */ - public void flush(); - - /** Destroys this instance, i.e. closes all streams and devices allocated. */ - public void destroy(); - - /** - * Returns the number of allocated buffers as requested by - * {@link #init(AudioFormat, float, int, int, int)}. - */ - public int getFrameCount(); - - /** @return the current enqueued frames count since {@link #init(AudioFormat, float, int, int, int)}. */ - public int getEnqueuedFrameCount(); - - /** - * Returns the current number of frames queued for playing. - *

- * {@link #init(AudioFormat, float, int, int, int)} must be called first. - *

- */ - public int getQueuedFrameCount(); - - /** - * Returns the current number of bytes queued for playing. - *

- * {@link #init(AudioFormat, float, int, int, int)} must be called first. - *

- */ - public int getQueuedByteCount(); - - /** - * Returns the current queued frame time in milliseconds for playing. - *

- * {@link #init(AudioFormat, float, int, int, int)} must be called first. - *

- */ - public int getQueuedTime(); - - /** - * Return the current audio presentation timestamp (PTS) in milliseconds. - */ - public int getPTS(); - - /** - * Returns the current number of frames in the sink available for writing. - *

- * {@link #init(AudioFormat, float, int, int, int)} must be called first. - *

- */ - public int getFreeFrameCount(); - - /** - * Enqueue byteCount bytes of the remaining bytes of the given NIO {@link ByteBuffer} to this sink. - *

- * The data must comply with the chosen {@link AudioFormat} as returned by {@link #initSink(AudioFormat)}. - *

- *

- * {@link #init(AudioFormat, float, int, int, int)} must be called first. - *

- * @returns the enqueued internal {@link AudioFrame}. - */ - public AudioFrame enqueueData(int pts, ByteBuffer bytes, int byteCount); -} diff --git a/src/jogl/classes/com/jogamp/opengl/util/av/AudioSinkFactory.java b/src/jogl/classes/com/jogamp/opengl/util/av/AudioSinkFactory.java deleted file mode 100644 index f8a69301c..000000000 --- a/src/jogl/classes/com/jogamp/opengl/util/av/AudioSinkFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -/** - * Copyright 2013 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.opengl.util.av; - -import jogamp.opengl.util.av.NullAudioSink; - -import com.jogamp.common.util.ReflectionUtil; - -public class AudioSinkFactory { - private static final String ALAudioSinkClazzName = "jogamp.opengl.openal.av.ALAudioSink"; - private static final String JavaAudioSinkClazzName = "jogamp.opengl.util.av.JavaSoundAudioSink"; - - public static AudioSink createDefault() { - final ClassLoader cl = GLMediaPlayerFactory.class.getClassLoader(); - AudioSink sink = create(cl, ALAudioSinkClazzName); - if( null == sink ) { - sink = create(cl, JavaAudioSinkClazzName); - } - if( null == sink ) { - sink = createNull(); - } - return sink; - } - public static AudioSink createNull() { - return new NullAudioSink(); - } - - public static AudioSink create(final ClassLoader cl, final String implName) { - final AudioSink audioSink; - if(ReflectionUtil.isClassAvailable(implName, cl)){ - try { - audioSink = (AudioSink) ReflectionUtil.createInstance(implName, cl); - if( audioSink.isInitialized() ) { - return audioSink; - } else if(AudioSink.DEBUG) { - System.err.println("AudioSinkFactory: Couldn't initialize AudioSink '"+implName+"'"); - } - } catch (final Throwable t) { - if(AudioSink.DEBUG) { System.err.println("Caught "+t.getClass().getName()+": "+t.getMessage()); t.printStackTrace(); } - } - } - return null; - } - -} diff --git a/src/jogl/classes/com/jogamp/opengl/util/av/GLMediaPlayer.java b/src/jogl/classes/com/jogamp/opengl/util/av/GLMediaPlayer.java index 82951ab54..3832a7c51 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/av/GLMediaPlayer.java +++ b/src/jogl/classes/com/jogamp/opengl/util/av/GLMediaPlayer.java @@ -35,11 +35,11 @@ import jogamp.opengl.Debug; import java.util.List; +import com.jogamp.common.av.AudioSink; +import com.jogamp.common.av.TimeFrameI; import com.jogamp.common.net.Uri; import com.jogamp.opengl.util.texture.Texture; import com.jogamp.opengl.util.texture.TextureSequence; -import com.jogamp.opengl.util.TimeFrameI; -import com.jogamp.opengl.util.av.GLMediaPlayer.State; /** * GLMediaPlayer interface specifies a {@link TextureSequence} state machine diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/TextureSequence.java b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureSequence.java index 2b91f3b1f..1e308b215 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/texture/TextureSequence.java +++ b/src/jogl/classes/com/jogamp/opengl/util/texture/TextureSequence.java @@ -32,7 +32,7 @@ import com.jogamp.opengl.GLAutoDrawable; import com.jogamp.opengl.GLRunnable; import com.jogamp.opengl.GLEventListener; -import com.jogamp.opengl.util.TimeFrameI; +import com.jogamp.common.av.TimeFrameI; /** * Protocol for texture sequences, like animations, movies, etc. diff --git a/src/jogl/classes/jogamp/opengl/android/av/AndroidGLMediaPlayerAPI14.java b/src/jogl/classes/jogamp/opengl/android/av/AndroidGLMediaPlayerAPI14.java index 06eca7128..667c03458 100644 --- a/src/jogl/classes/jogamp/opengl/android/av/AndroidGLMediaPlayerAPI14.java +++ b/src/jogl/classes/jogamp/opengl/android/av/AndroidGLMediaPlayerAPI14.java @@ -35,7 +35,7 @@ import com.jogamp.opengl.GLES2; import com.jogamp.opengl.GLException; import com.jogamp.common.os.AndroidVersion; import com.jogamp.common.os.Platform; -import com.jogamp.opengl.util.TimeFrameI; +import com.jogamp.common.av.TimeFrameI; import com.jogamp.opengl.util.av.GLMediaPlayer; import com.jogamp.opengl.util.texture.Texture; import com.jogamp.opengl.util.texture.TextureSequence; diff --git a/src/jogl/classes/jogamp/opengl/openal/av/ALAudioSink.java b/src/jogl/classes/jogamp/opengl/openal/av/ALAudioSink.java deleted file mode 100644 index c52c59f17..000000000 --- a/src/jogl/classes/jogamp/opengl/openal/av/ALAudioSink.java +++ /dev/null @@ -1,993 +0,0 @@ -/** - * Copyright 2013 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 jogamp.opengl.openal.av; - - -import java.nio.ByteBuffer; -import java.util.Arrays; - -import jogamp.opengl.Debug; - -import com.jogamp.common.ExceptionUtils; -import com.jogamp.common.util.LFRingbuffer; -import com.jogamp.common.util.PropertyAccess; -import com.jogamp.common.util.Ringbuffer; -import com.jogamp.common.util.locks.LockFactory; -import com.jogamp.common.util.locks.RecursiveLock; -import com.jogamp.openal.AL; -import com.jogamp.openal.ALC; -import com.jogamp.openal.ALCConstants; -import com.jogamp.openal.ALCcontext; -import com.jogamp.openal.ALCdevice; -import com.jogamp.openal.ALConstants; -import com.jogamp.openal.ALExt; -import com.jogamp.openal.ALFactory; -import com.jogamp.openal.util.ALHelpers; -import com.jogamp.opengl.util.av.AudioSink; - -/*** - * OpenAL Audio Sink - */ -public class ALAudioSink implements AudioSink { - - private static final String AL_SOFT_buffer_samples = "AL_SOFT_buffer_samples"; - private static final String ALC_EXT_thread_local_context = "ALC_EXT_thread_local_context"; - private static final boolean DEBUG_TRACE; - private static final ALC alc; - private static final AL al; - private static final ALExt alExt; - private static final boolean staticAvailable; - - private String deviceSpecifier; - private ALCdevice device; - private boolean hasSOFTBufferSamples; - private boolean hasALC_thread_local_context; - private AudioFormat preferredAudioFormat; - private ALCcontext context; - private final RecursiveLock lock = LockFactory.createRecursiveLock(); - - /** Playback speed, range [0.5 - 2.0], default 1.0. */ - private float playSpeed; - private float volume = 1.0f; - - static class ALAudioFrame extends AudioFrame { - private final int alBuffer; - - ALAudioFrame(final int alBuffer) { - this.alBuffer = alBuffer; - } - public ALAudioFrame(final int alBuffer, final int pts, final int duration, final int dataSize) { - super(pts, duration, dataSize); - this.alBuffer = alBuffer; - } - - /** Get this frame's OpenAL buffer name */ - public final int getALBuffer() { return alBuffer; } - - @Override - public String toString() { - return "ALAudioFrame[pts " + pts + " ms, l " + duration + " ms, " + byteSize + " bytes, buffer "+alBuffer+"]"; - } - } - - // private ALAudioFrame[] alFrames = null; - private int[] alBufferNames = null; - private int frameGrowAmount = 0; - private int frameLimit = 0; - - private Ringbuffer alFramesAvail = null; - private Ringbuffer alFramesPlaying = null; - private volatile int alBufferBytesQueued = 0; - private volatile int playingPTS = AudioFrame.INVALID_PTS; - private volatile int enqueuedFrameCount; - - private int[] alSource = null; - private AudioFormat chosenFormat; - private int alChannelLayout; - private int alSampleType; - private int alFormat; - private boolean initialized; - - private volatile boolean playRequested = false; - - static { - Debug.initSingleton(); - DEBUG_TRACE = PropertyAccess.isPropertyDefined("jogl.debug.AudioSink.trace", true); - - ALC _alc = null; - AL _al = null; - ALExt _alExt = null; - try { - _alc = ALFactory.getALC(); - _al = ALFactory.getAL(); - _alExt = ALFactory.getALExt(); - } catch(final Throwable t) { - if( DEBUG ) { - System.err.println("ALAudioSink: Caught "+t.getClass().getName()+": "+t.getMessage()); - t.printStackTrace(); - } - } - alc = _alc; - al = _al; - alExt = _alExt; - staticAvailable = null != alc && null != al && null != alExt; - } - - private void clearPreALError(final String prefix) { - checkALError(prefix); - } - private boolean checkALError(final String prefix) { - final int alcErr = alc.alcGetError(device); - final int alErr = al.alGetError(); - final boolean ok = ALCConstants.ALC_NO_ERROR == alcErr && ALConstants.AL_NO_ERROR == alErr; - if( DEBUG ) { - System.err.println("ALAudioSink."+prefix+": ok "+ok+", err [alc "+toHexString(alcErr)+", al "+toHexString(alErr)+"]"); - } - return ok; - } - - public ALAudioSink() { - initialized = false; - chosenFormat = null; - - if( !staticAvailable ) { - return; - } - synchronized(ALAudioSink.class) { - try { - // Get handle to default device. - device = alc.alcOpenDevice(null); - if (device == null) { - throw new RuntimeException(getThreadName()+": ALAudioSink: Error opening default OpenAL device"); - } - int checkErrIter = 1; - - clearPreALError("init."+checkErrIter++); - - // Get the device specifier. - deviceSpecifier = alc.alcGetString(device, ALCConstants.ALC_DEVICE_SPECIFIER); - if (deviceSpecifier == null) { - throw new RuntimeException(getThreadName()+": ALAudioSink: Error getting specifier for default OpenAL device"); - } - - // Create audio context. - // final int[] attrs = new int[] { ALC.ALC_FREQUENCY, DefaultFormat.sampleRate, 0 }; - // context = alc.alcCreateContext(device, attrs, 0); - context = alc.alcCreateContext(device, null); - if (context == null) { - throw new RuntimeException(getThreadName()+": ALAudioSink: Error creating OpenAL context for "+deviceSpecifier); - } - - lockContext(); - try { - // Check for an error. - if ( alc.alcGetError(device) != ALCConstants.ALC_NO_ERROR ) { - throw new RuntimeException(getThreadName()+": ALAudioSink: Error making OpenAL context current"); - } - - hasSOFTBufferSamples = al.alIsExtensionPresent(AL_SOFT_buffer_samples); - hasALC_thread_local_context = alc.alcIsExtensionPresent(null, ALC_EXT_thread_local_context) || - alc.alcIsExtensionPresent(device, ALC_EXT_thread_local_context) ; - clearPreALError("init."+checkErrIter++); - preferredAudioFormat = new AudioFormat(querySampleRate(), DefaultFormat.sampleSize, DefaultFormat.channelCount, DefaultFormat.signed, DefaultFormat.fixedP, DefaultFormat.planar, DefaultFormat.littleEndian); - if( DEBUG ) { - final int[] alcvers = { 0, 0 }; - System.out.println("ALAudioSink: OpenAL Version: "+al.alGetString(ALConstants.AL_VERSION)); - System.out.println("ALAudioSink: OpenAL Extensions: "+al.alGetString(ALConstants.AL_EXTENSIONS)); - clearPreALError("init."+checkErrIter++); - System.out.println("ALAudioSink: Null device OpenALC:"); - alc.alcGetIntegerv(null, ALCConstants.ALC_MAJOR_VERSION, 1, alcvers, 0); - alc.alcGetIntegerv(null, ALCConstants.ALC_MINOR_VERSION, 1, alcvers, 1); - System.out.println(" Version: "+alcvers[0]+"."+alcvers[1]); - System.out.println(" Extensions: "+alc.alcGetString(null, ALCConstants.ALC_EXTENSIONS)); - clearPreALError("init."+checkErrIter++); - System.out.println("ALAudioSink: Device "+deviceSpecifier+" OpenALC:"); - alc.alcGetIntegerv(device, ALCConstants.ALC_MAJOR_VERSION, 1, alcvers, 0); - alc.alcGetIntegerv(device, ALCConstants.ALC_MINOR_VERSION, 1, alcvers, 1); - System.out.println(" Version: "+alcvers[0]+"."+alcvers[1]); - System.out.println(" Extensions: "+alc.alcGetString(device, ALCConstants.ALC_EXTENSIONS)); - System.out.println("ALAudioSink: hasSOFTBufferSamples "+hasSOFTBufferSamples); - System.out.println("ALAudioSink: hasALC_thread_local_context "+hasALC_thread_local_context); - System.out.println("ALAudioSink: preferredAudioFormat "+preferredAudioFormat); - clearPreALError("init."+checkErrIter++); - } - - // Create source - { - alSource = new int[1]; - al.alGenSources(1, alSource, 0); - final int err = al.alGetError(); - if( ALConstants.AL_NO_ERROR != err ) { - alSource = null; - throw new RuntimeException(getThreadName()+": ALAudioSink: Error generating Source: 0x"+Integer.toHexString(err)); - } - } - - if( DEBUG ) { - System.err.println("ALAudioSink: Using device: " + deviceSpecifier); - } - initialized = true; - } finally { - unlockContext(); - } - return; - } catch ( final Exception e ) { - if( DEBUG ) { - System.err.println(e.getMessage()); - e.printStackTrace(); - } - destroy(); - } - } - } - - private final int querySampleRate() { - final int sampleRate; - final int[] value = new int[1]; - alc.alcGetIntegerv(device, ALCConstants.ALC_FREQUENCY, 1, value, 0); - final int alcErr = alc.alcGetError(device); - final int alErr = al.alGetError(); - if ( ALCConstants.ALC_NO_ERROR == alcErr && ALConstants.AL_NO_ERROR == alErr && 0 != value[0] ) { - sampleRate = value[0]; - } else { - sampleRate = DefaultFormat.sampleRate; - } - if( DEBUG ) { - System.err.println("ALAudioSink.querySampleRate: err [alc "+toHexString(alcErr)+", al "+toHexString(alErr)+"], freq: "+value[0]+" -> "+sampleRate); - } - return sampleRate; - } - - private final void lockContext() { - lock.lock(); - if( hasALC_thread_local_context ) { - alExt.alcSetThreadContext(context); - } else { - alc.alcMakeContextCurrent(context); - } - final int alcErr = alc.alcGetError(null); - if( ALCConstants.ALC_NO_ERROR != alcErr ) { - final String err = getThreadName()+": ALCError "+toHexString(alcErr)+" while makeCurrent. "+this; - System.err.println(err); - ExceptionUtils.dumpStack(System.err); - lock.unlock(); - throw new RuntimeException(err); - } - final int alErr = al.alGetError(); - if( ALCConstants.ALC_NO_ERROR != alErr ) { - if( DEBUG ) { - System.err.println(getThreadName()+": Prev - ALError "+toHexString(alErr)+" @ makeCurrent. "+this); - ExceptionUtils.dumpStack(System.err); - } - } - } - private final void unlockContext() { - if( hasALC_thread_local_context ) { - alExt.alcSetThreadContext(null); - } else { - alc.alcMakeContextCurrent(null); - } - lock.unlock(); - } - private final void destroyContext() { - lock.lock(); - try { - if( null != context ) { - try { - alc.alcDestroyContext(context); - } catch (final Throwable t) { - if( DEBUG ) { - ExceptionUtils.dumpThrowable("", t); - } - } - context = null; - } - // unroll lock ! - while(lock.getHoldCount() > 1) { - lock.unlock(); - } - } finally { - lock.unlock(); - } - } - - @Override - public final String toString() { - final int alSrcName = null != alSource ? alSource[0] : 0; - final int alBuffersLen = null != alBufferNames ? alBufferNames.length : 0; - final int ctxHash = context != null ? context.hashCode() : 0; - final int alFramesAvailSize = alFramesAvail != null ? alFramesAvail.size() : 0; - final int alFramesPlayingSize = alFramesPlaying != null ? alFramesPlaying.size() : 0; - return "ALAudioSink[init "+initialized+", playRequested "+playRequested+", device "+deviceSpecifier+", ctx "+toHexString(ctxHash)+", alSource "+alSrcName+ - ", chosen "+chosenFormat+ - ", al[chan "+ALHelpers.alChannelLayoutName(alChannelLayout)+", type "+ALHelpers.alSampleTypeName(alSampleType)+ - ", fmt "+toHexString(alFormat)+", soft "+hasSOFTBufferSamples+ - "], playSpeed "+playSpeed+", buffers[total "+alBuffersLen+", avail "+alFramesAvailSize+", "+ - "queued["+alFramesPlayingSize+", apts "+getPTS()+", "+getQueuedTime() + " ms, " + alBufferBytesQueued+" bytes], "+ - "queue[g "+frameGrowAmount+", l "+frameLimit+"]"; - } - - private final String shortString() { - final int alSrcName = null != alSource ? alSource[0] : 0; - final int ctxHash = context != null ? context.hashCode() : 0; - return "[ctx "+toHexString(ctxHash)+", playReq "+playRequested+", alSrc "+alSrcName+ - ", queued["+alFramesPlaying.size()+", " + alBufferBytesQueued+" bytes], "+ - "queue[g "+frameGrowAmount+", l "+frameLimit+"]"; - } - - public final String getPerfString() { - final int alBuffersLen = null != alBufferNames ? alBufferNames.length : 0; - return "Play [buffer "+alFramesPlaying.size()+"/"+alBuffersLen+", apts "+getPTS()+", "+getQueuedTime() + " ms, " + alBufferBytesQueued+" bytes]"; - } - - @Override - public final AudioFormat getPreferredFormat() { - if( !staticAvailable ) { - return null; - } - return preferredAudioFormat; - } - - @Override - public final int getMaxSupportedChannels() { - if( !staticAvailable ) { - return 0; - } - return hasSOFTBufferSamples ? 8 : 2; - } - - @Override - public final boolean isSupported(final AudioFormat format) { - if( !staticAvailable ) { - return false; - } - if( format.planar || !format.littleEndian ) { - // FIXME big-endian supported w/ SOFT where it's native format! - return false; - } - final int alChannelLayout = ALHelpers.getDefaultALChannelLayout(format.channelCount); - if( ALConstants.AL_NONE != alChannelLayout ) { - final int alSampleType = ALHelpers.getALSampleType(format.sampleSize, format.signed, format.fixedP); - if( ALConstants.AL_NONE != alSampleType ) { - lockContext(); - try { - final int alFormat = ALHelpers.getALFormat(alChannelLayout, alSampleType, hasSOFTBufferSamples, al, alExt); - return ALConstants.AL_NONE != alFormat; - } finally { - unlockContext(); - } - } - } - return false; - } - - @Override - public final boolean init(final AudioFormat requestedFormat, final float frameDuration, final int initialQueueSize, final int queueGrowAmount, final int queueLimit) { - if( !staticAvailable ) { - return false; - } - alChannelLayout = ALHelpers.getDefaultALChannelLayout(requestedFormat.channelCount); - alSampleType = ALHelpers.getALSampleType(requestedFormat.sampleSize, requestedFormat.signed, requestedFormat.fixedP); - lockContext(); - try { - if( ALConstants.AL_NONE != alChannelLayout && ALConstants.AL_NONE != alSampleType ) { - alFormat = ALHelpers.getALFormat(alChannelLayout, alSampleType, hasSOFTBufferSamples, al, alExt); - } else { - alFormat = ALConstants.AL_NONE; - } - if( ALConstants.AL_NONE == alFormat ) { - // not supported - return false; - } - // Allocate buffers - destroyBuffers(); - { - final float useFrameDuration = frameDuration > 1f ? frameDuration : AudioSink.DefaultFrameDuration; - final int initialFrameCount = requestedFormat.getFrameCount( - initialQueueSize > 0 ? initialQueueSize : AudioSink.DefaultInitialQueueSize, useFrameDuration); - // frameDuration, int initialQueueSize, int queueGrowAmount, int queueLimit) { - alBufferNames = new int[initialFrameCount]; - al.alGenBuffers(initialFrameCount, alBufferNames, 0); - final int err = al.alGetError(); - if( ALConstants.AL_NO_ERROR != err ) { - alBufferNames = null; - throw new RuntimeException(getThreadName()+": ALAudioSink: Error generating Buffers: 0x"+Integer.toHexString(err)); - } - final ALAudioFrame[] alFrames = new ALAudioFrame[initialFrameCount]; - for(int i=0; i(alFrames); - alFramesPlaying = new LFRingbuffer(ALAudioFrame[].class, initialFrameCount); - this.frameGrowAmount = requestedFormat.getFrameCount( - queueGrowAmount > 0 ? queueGrowAmount : AudioSink.DefaultQueueGrowAmount, useFrameDuration); - this.frameLimit = requestedFormat.getFrameCount( - queueLimit > 0 ? queueLimit : AudioSink.DefaultQueueLimitWithVideo, useFrameDuration); - if( DEBUG_TRACE ) { - alFramesAvail.dump(System.err, "Avail-init"); - alFramesPlaying.dump(System.err, "Playi-init"); - } - } - } finally { - unlockContext(); - } - - chosenFormat = requestedFormat; - return true; - } - - @Override - public final AudioFormat getChosenFormat() { - return chosenFormat; - } - - private static int[] concat(final int[] first, final int[] second) { - final int[] result = Arrays.copyOf(first, first.length + second.length); - System.arraycopy(second, 0, result, first.length, second.length); - return result; - } - /** - private static T[] concat(T[] first, T[] second) { - final T[] result = Arrays.copyOf(first, first.length + second.length); - System.arraycopy(second, 0, result, first.length, second.length); - return result; - } */ - - private boolean growBuffers() { - if( !alFramesAvail.isEmpty() || !alFramesPlaying.isFull() ) { - throw new InternalError("Buffers: Avail is !empty "+alFramesAvail+" or Playing is !full "+alFramesPlaying); - } - if( alFramesAvail.capacity() >= frameLimit || alFramesPlaying.capacity() >= frameLimit ) { - if( DEBUG ) { - System.err.println(getThreadName()+": ALAudioSink.growBuffers: Frame limit "+frameLimit+" reached: Avail "+alFramesAvail+", Playing "+alFramesPlaying); - } - return false; - } - - final int[] newALBufferNames = new int[frameGrowAmount]; - al.alGenBuffers(frameGrowAmount, newALBufferNames, 0); - final int err = al.alGetError(); - if( ALConstants.AL_NO_ERROR != err ) { - if( DEBUG ) { - System.err.println(getThreadName()+": ALAudioSink.growBuffers: Error generating "+frameGrowAmount+" new Buffers: 0x"+Integer.toHexString(err)); - } - return false; - } - alBufferNames = concat(alBufferNames, newALBufferNames); - - final ALAudioFrame[] newALBuffers = new ALAudioFrame[frameGrowAmount]; - for(int i=0; i 0 ) { - final int releaseBufferLimes = Math.max(1, alFramesPlaying.size() / 4 ); - final int[] val=new int[1]; - int i=0; - do { - al.alGetSourcei(alSource[0], ALConstants.AL_BUFFERS_PROCESSED, val, 0); - alErr = al.alGetError(); - if( ALConstants.AL_NO_ERROR != alErr ) { - throw new RuntimeException(getThreadName()+": ALError "+toHexString(alErr)+" while quering processed buffers at source. "+this); - } - if( wait && val[0] < releaseBufferLimes ) { - i++; - // clip wait at [2 .. 100] ms - final int avgBufferDura = chosenFormat.getBytesDuration( alBufferBytesQueued / alFramesPlaying.size() ); - final int sleep = Math.max(2, Math.min(100, releaseBufferLimes * avgBufferDura)); - if( DEBUG ) { - System.err.println(getThreadName()+": ALAudioSink: Dequeue.wait["+i+"]: avgBufferDura "+avgBufferDura+", releaseBufferLimes "+releaseBufferLimes+", sleep "+sleep+" ms, playImpl "+(ALConstants.AL_PLAYING == getSourceState(false))+", processed "+val[0]+", "+this); - } - unlockContext(); - try { - Thread.sleep( sleep - 1 ); - } catch (final InterruptedException e) { - } finally { - lockContext(); - } - } - } while ( wait && val[0] < releaseBufferLimes && alBufferBytesQueued > 0 ); - releaseBufferCount = val[0]; - } else { - releaseBufferCount = 0; - } - - if( releaseBufferCount > 0 ) { - final int[] buffers = new int[releaseBufferCount]; - al.alSourceUnqueueBuffers(alSource[0], releaseBufferCount, buffers, 0); - alErr = al.alGetError(); - if( ALConstants.AL_NO_ERROR != alErr ) { - throw new RuntimeException(getThreadName()+": ALError "+toHexString(alErr)+" while dequeueing "+releaseBufferCount+" buffers. "+this); - } - for ( int i=0; i 0 ) { - System.err.println(getThreadName()+": ALAudioSink: Write "+inPTS+", "+inDuration+" ms, dequeued "+dequeuedBufferCount+", wait "+wait+", "+getPerfString()); - } - } - return dequeuedBufferCount; - } - - @Override - public final AudioFrame enqueueData(final int pts, final ByteBuffer bytes, final int byteCount) { - if( !initialized || null == chosenFormat ) { - return null; - } - final ALAudioFrame alFrame; - - // OpenAL consumes buffers in the background - // we first need to initialize the OpenAL buffers then - // start continuous playback. - lockContext(); - try { - final int duration = chosenFormat.getBytesDuration(byteCount); - final boolean dequeueDone; - if( alFramesAvail.isEmpty() ) { - // try to dequeue first - dequeueDone = dequeueBuffer(false, pts, duration) > 0; - if( alFramesAvail.isEmpty() ) { - // try to grow - growBuffers(); - } - } else { - dequeueDone = false; - } - if( !dequeueDone && alFramesPlaying.size() > 0 ) { // dequeue only possible if playing .. - final boolean wait = isPlayingImpl0() && alFramesAvail.isEmpty(); // possible if grow failed or already exceeds it's limit! - dequeueBuffer(wait, pts, duration); - } - - alFrame = alFramesAvail.get(); - if( null == alFrame ) { - alFramesAvail.dump(System.err, "Avail"); - throw new InternalError("Internal Error: avail.get null "+alFramesAvail+", "+this); - } - alFrame.setPTS(pts); - alFrame.setDuration(duration); - alFrame.setByteSize(byteCount); - if( !alFramesPlaying.put( alFrame ) ) { - throw new InternalError("Internal Error: "+this); - } - final int[] alBufferNames = new int[] { alFrame.alBuffer }; - if( hasSOFTBufferSamples ) { - final int samplesPerChannel = chosenFormat.getBytesSampleCount(byteCount) / chosenFormat.channelCount; - // final int samplesPerChannel = ALHelpers.bytesToSampleCount(byteCount, alChannelLayout, alSampleType); - alExt.alBufferSamplesSOFT(alFrame.alBuffer, chosenFormat.sampleRate, alFormat, - samplesPerChannel, alChannelLayout, alSampleType, bytes); - } else { - al.alBufferData(alFrame.alBuffer, alFormat, bytes, byteCount, chosenFormat.sampleRate); - } - - if(DEBUG_TRACE) { - System.err.println("> "+alFrame.alBuffer+" -> "+shortString()+" @ "+getThreadName()); - } - - al.alSourceQueueBuffers(alSource[0], 1, alBufferNames, 0); - final int alErr = al.alGetError(); - if( ALConstants.AL_NO_ERROR != alErr ) { - throw new RuntimeException(getThreadName()+": ALError "+toHexString(alErr)+" while queueing buffer "+toHexString(alBufferNames[0])+". "+this); - } - alBufferBytesQueued += byteCount; - enqueuedFrameCount++; // safe: only written-to while locked! - - if(DEBUG_TRACE) { - System.err.println(">> "+alFrame.alBuffer+" -> "+shortString()+" @ "+getThreadName()); - } - - playImpl(); // continue playing, fixes issue where we ran out of enqueued data! - } finally { - unlockContext(); - } - return alFrame; - } - - @Override - public final boolean isPlaying() { - if( !initialized || null == chosenFormat ) { - return false; - } - if( playRequested ) { - lockContext(); - try { - return isPlayingImpl0(); - } finally { - unlockContext(); - } - } else { - return false; - } - } - private final boolean isPlayingImpl0() { - if( playRequested ) { - return ALConstants.AL_PLAYING == getSourceState(false); - } else { - return false; - } - } - private final int getSourceState(final boolean ignoreError) { - final int[] val = new int[1]; - al.alGetSourcei(alSource[0], ALConstants.AL_SOURCE_STATE, val, 0); - final int alErr = al.alGetError(); - if( ALConstants.AL_NO_ERROR != alErr ) { - final String msg = getThreadName()+": ALError "+toHexString(alErr)+" while querying SOURCE_STATE. "+this; - if( ignoreError ) { - if( DEBUG ) { - System.err.println(msg); - } - } else { - throw new RuntimeException(msg); - } - } - return val[0]; - } - - @Override - public final void play() { - if( !initialized || null == chosenFormat ) { - return; - } - playRequested = true; - lockContext(); - try { - playImpl(); - if( DEBUG ) { - System.err.println(getThreadName()+": ALAudioSink: PLAY playImpl "+(ALConstants.AL_PLAYING == getSourceState(false))+", "+this); - } - } finally { - unlockContext(); - } - } - private final void playImpl() { - if( playRequested && ALConstants.AL_PLAYING != getSourceState(false) ) { - al.alSourcePlay(alSource[0]); - final int alErr = al.alGetError(); - if( ALConstants.AL_NO_ERROR != alErr ) { - throw new RuntimeException(getThreadName()+": ALError "+toHexString(alErr)+" while start playing. "+this); - } - } - } - - @Override - public final void pause() { - if( !initialized || null == chosenFormat ) { - return; - } - if( playRequested ) { - lockContext(); - try { - pauseImpl(); - if( DEBUG ) { - System.err.println(getThreadName()+": ALAudioSink: PAUSE playImpl "+(ALConstants.AL_PLAYING == getSourceState(false))+", "+this); - } - } finally { - unlockContext(); - } - } - } - private final void pauseImpl() { - if( isPlayingImpl0() ) { - playRequested = false; - al.alSourcePause(alSource[0]); - final int alErr = al.alGetError(); - if( ALConstants.AL_NO_ERROR != alErr ) { - throw new RuntimeException(getThreadName()+": ALError "+toHexString(alErr)+" while pausing. "+this); - } - } - } - private final void stopImpl(final boolean ignoreError) { - if( ALConstants.AL_STOPPED != getSourceState(ignoreError) ) { - playRequested = false; - al.alSourceStop(alSource[0]); - final int alErr = al.alGetError(); - if( ALConstants.AL_NO_ERROR != alErr ) { - final String msg = "ALError "+toHexString(alErr)+" while stopping. "+this; - if( ignoreError ) { - if( DEBUG ) { - System.err.println(getThreadName()+": "+msg); - } - } else { - throw new RuntimeException(getThreadName()+": ALError "+toHexString(alErr)+" while stopping. "+this); - } - } - } - } - - @Override - public final float getPlaySpeed() { return playSpeed; } - - @Override - public final boolean setPlaySpeed(float rate) { - if( !initialized || null == chosenFormat ) { - return false; - } - lockContext(); - try { - if( Math.abs(1.0f - rate) < 0.01f ) { - rate = 1.0f; - } - if( 0.5f <= rate && rate <= 2.0f ) { // OpenAL limits - playSpeed = rate; - al.alSourcef(alSource[0], ALConstants.AL_PITCH, playSpeed); - return true; - } - } finally { - unlockContext(); - } - return false; - } - - @Override - public final float getVolume() { - return volume; - } - - @Override - public final boolean setVolume(float v) { - if( !initialized || null == chosenFormat ) { - return false; - } - lockContext(); - try { - if( Math.abs(v) < 0.01f ) { - v = 0.0f; - } else if( Math.abs(1.0f - v) < 0.01f ) { - v = 1.0f; - } - if( 0.0f <= v && v <= 1.0f ) { // OpenAL limits - volume = v; - al.alSourcef(alSource[0], ALConstants.AL_GAIN, v); - return true; - } - } finally { - unlockContext(); - } - return false; - } - - @Override - public final void flush() { - if( !initialized || null == chosenFormat ) { - return; - } - lockContext(); - try { - // pauseImpl(); - stopImpl(false); - // Redundant: dequeueBuffer( false /* wait */, true /* ignoreBufferInconsistency */); - dequeueForceAll(); - if( alBufferNames.length != alFramesAvail.size() || alFramesPlaying.size() != 0 ) { - throw new InternalError("XXX: "+this); - } - if( DEBUG ) { - System.err.println(getThreadName()+": ALAudioSink: FLUSH playImpl "+(ALConstants.AL_PLAYING == getSourceState(false))+", "+this); - } - } finally { - unlockContext(); - } - } - - @Override - public final int getEnqueuedFrameCount() { - return enqueuedFrameCount; - } - - @Override - public final int getFrameCount() { - return null != alBufferNames ? alBufferNames.length : 0; - } - - @Override - public final int getQueuedFrameCount() { - if( !initialized || null == chosenFormat ) { - return 0; - } - return alFramesPlaying.size(); - } - - @Override - public final int getFreeFrameCount() { - if( !initialized || null == chosenFormat ) { - return 0; - } - return alFramesAvail.size(); - } - - @Override - public final int getQueuedByteCount() { - if( !initialized || null == chosenFormat ) { - return 0; - } - return alBufferBytesQueued; - } - - @Override - public final int getQueuedTime() { - if( !initialized || null == chosenFormat ) { - return 0; - } - return chosenFormat.getBytesDuration(alBufferBytesQueued); - } - - @Override - public final int getPTS() { return playingPTS; } - - private static final String toHexString(final int v) { return "0x"+Integer.toHexString(v); } - private static final String getThreadName() { return Thread.currentThread().getName(); } -} diff --git a/src/jogl/classes/jogamp/opengl/openal/av/ALDummyUsage.java b/src/jogl/classes/jogamp/opengl/openal/av/ALDummyUsage.java deleted file mode 100644 index 4f585937d..000000000 --- a/src/jogl/classes/jogamp/opengl/openal/av/ALDummyUsage.java +++ /dev/null @@ -1,16 +0,0 @@ -package jogamp.opengl.openal.av; - -import com.jogamp.openal.AL; -import com.jogamp.openal.JoalVersion; - -/** - * Demo JOAL usage w/ av dependency, i.e. FFMPEGMediaPlayer .. - */ -public class ALDummyUsage { - static AL al; - - public static void main(final String args[]) { - System.err.println("JOGL> Hello JOAL"); - System.err.println("JOAL: "+JoalVersion.getInstance().toString()); - } -} diff --git a/src/jogl/classes/jogamp/opengl/util/av/GLMediaPlayerImpl.java b/src/jogl/classes/jogamp/opengl/util/av/GLMediaPlayerImpl.java index cffd8426c..e9a154bbb 100644 --- a/src/jogl/classes/jogamp/opengl/util/av/GLMediaPlayerImpl.java +++ b/src/jogl/classes/jogamp/opengl/util/av/GLMediaPlayerImpl.java @@ -51,6 +51,8 @@ import jogamp.opengl.Debug; import com.jogamp.common.net.UriQueryProps; import com.jogamp.common.nio.Buffers; import com.jogamp.common.ExceptionUtils; +import com.jogamp.common.av.AudioSink; +import com.jogamp.common.av.TimeFrameI; import com.jogamp.common.net.Uri; import com.jogamp.common.os.Platform; import com.jogamp.common.util.IOUtil; @@ -60,8 +62,6 @@ import com.jogamp.common.util.LFRingbuffer; import com.jogamp.common.util.Ringbuffer; import com.jogamp.common.util.SourcedInterruptedException; import com.jogamp.opengl.GLExtensions; -import com.jogamp.opengl.util.TimeFrameI; -import com.jogamp.opengl.util.av.AudioSink; import com.jogamp.opengl.util.av.GLMediaPlayer; import com.jogamp.opengl.util.glsl.ShaderCode; import com.jogamp.opengl.util.texture.Texture; @@ -511,7 +511,7 @@ public abstract class GLMediaPlayerImpl implements GLMediaPlayer { * Override if not using AudioSink, or AudioSink's {@link AudioSink#setPlaySpeed(float)} is not sufficient! *

* AudioSink shall respect !audioSinkPlaySpeedSet to determine data_size - * at {@link AudioSink#enqueueData(com.jogamp.opengl.util.av.AudioSink.AudioFrame)}. + * at {@link AudioSink#enqueueData(int, ByteBuffer, int)} *

*/ protected boolean setPlaySpeedImpl(final float rate) { diff --git a/src/jogl/classes/jogamp/opengl/util/av/JavaSoundAudioSink.java b/src/jogl/classes/jogamp/opengl/util/av/JavaSoundAudioSink.java deleted file mode 100644 index 117be5489..000000000 --- a/src/jogl/classes/jogamp/opengl/util/av/JavaSoundAudioSink.java +++ /dev/null @@ -1,228 +0,0 @@ -package jogamp.opengl.util.av; - -import java.nio.ByteBuffer; -import java.util.Arrays; - -import javax.sound.sampled.AudioSystem; -import javax.sound.sampled.DataLine; -import javax.sound.sampled.SourceDataLine; - -import com.jogamp.opengl.util.av.AudioSink; - -/*** - * JavaSound Audio Sink - *

- * FIXME: Parameterize .. all configs .. best via an init-method, passing requested - * audio capabilities - *

- */ -public class JavaSoundAudioSink implements AudioSink { - - // Chunk of audio processed at one time - public static final int BUFFER_SIZE = 1000; - public static final int SAMPLES_PER_BUFFER = BUFFER_SIZE / 2; - private static final boolean staticAvailable; - - // Sample time values - // public static final double SAMPLE_TIME_IN_SECS = 1.0 / DEFAULT_SAMPLE_RATE; - // public static final double BUFFER_TIME_IN_SECS = SAMPLE_TIME_IN_SECS * SAMPLES_PER_BUFFER; - - private javax.sound.sampled.AudioFormat format; - private DataLine.Info info; - private SourceDataLine auline; - private int bufferCount; - private final byte [] sampleData = new byte[BUFFER_SIZE]; - private boolean initialized = false; - private AudioSink.AudioFormat chosenFormat = null; - - private volatile boolean playRequested = false; - private float volume = 1.0f; - - static { - boolean ok = false; - try { - AudioSystem.getAudioFileTypes(); - ok = true; - } catch (final Throwable t) { - - } - staticAvailable=ok; - } - - @Override - public String toString() { - return "JavaSoundSink[init "+initialized+", dataLine "+info+", source "+auline+", bufferCount "+bufferCount+ - ", chosen "+chosenFormat+", jsFormat "+format; - } - - @Override - public final float getPlaySpeed() { return 1.0f; } // FIXME - - @Override - public final boolean setPlaySpeed(final float rate) { - return false; // FIXME - } - - @Override - public final float getVolume() { - // FIXME - return volume; - } - - @Override - public final boolean setVolume(final float v) { - // FIXME - volume = v; - return true; - } - - @Override - public AudioSink.AudioFormat getPreferredFormat() { - return DefaultFormat; - } - - @Override - public final int getMaxSupportedChannels() { - return 2; - } - - @Override - public final boolean isSupported(final AudioSink.AudioFormat format) { - return true; - } - - @Override - public boolean init(final AudioSink.AudioFormat requestedFormat, final float frameDuration, final int initialQueueSize, final int queueGrowAmount, final int queueLimit) { - if( !staticAvailable ) { - return false; - } - // Create the audio format we wish to use - format = new javax.sound.sampled.AudioFormat(requestedFormat.sampleRate, requestedFormat.sampleSize, requestedFormat.channelCount, requestedFormat.signed, !requestedFormat.littleEndian); - - // Create dataline info object describing line format - info = new DataLine.Info(SourceDataLine.class, format); - - // Clear buffer initially - Arrays.fill(sampleData, (byte) 0); - try{ - // Get line to write data to - auline = (SourceDataLine) AudioSystem.getLine(info); - auline.open(format); - auline.start(); - System.out.println("JavaSound audio sink"); - initialized=true; - chosenFormat = requestedFormat; - } catch (final Exception e) { - initialized=false; - } - return true; - } - - @Override - public final AudioFormat getChosenFormat() { - return chosenFormat; - } - - @Override - public boolean isPlaying() { - return playRequested && auline.isRunning(); - } - - @Override - public void play() { - if( null != auline ) { - playRequested = true; - playImpl(); - } - } - private void playImpl() { - if( playRequested && !auline.isRunning() ) { - auline.start(); - } - } - - @Override - public void pause() { - if( null != auline ) { - playRequested = false; - auline.stop(); - } - } - - @Override - public void flush() { - if( null != auline ) { - playRequested = false; - auline.stop(); - auline.flush(); - } - } - - @Override - public final int getEnqueuedFrameCount() { - return 0; // FIXME - } - - @Override - public int getFrameCount() { - return 1; - } - - @Override - public int getQueuedFrameCount() { - return 0; - } - - @Override - public boolean isInitialized() { - return initialized; - } - - @Override - public void destroy() { - initialized = false; - chosenFormat = null; - // FIXEM: complete code! - } - - @Override - public AudioFrame enqueueData(final int pts, final ByteBuffer byteBuffer, final int byteCount) { - final byte[] bytes = new byte[byteCount]; - final int p = byteBuffer.position(); - byteBuffer.get(bytes, 0, byteCount); - byteBuffer.position(p); - - int written = 0; - int len; - int bytesLeft = byteCount; - while (bytesLeft > 0) { - len = auline.write(bytes, written, byteCount); - bytesLeft -= len; - written += len; - } - playImpl(); - return new AudioDataFrame(pts, chosenFormat.getBytesDuration(byteCount), byteBuffer, byteCount); - } - - @Override - public int getQueuedByteCount() { - return auline.getBufferSize() - auline.available(); - } - - @Override - public int getFreeFrameCount() { - return auline.available(); - } - - @Override - public int getQueuedTime() { - return getQueuedTimeImpl( getQueuedByteCount() ); - } - private final int getQueuedTimeImpl(final int byteCount) { - final int bytesPerSample = chosenFormat.sampleSize >>> 3; // /8 - return byteCount / ( chosenFormat.channelCount * bytesPerSample * ( chosenFormat.sampleRate / 1000 ) ); - } - - @Override - public final int getPTS() { return 0; } // FIXME -} diff --git a/src/jogl/classes/jogamp/opengl/util/av/NullAudioSink.java b/src/jogl/classes/jogamp/opengl/util/av/NullAudioSink.java deleted file mode 100644 index 7e27f17c3..000000000 --- a/src/jogl/classes/jogamp/opengl/util/av/NullAudioSink.java +++ /dev/null @@ -1,181 +0,0 @@ -/** - * Copyright 2013 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 jogamp.opengl.util.av; - -import java.nio.ByteBuffer; - -import com.jogamp.opengl.util.av.AudioSink; - -public class NullAudioSink implements AudioSink { - - private volatile float playSpeed = 1.0f; - private volatile boolean playRequested = false; - private volatile int playingPTS = AudioFrame.INVALID_PTS; - private float volume = 1.0f; - - private AudioFormat chosenFormat; - private boolean initialized; - - public NullAudioSink() { - initialized = true; - chosenFormat = null; - } - - @Override - public boolean isInitialized() { - return initialized; - } - - @Override - public final float getPlaySpeed() { return playSpeed; } - - @Override - public final boolean setPlaySpeed(float rate) { - if( Math.abs(1.0f - rate) < 0.01f ) { - rate = 1.0f; - } - playSpeed = rate; - return true; - } - - @Override - public final float getVolume() { - // FIXME - return volume; - } - - @Override - public final boolean setVolume(final float v) { - // FIXME - volume = v; - return true; - } - - @Override - public AudioFormat getPreferredFormat() { - return DefaultFormat; - } - - @Override - public final int getMaxSupportedChannels() { - return 8; - } - - @Override - public final boolean isSupported(final AudioFormat format) { - /** - * If we like to emulate constraints .. - * - if( format.planar || !format.littleEndian ) { - return false; - } - if( format.sampleRate != DefaultFormat.sampleRate ) { - return false; - } - */ - return true; - } - - @Override - public boolean init(final AudioFormat requestedFormat, final float frameDuration, final int initialQueueSize, final int queueGrowAmount, final int queueLimit) { - chosenFormat = requestedFormat; - return true; - } - - @Override - public final AudioFormat getChosenFormat() { - return chosenFormat; - } - - @Override - public boolean isPlaying() { - return playRequested; - } - - @Override - public void play() { - playRequested = true; - } - - @Override - public void pause() { - playRequested = false; - } - - @Override - public void flush() { - } - - @Override - public void destroy() { - initialized = false; - chosenFormat = null; - } - - @Override - public final int getEnqueuedFrameCount() { - return 0; - } - - @Override - public int getFrameCount() { - return 0; - } - - @Override - public int getQueuedFrameCount() { - return 0; - } - - @Override - public int getQueuedByteCount() { - return 0; - } - - @Override - public int getQueuedTime() { - return 0; - } - - @Override - public final int getPTS() { return playingPTS; } - - @Override - public int getFreeFrameCount() { - return 1; - } - - @Override - public AudioFrame enqueueData(final int pts, final ByteBuffer bytes, final int byteCount) { - if( !initialized || null == chosenFormat ) { - return null; - } - playingPTS = pts; - return null; - } -} diff --git a/src/jogl/classes/jogamp/opengl/util/av/NullGLMediaPlayer.java b/src/jogl/classes/jogamp/opengl/util/av/NullGLMediaPlayer.java index 528b62db6..be440adaf 100644 --- a/src/jogl/classes/jogamp/opengl/util/av/NullGLMediaPlayer.java +++ b/src/jogl/classes/jogamp/opengl/util/av/NullGLMediaPlayer.java @@ -35,8 +35,6 @@ import com.jogamp.opengl.GL; import com.jogamp.opengl.GLException; import com.jogamp.opengl.GLProfile; -import jogamp.opengl.util.av.GLMediaPlayerImpl; - import com.jogamp.common.nio.Buffers; import com.jogamp.common.os.Platform; import com.jogamp.common.util.IOUtil; diff --git a/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java b/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java index 232796f1f..13c698486 100644 --- a/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java +++ b/src/jogl/classes/jogamp/opengl/util/av/impl/FFMPEGMediaPlayer.java @@ -35,17 +35,16 @@ import java.security.PrivilegedAction; import com.jogamp.opengl.GL; import com.jogamp.opengl.GL2ES2; import com.jogamp.opengl.GLException; - +import com.jogamp.common.av.AudioSink; +import com.jogamp.common.av.AudioSink.AudioFormat; +import com.jogamp.common.av.AudioSinkFactory; +import com.jogamp.common.av.TimeFrameI; import com.jogamp.common.util.IOUtil; import com.jogamp.common.util.PropertyAccess; import com.jogamp.common.util.SecurityUtil; import com.jogamp.common.util.VersionNumber; import com.jogamp.gluegen.runtime.ProcAddressTable; -import com.jogamp.opengl.util.TimeFrameI; import com.jogamp.opengl.util.GLPixelStorageModes; -import com.jogamp.opengl.util.av.AudioSink; -import com.jogamp.opengl.util.av.AudioSink.AudioFormat; -import com.jogamp.opengl.util.av.AudioSinkFactory; import com.jogamp.opengl.util.av.GLMediaPlayer; import com.jogamp.opengl.util.texture.Texture; @@ -345,7 +344,7 @@ public class FFMPEGMediaPlayer extends GLMediaPlayerImpl { if( GLMediaPlayer.STREAM_ID_NONE == aid ) { audioSink = AudioSinkFactory.createNull(); } else { - audioSink = AudioSinkFactory.createDefault(); + audioSink = AudioSinkFactory.createDefault(FFMPEGMediaPlayer.class.getClassLoader()); } final AudioFormat preferredAudioFormat = audioSink.getPreferredFormat(); if(DEBUG) { -- cgit v1.2.3