--- a/src/java.desktop/share/classes/com/sun/media/sound/EventDispatcher.java Wed Jul 11 13:17:48 2018 +0300
+++ b/src/java.desktop/share/classes/com/sun/media/sound/EventDispatcher.java Wed Jul 11 13:41:25 2018 +0300
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -308,7 +308,12 @@
* called from auto-closing clips when their closed() method is called.
*/
void autoClosingClipClosed(AutoClosingClip clip) {
- // nothing to do -- is removed from arraylist above
+ synchronized(autoClosingClips) {
+ int index = getAutoClosingClipIndex(clip);
+ if (index != -1) {
+ autoClosingClips.remove(index);
+ }
+ }
}
--- a/src/java.desktop/share/classes/com/sun/media/sound/JavaSoundAudioClip.java Wed Jul 11 13:17:48 2018 +0300
+++ b/src/java.desktop/share/classes/com/sun/media/sound/JavaSoundAudioClip.java Wed Jul 11 13:41:25 2018 +0300
@@ -173,29 +173,31 @@
if (DEBUG || Printer.debug) Printer.debug("JavaSoundAudioClip.startImpl(loop="+loop+")");
try {
if (clip != null) {
- if (!clip.isOpen()) {
- if (DEBUG || Printer.trace)Printer.trace("JavaSoundAudioClip: clip.open()");
- clip.open(loadedAudioFormat, loadedAudio, 0, loadedAudioByteLength);
- } else {
- if (DEBUG || Printer.trace)Printer.trace("JavaSoundAudioClip: clip.flush()");
- clip.flush();
- if (loop != clipLooping) {
- // need to stop in case the looped status changed
- if (DEBUG || Printer.trace)Printer.trace("JavaSoundAudioClip: clip.stop()");
- clip.stop();
+ // We need to disable autoclosing mechanism otherwise the clip
+ // can be closed after "!clip.isOpen()" check, because of
+ // previous inactivity.
+ clip.setAutoClosing(false);
+ try {
+ if (!clip.isOpen()) {
+ clip.open(loadedAudioFormat, loadedAudio, 0,
+ loadedAudioByteLength);
+ } else {
+ clip.flush();
+ if (loop != clipLooping) {
+ // need to stop in case the looped status changed
+ clip.stop();
+ }
}
+ clip.setFramePosition(0);
+ if (loop) {
+ clip.loop(Clip.LOOP_CONTINUOUSLY);
+ } else {
+ clip.start();
+ }
+ clipLooping = loop;
+ } finally {
+ clip.setAutoClosing(true);
}
- clip.setFramePosition(0);
- if (loop) {
- if (DEBUG || Printer.trace)Printer.trace("JavaSoundAudioClip: clip.loop()");
- clip.loop(Clip.LOOP_CONTINUOUSLY);
- } else {
- if (DEBUG || Printer.trace)Printer.trace("JavaSoundAudioClip: clip.start()");
- clip.start();
- }
- clipLooping = loop;
- if (DEBUG || Printer.debug)Printer.debug("Clip should be playing/looping");
-
} else if (datapusher != null ) {
datapusher.start(loop);
if (DEBUG || Printer.debug)Printer.debug("Stream should be playing/looping");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/javax/sound/sampled/Clip/AutoCloseTimeCheck.java Wed Jul 11 13:41:25 2018 +0300
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.applet.AudioClip;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.util.concurrent.TimeUnit;
+
+import javax.sound.sampled.AudioFileFormat.Type;
+import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.AudioSystem;
+
+import static javax.sound.sampled.AudioFormat.Encoding.PCM_SIGNED;
+import static javax.sound.sampled.AudioSystem.NOT_SPECIFIED;
+
+/**
+ * @test
+ * @bug 8202264
+ */
+public final class AutoCloseTimeCheck {
+
+ public static void main(final String[] args) throws Exception {
+ // Prepare the audio file
+ File file = new File("audio.wav");
+ try {
+ AudioFormat format =
+ new AudioFormat(PCM_SIGNED, 44100, 8, 1, 1, 44100, false);
+ AudioSystem.write(getStream(format), Type.WAVE, file);
+ } catch (final Exception ignored) {
+ return; // the test is not applicable
+ }
+ try {
+ testSmallDelay(file);
+ testBigDelay(file);
+ } finally {
+ Files.delete(file.toPath());
+ }
+ }
+
+ /**
+ * Checks that after a big period of non-activity the clip will be closed
+ * and the "Direct Clip" thread will stop.
+ */
+ private static void testBigDelay(final File file) throws Exception {
+ AudioClip clip = (AudioClip) file.toURL().getContent();
+ clip.loop();
+ clip.stop();
+ sleep(20000); // 20 sec for slow systems
+ if (count() != 0) {
+ throw new RuntimeException("Thread was found");
+ }
+ }
+
+ /**
+ * Checks that after small period of non-activity the clip will not be
+ * closed and the "Direct Clip" thread will alive.
+ */
+ private static void testSmallDelay(final File file) throws IOException {
+ AudioClip clip = (AudioClip) file.toURL().getContent();
+ long threadID = 0;
+ // Will run the test no more than 15 seconds
+ long endtime = System.nanoTime() + TimeUnit.SECONDS.toNanos(15);
+ while (endtime - System.nanoTime() > 0) {
+ clip.loop();
+ sleep(500);
+
+ long data = count();
+ if (data != threadID) {
+ System.out.println("Playing on new thread: " + data + " at "
+ + new java.util.Date());
+ if (threadID == 0) {
+ threadID = data;
+ } else {
+ throw new RuntimeException("Thread was changed");
+ }
+ }
+
+ clip.stop();
+ sleep(500);
+ }
+ }
+
+ private static void sleep(int millis) {
+ try {
+ Thread.sleep(millis);
+ } catch (InterruptedException ignored) {
+ }
+ }
+
+ private static long count() {
+ for (final Thread t : Thread.getAllStackTraces().keySet()) {
+ if (t.getName().equals("Direct Clip")) {
+ return t.getId();
+ }
+ }
+ return 0;
+ }
+
+ private static AudioInputStream getStream(final AudioFormat format) {
+ final int dataSize = 5000 * format.getFrameSize();
+ final InputStream in = new ByteArrayInputStream(new byte[dataSize]);
+ return new AudioInputStream(in, format, NOT_SPECIFIED);
+ }
+}