Common av classes (*AudioSink, ..) are promoted to gluegen (commit 270172bcbd91f96d4a38a3d73e23d744f57a25b8) and joal (commit 03f4bb63ce8a358b1c2ef303480e1887d72ecb2e)

8 files changed, 9 insertions, 1430 deletions

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<ALAudioFrame> alFramesAvail = null;
-    private Ringbuffer<ALAudioFrame> 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<initialFrameCount; i++) {
-                    alFrames[i] = new ALAudioFrame(alBufferNames[i]);
-                }
-
-                alFramesAvail = new LFRingbuffer<ALAudioFrame>(alFrames);
-                alFramesPlaying = new LFRingbuffer<ALAudioFrame>(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> 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<frameGrowAmount; i++) {
-            newALBuffers[i] = new ALAudioFrame(newALBufferNames[i]);
-        }
-        // alFrames = concat(alFrames , newALBuffers);
-
-        alFramesAvail.growEmptyBuffer(newALBuffers);
-        alFramesPlaying.growFullBuffer(frameGrowAmount);
-        if( alFramesAvail.isEmpty() || alFramesPlaying.isFull() ) {
-            throw new InternalError("Buffers: Avail is empty "+alFramesAvail+" or Playing is full "+alFramesPlaying);
-        }
-        if( DEBUG ) {
-            System.err.println(getThreadName()+": ALAudioSink: Buffer grown "+frameGrowAmount+": Avail "+alFramesAvail+", playing "+alFramesPlaying);
-        }
-        if( DEBUG_TRACE ) {
-            alFramesAvail.dump(System.err, "Avail-grow");
-            alFramesPlaying.dump(System.err, "Playi-grow");
-        }
-        return true;
-    }
-
-    private void destroyBuffers() {
-        if( !staticAvailable ) {
-            return;
-        }
-        if( null != alBufferNames ) {
-            try {
-                al.alDeleteBuffers(alBufferNames.length, alBufferNames, 0);
-            } catch (final Throwable t) {
-                if( DEBUG ) {
-                    System.err.println("Caught "+t.getClass().getName()+": "+t.getMessage());
-                    t.printStackTrace();
-                }
-            }
-            alFramesAvail.clear();
-            alFramesAvail = null;
-            alFramesPlaying.clear();
-            alFramesPlaying = null;
-            alBufferBytesQueued = 0;
-            // alFrames = null;
-            alBufferNames = null;
-        }
-    }
-
-    @Override
-    public final void destroy() {
-        initialized = false;
-        if( !staticAvailable ) {
-            return;
-        }
-        if( null != context ) {
-            lockContext();
-        }
-        try {
-            stopImpl(true);
-            if( null != alSource ) {
-                try {
-                    al.alDeleteSources(1, alSource, 0);
-                } catch (final Throwable t) {
-                    if( DEBUG ) {
-                        System.err.println("Caught "+t.getClass().getName()+": "+t.getMessage());
-                        t.printStackTrace();
-                    }
-                }
-                alSource = null;
-            }
-
-            destroyBuffers();
-        } finally {
-            destroyContext();
-        }
-        if( null != device ) {
-            try {
-                alc.alcCloseDevice(device);
-            } catch (final Throwable t) {
-                if( DEBUG ) {
-                    System.err.println("Caught "+t.getClass().getName()+": "+t.getMessage());
-                    t.printStackTrace();
-                }
-            }
-            device = null;
-        }
-        chosenFormat = null;
-    }
-
-    @Override
-    public final boolean isInitialized() {
-        return initialized;
-    }
-
-    private final int dequeueBuffer(final boolean wait, final boolean ignoreBufferInconsistency) {
-        int alErr = ALConstants.AL_NO_ERROR;
-        final int releaseBufferCount;
-        if( alBufferBytesQueued > 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<releaseBufferCount; i++ ) {
-                final ALAudioFrame releasedBuffer = alFramesPlaying.get();
-                if( null == releasedBuffer ) {
-                    if( !ignoreBufferInconsistency ) {
-                        throw new InternalError("Internal Error: "+this);
-                    }
-                } else {
-                    if(DEBUG_TRACE) {
-                        System.err.println("<  [al "+buffers[i]+", q "+releasedBuffer.alBuffer+"] <- "+shortString()+" @ "+getThreadName());
-                    }
-                    if( releasedBuffer.alBuffer != buffers[i] ) {
-                        if( !ignoreBufferInconsistency ) {
-                            alFramesAvail.dump(System.err, "Avail-deq02-post");
-                            alFramesPlaying.dump(System.err, "Playi-deq02-post");
-                            throw new InternalError("Buffer name mismatch: dequeued: "+buffers[i]+", released "+releasedBuffer+", "+this);
-                        }
-                    }
-                    alBufferBytesQueued -= releasedBuffer.getByteSize();
-                    if( !alFramesAvail.put(releasedBuffer) ) {
-                        throw new InternalError("Internal Error: "+this);
-                    }
-                    if(DEBUG_TRACE) {
-                        System.err.println("<< [al "+buffers[i]+", q "+releasedBuffer.alBuffer+"] <- "+shortString()+" @ "+getThreadName());
-                    }
-                }
-            }
-        }
-        return releaseBufferCount;
-    }
-    private final void dequeueForceAll() {
-        if(DEBUG_TRACE) {
-            System.err.println("<   _FLUSH_  <- "+shortString()+" @ "+getThreadName());
-        }
-        final int[] val=new int[1];
-        al.alSourcei(alSource[0], ALConstants.AL_BUFFER, 0); // explicit force zero buffer!
-        if(DEBUG_TRACE) {
-            al.alGetSourcei(alSource[0], ALConstants.AL_BUFFERS_PROCESSED, val, 0);
-        }
-        final int alErr = al.alGetError();
-        while ( !alFramesPlaying.isEmpty() ) {
-            final ALAudioFrame releasedBuffer = alFramesPlaying.get();
-            if( null == releasedBuffer ) {
-                throw new InternalError("Internal Error: "+this);
-            }
-            alBufferBytesQueued -= releasedBuffer.getByteSize();
-            if( !alFramesAvail.put(releasedBuffer) ) {
-                throw new InternalError("Internal Error: "+this);
-            }
-        }
-        alBufferBytesQueued = 0;
-        if(DEBUG_TRACE) {
-            System.err.println("<<  _FLUSH_  [al "+val[0]+", err "+toHexString(alErr)+"] <- "+shortString()+" @ "+getThreadName());
-            ExceptionUtils.dumpStack(System.err);
-        }
-    }
-
-    private final int dequeueBuffer(final boolean wait, final int inPTS, final int inDuration) {
-        final int dequeuedBufferCount = dequeueBuffer( wait, false /* ignoreBufferInconsistency */ );
-        final ALAudioFrame currentBuffer = alFramesPlaying.peek();
-        if( null != currentBuffer ) {
-            playingPTS = currentBuffer.getPTS();
-        } else {
-            playingPTS = inPTS;
-        }
-        if( DEBUG ) {
-            if( dequeuedBufferCount > 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!
      * <p>
      * AudioSink shall respect <code>!audioSinkPlaySpeedSet</code> to determine data_size
-     * at {@link AudioSink#enqueueData(com.jogamp.opengl.util.av.AudioSink.AudioFrame)}.
+     * at {@link AudioSink#enqueueData(int, ByteBuffer, int)}
      * </p>
      */
     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
- * <p>
- * FIXME: Parameterize .. all configs .. best via an init-method, passing requested
- * audio capabilities
- * </p>
- */
-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) {