-
-JNIEXPORT void JNICALL
-Java_sun_nio_ch_KQueuePort_socketpair(JNIEnv* env, jclass clazz, jintArray sv) {
- int sp[2];
- if (socketpair(PF_UNIX, SOCK_STREAM, 0, sp) == -1) {
- JNU_ThrowIOExceptionWithLastError(env, "socketpair failed");
- } else {
- jint res[2];
- res[0] = (jint)sp[0];
- res[1] = (jint)sp[1];
- (*env)->SetIntArrayRegion(env, sv, 0, 2, &res[0]);
- }
-}
-
-JNIEXPORT void JNICALL
-Java_sun_nio_ch_KQueuePort_interrupt(JNIEnv *env, jclass c, jint fd) {
- int res;
- int buf[1];
- buf[0] = 1;
- RESTARTABLE(write(fd, buf, 1), res);
- if (res < 0) {
- JNU_ThrowIOExceptionWithLastError(env, "write failed");
- }
-}
-
-JNIEXPORT void JNICALL
-Java_sun_nio_ch_KQueuePort_drain1(JNIEnv *env, jclass cl, jint fd) {
- int res;
- char buf[1];
- RESTARTABLE(read(fd, buf, 1), res);
- if (res < 0) {
- JNU_ThrowIOExceptionWithLastError(env, "drain1 failed");
- }
-}
-
-JNIEXPORT void JNICALL
-Java_sun_nio_ch_KQueuePort_close0(JNIEnv *env, jclass c, jint fd) {
- int res;
- RESTARTABLE(close(fd), res);
-}
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/java/io/ByteArrayInputStream.java
--- a/src/java.base/share/classes/java/io/ByteArrayInputStream.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/java/io/ByteArrayInputStream.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 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
@@ -25,12 +25,15 @@
package java.io;
+import java.util.Arrays;
+import java.util.Objects;
+
/**
- * A ByteArrayInputStream contains
+ * A {@code ByteArrayInputStream} contains
* an internal buffer that contains bytes that
* may be read from the stream. An internal
* counter keeps track of the next byte to
- * be supplied by the read method.
+ * be supplied by the {@code read} method.
*
* Closing a {@code ByteArrayInputStream} has no effect. The methods in
* this class can be called after the stream has been closed without
@@ -40,15 +43,14 @@
* @see java.io.StringBufferInputStream
* @since 1.0
*/
-public
-class ByteArrayInputStream extends InputStream {
+public class ByteArrayInputStream extends InputStream {
/**
* An array of bytes that was provided
- * by the creator of the stream. Elements buf[0]
- * through buf[count-1] are the
+ * by the creator of the stream. Elements {@code buf[0]}
+ * through {@code buf[count-1]} are the
* only bytes that can ever be read from the
- * stream; element buf[pos] is
+ * stream; element {@code buf[pos]} is
* the next byte to be read.
*/
protected byte buf[];
@@ -56,9 +58,9 @@
/**
* The index of the next character to read from the input stream buffer.
* This value should always be nonnegative
- * and not larger than the value of count.
+ * and not larger than the value of {@code count}.
* The next byte to be read from the input stream buffer
- * will be buf[pos].
+ * will be {@code buf[pos]}.
*/
protected int pos;
@@ -66,9 +68,9 @@
* The currently marked position in the stream.
* ByteArrayInputStream objects are marked at position zero by
* default when constructed. They may be marked at another
- * position within the buffer by the mark() method.
+ * position within the buffer by the {@code mark()} method.
* The current buffer position is set to this point by the
- * reset() method.
+ * {@code reset()} method.
*
* If no mark has been set, then the value of mark is the offset
* passed to the constructor (or 0 if the offset was not supplied).
@@ -81,22 +83,22 @@
* The index one greater than the last valid character in the input
* stream buffer.
* This value should always be nonnegative
- * and not larger than the length of buf.
+ * and not larger than the length of {@code buf}.
* It is one greater than the position of
- * the last byte within buf that
+ * the last byte within {@code buf} that
* can ever be read from the input stream buffer.
*/
protected int count;
/**
- * Creates a ByteArrayInputStream
- * so that it uses buf as its
+ * Creates a {@code ByteArrayInputStream}
+ * so that it uses {@code buf} as its
* buffer array.
* The buffer array is not copied.
- * The initial value of pos
- * is 0 and the initial value
- * of count is the length of
- * buf.
+ * The initial value of {@code pos}
+ * is {@code 0} and the initial value
+ * of {@code count} is the length of
+ * {@code buf}.
*
* @param buf the input buffer.
*/
@@ -107,12 +109,12 @@
}
/**
- * Creates ByteArrayInputStream
- * that uses buf as its
- * buffer array. The initial value of pos
- * is offset and the initial value
- * of count is the minimum of offset+length
- * and buf.length.
+ * Creates {@code ByteArrayInputStream}
+ * that uses {@code buf} as its
+ * buffer array. The initial value of {@code pos}
+ * is {@code offset} and the initial value
+ * of {@code count} is the minimum of {@code offset+length}
+ * and {@code buf.length}.
* The buffer array is not copied. The buffer's mark is
* set to the specified offset.
*
@@ -129,15 +131,15 @@
/**
* Reads the next byte of data from this input stream. The value
- * byte is returned as an int in the range
- * 0 to 255. If no byte is available
+ * byte is returned as an {@code int} in the range
+ * {@code 0} to {@code 255}. If no byte is available
* because the end of the stream has been reached, the value
- * -1 is returned.
+ * {@code -1} is returned.
*
- * This read method
+ * This {@code read} method
* cannot block.
*
- * @return the next byte of data, or -1 if the end of the
+ * @return the next byte of data, or {@code -1} if the end of the
* stream has been reached.
*/
public synchronized int read() {
@@ -145,40 +147,30 @@
}
/**
- * Reads up to len bytes of data into an array of bytes
- * from this input stream.
- * If pos equals count,
- * then -1 is returned to indicate
- * end of file. Otherwise, the number k
- * of bytes read is equal to the smaller of
- * len and count-pos.
- * If k is positive, then bytes
- * buf[pos] through buf[pos+k-1]
- * are copied into b[off] through
- * b[off+k-1] in the manner performed
- * by System.arraycopy. The
- * value k is added into pos
- * and k is returned.
+ * Reads up to {@code len} bytes of data into an array of bytes from this
+ * input stream. If {@code pos} equals {@code count}, then {@code -1} is
+ * returned to indicate end of file. Otherwise, the number {@code k} of
+ * bytes read is equal to the smaller of {@code len} and {@code count-pos}.
+ * If {@code k} is positive, then bytes {@code buf[pos]} through
+ * {@code buf[pos+k-1]} are copied into {@code b[off]} through
+ * {@code b[off+k-1]} in the manner performed by {@code System.arraycopy}.
+ * The value {@code k} is added into {@code pos} and {@code k} is returned.
*
- * This read method cannot block.
+ * This {@code read} method cannot block.
*
* @param b the buffer into which the data is read.
- * @param off the start offset in the destination array b
+ * @param off the start offset in the destination array {@code b}
* @param len the maximum number of bytes read.
* @return the total number of bytes read into the buffer, or
- * -1 if there is no more data because the end of
+ * {@code -1} if there is no more data because the end of
* the stream has been reached.
- * @exception NullPointerException If b is null.
- * @exception IndexOutOfBoundsException If off is negative,
- * len is negative, or len is greater than
- * b.length - off
+ * @throws NullPointerException If {@code b} is {@code null}.
+ * @throws IndexOutOfBoundsException If {@code off} is negative,
+ * {@code len} is negative, or {@code len} is greater than
+ * {@code b.length - off}
*/
public synchronized int read(byte b[], int off, int len) {
- if (b == null) {
- throw new NullPointerException();
- } else if (off < 0 || len < 0 || len > b.length - off) {
- throw new IndexOutOfBoundsException();
- }
+ Objects.checkFromIndexSize(off, len, b.length);
if (pos >= count) {
return -1;
@@ -196,14 +188,32 @@
return len;
}
+ public synchronized byte[] readAllBytes() {
+ byte[] result = Arrays.copyOfRange(buf, pos, count);
+ pos = count;
+ return result;
+ }
+
+ public int readNBytes(byte[] b, int off, int len) {
+ int n = read(b, off, len);
+ return n == -1 ? 0 : n;
+ }
+
+ public synchronized long transferTo(OutputStream out) throws IOException {
+ int len = count - pos;
+ out.write(buf, pos, len);
+ pos = count;
+ return len;
+ }
+
/**
- * Skips n bytes of input from this input stream. Fewer
+ * Skips {@code n} bytes of input from this input stream. Fewer
* bytes might be skipped if the end of the input stream is reached.
- * The actual number k
+ * The actual number {@code k}
* of bytes to be skipped is equal to the smaller
- * of n and count-pos.
- * The value k is added into pos
- * and k is returned.
+ * of {@code n} and {@code count-pos}.
+ * The value {@code k} is added into {@code pos}
+ * and {@code k} is returned.
*
* @param n the number of bytes to be skipped.
* @return the actual number of bytes skipped.
@@ -222,7 +232,7 @@
* Returns the number of remaining bytes that can be read (or skipped over)
* from this input stream.
*
- * The value returned is count - pos,
+ * The value returned is {@code count - pos},
* which is the number of bytes remaining to be read from the input buffer.
*
* @return the number of remaining bytes that can be read (or skipped
@@ -233,9 +243,9 @@
}
/**
- * Tests if this InputStream supports mark/reset. The
- * markSupported method of ByteArrayInputStream
- * always returns true.
+ * Tests if this {@code InputStream} supports mark/reset. The
+ * {@code markSupported} method of {@code ByteArrayInputStream}
+ * always returns {@code true}.
*
* @since 1.1
*/
@@ -253,7 +263,7 @@
* offset passed to the constructor (or 0 if the offset was not
* supplied).
*
- *
Note: The readAheadLimit for this class
+ *
Note: The {@code readAheadLimit} for this class
* has no meaning.
*
* @since 1.1
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/java/lang/invoke/ProxyClassesDumper.java
--- a/src/java.base/share/classes/java/lang/invoke/ProxyClassesDumper.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/java/lang/invoke/ProxyClassesDumper.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -30,7 +30,6 @@
import java.nio.file.Files;
import java.nio.file.InvalidPathException;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Objects;
@@ -63,7 +62,7 @@
}
try {
path = path.trim();
- final Path dir = Paths.get(path.length() == 0 ? "." : path);
+ final Path dir = Path.of(path.length() == 0 ? "." : path);
AccessController.doPrivileged(new PrivilegedAction<>() {
@Override
public Void run() {
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java
--- a/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -34,7 +34,6 @@
import java.lang.reflect.Method;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedList;
@@ -346,11 +345,11 @@
int i = name.lastIndexOf('.');
Path path;
if (i > 0) {
- Path dir = Paths.get(name.substring(0, i).replace('.', File.separatorChar));
+ Path dir = Path.of(name.substring(0, i).replace('.', File.separatorChar));
Files.createDirectories(dir);
path = dir.resolve(name.substring(i+1, name.length()) + ".class");
} else {
- path = Paths.get(name + ".class");
+ path = Path.of(name + ".class");
}
Files.write(path, classFile);
return null;
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/java/nio/StringCharBuffer.java
--- a/src/java.base/share/classes/java/nio/StringCharBuffer.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/java/nio/StringCharBuffer.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -149,7 +149,7 @@
that, that.position(),
Math.min(this.remaining(), that.remaining()));
if (i >= 0) {
- return Character.compare(this.get(this.position() + i), that.get(this.position() + i));
+ return Character.compare(this.get(this.position() + i), that.get(that.position() + i));
}
return this.remaining() - that.remaining();
}
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/java/nio/X-Buffer.java.template
--- a/src/java.base/share/classes/java/nio/X-Buffer.java.template Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/java/nio/X-Buffer.java.template Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -1337,7 +1337,7 @@
that, that.position(),
Math.min(this.remaining(), that.remaining()));
if (i >= 0) {
- return compare(this.get(this.position() + i), that.get(this.position() + i));
+ return compare(this.get(this.position() + i), that.get(that.position() + i));
}
return this.remaining() - that.remaining();
}
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/java/nio/channels/DatagramChannel.java
--- a/src/java.base/share/classes/java/nio/channels/DatagramChannel.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/java/nio/channels/DatagramChannel.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -279,6 +279,9 @@
*
* @return This datagram channel
*
+ * @throws AlreadyConnectedException
+ * If this channel is already connected
+ *
* @throws ClosedChannelException
* If this channel is closed
*
@@ -292,6 +295,12 @@
* closing the channel and setting the current thread's
* interrupt status
*
+ * @throws UnresolvedAddressException
+ * If the given remote address is not fully resolved
+ *
+ * @throws UnsupportedAddressTypeException
+ * If the type of the given remote address is not supported
+ *
* @throws SecurityException
* If a security manager has been installed
* and it does not permit access to the given remote address
@@ -444,6 +453,10 @@
* zero if there was insufficient room for the datagram in the
* underlying output buffer
*
+ * @throws AlreadyConnectedException
+ * If this channel is connected to a different address
+ * from that specified by {@code target}
+ *
* @throws ClosedChannelException
* If this channel is closed
*
@@ -457,6 +470,12 @@
* closing the channel and setting the current thread's
* interrupt status
*
+ * @throws UnresolvedAddressException
+ * If the given remote address is not fully resolved
+ *
+ * @throws UnsupportedAddressTypeException
+ * If the type of the given remote address is not supported
+ *
* @throws SecurityException
* If a security manager has been installed
* and it does not permit datagrams to be sent
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/java/nio/file/Path.java
--- a/src/java.base/share/classes/java/nio/file/Path.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/java/nio/file/Path.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -28,6 +28,7 @@
import java.io.File;
import java.io.IOException;
import java.net.URI;
+import java.nio.file.spi.FileSystemProvider;
import java.util.Iterator;
import java.util.NoSuchElementException;
@@ -93,13 +94,125 @@
* multiple concurrent threads.
*
* @since 1.7
- * @see Paths
*/
public interface Path
extends Comparable, Iterable, Watchable
{
/**
+ * Returns a {@code Path} by converting a path string, or a sequence of
+ * strings that when joined form a path string. If {@code more} does not
+ * specify any elements then the value of the {@code first} parameter is
+ * the path string to convert. If {@code more} specifies one or more
+ * elements then each non-empty string, including {@code first}, is
+ * considered to be a sequence of name elements and is joined to form a
+ * path string. The details as to how the Strings are joined is provider
+ * specific but typically they will be joined using the
+ * {@link FileSystem#getSeparator name-separator} as the separator.
+ * For example, if the name separator is "{@code /}" and
+ * {@code getPath("/foo","bar","gus")} is invoked, then the path string
+ * {@code "/foo/bar/gus"} is converted to a {@code Path}. A {@code Path}
+ * representing an empty path is returned if {@code first} is the empty
+ * string and {@code more} does not contain any non-empty strings.
+ *
+ * The {@code Path} is obtained by invoking the {@link FileSystem#getPath
+ * getPath} method of the {@link FileSystems#getDefault default} {@link
+ * FileSystem}.
+ *
+ *
Note that while this method is very convenient, using it will imply
+ * an assumed reference to the default {@code FileSystem} and limit the
+ * utility of the calling code. Hence it should not be used in library code
+ * intended for flexible reuse. A more flexible alternative is to use an
+ * existing {@code Path} instance as an anchor, such as:
+ *
{@code
+ * Path dir = ...
+ * Path path = dir.resolve("file");
+ * }
+ *
+ * @param first
+ * the path string or initial part of the path string
+ * @param more
+ * additional strings to be joined to form the path string
+ *
+ * @return the resulting {@code Path}
+ *
+ * @throws InvalidPathException
+ * if the path string cannot be converted to a {@code Path}
+ *
+ * @see FileSystem#getPath
+ *
+ * @since 11
+ */
+ public static Path of(String first, String... more) {
+ return FileSystems.getDefault().getPath(first, more);
+ }
+
+ /**
+ * Returns a {@code Path} by converting a URI.
+ *
+ * This method iterates over the {@link FileSystemProvider#installedProviders()
+ * installed} providers to locate the provider that is identified by the
+ * URI {@link URI#getScheme scheme} of the given URI. URI schemes are
+ * compared without regard to case. If the provider is found then its {@link
+ * FileSystemProvider#getPath getPath} method is invoked to convert the
+ * URI.
+ *
+ *
In the case of the default provider, identified by the URI scheme
+ * "file", the given URI has a non-empty path component, and undefined query
+ * and fragment components. Whether the authority component may be present
+ * is platform specific. The returned {@code Path} is associated with the
+ * {@link FileSystems#getDefault default} file system.
+ *
+ *
The default provider provides a similar round-trip guarantee
+ * to the {@link java.io.File} class. For a given {@code Path} p it
+ * is guaranteed that
+ *
{@code
+ * Path.of(}p{@code .}{@link Path#toUri() toUri}{@code ()).equals(}
+ * p{@code .}{@link Path#toAbsolutePath() toAbsolutePath}{@code ())}
+ *
+ * so long as the original {@code Path}, the {@code URI}, and the new {@code
+ * Path} are all created in (possibly different invocations of) the same
+ * Java virtual machine. Whether other providers make any guarantees is
+ * provider specific and therefore unspecified.
+ *
+ * @param uri
+ * the URI to convert
+ *
+ * @return the resulting {@code Path}
+ *
+ * @throws IllegalArgumentException
+ * if preconditions on the {@code uri} parameter do not hold. The
+ * format of the URI is provider specific.
+ * @throws FileSystemNotFoundException
+ * The file system, identified by the URI, does not exist and
+ * cannot be created automatically, or the provider identified by
+ * the URI's scheme component is not installed
+ * @throws SecurityException
+ * if a security manager is installed and it denies an unspecified
+ * permission to access the file system
+ *
+ * @since 11
+ */
+ public static Path of(URI uri) {
+ String scheme = uri.getScheme();
+ if (scheme == null)
+ throw new IllegalArgumentException("Missing scheme");
+
+ // check for default provider to avoid loading of installed providers
+ if (scheme.equalsIgnoreCase("file"))
+ return FileSystems.getDefault().provider().getPath(uri);
+
+ // try to find provider
+ for (FileSystemProvider provider: FileSystemProvider.installedProviders()) {
+ if (provider.getScheme().equalsIgnoreCase(scheme)) {
+ return provider.getPath(uri);
+ }
+ }
+
+ throw new FileSystemNotFoundException("Provider \"" + scheme + "\" not installed");
+ }
+
+ /**
* Returns the file system that created this object.
*
* @return the file system that created this object
@@ -527,7 +640,7 @@
* to the {@link java.io.File} class. For a given {@code Path} p it
* is guaranteed that
*
- * {@link Paths#get(URI) Paths.get}{@code (}p{@code .toUri()).equals(}p
+ * {@link Path#of(URI) Path.of}{@code (}p{@code .toUri()).equals(}p
* {@code .}{@link #toAbsolutePath() toAbsolutePath}{@code ())}
*
* so long as the original {@code Path}, the {@code URI}, and the new {@code
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/java/nio/file/Paths.java
--- a/src/java.base/share/classes/java/nio/file/Paths.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/java/nio/file/Paths.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -32,7 +32,13 @@
* This class consists exclusively of static methods that return a {@link Path}
* by converting a path string or {@link URI}.
*
+ * @apiNote
+ * It is recommended to obtain a {@code Path} via the {@code Path.of} methods
+ * instead of via the {@code get} methods defined in this class as this class
+ * may be deprecated in a future release.
+ *
* @since 1.7
+ * @see Path
*/
public final class Paths {
@@ -40,33 +46,11 @@
/**
* Converts a path string, or a sequence of strings that when joined form
- * a path string, to a {@code Path}. If {@code more} does not specify any
- * elements then the value of the {@code first} parameter is the path string
- * to convert. If {@code more} specifies one or more elements then each
- * non-empty string, including {@code first}, is considered to be a sequence
- * of name elements (see {@link Path}) and is joined to form a path string.
- * The details as to how the Strings are joined is provider specific but
- * typically they will be joined using the {@link FileSystem#getSeparator
- * name-separator} as the separator. For example, if the name separator is
- * "{@code /}" and {@code getPath("/foo","bar","gus")} is invoked, then the
- * path string {@code "/foo/bar/gus"} is converted to a {@code Path}.
- * A {@code Path} representing an empty path is returned if {@code first}
- * is the empty string and {@code more} does not contain any non-empty
- * strings.
+ * a path string, to a {@code Path}.
*
- * The {@code Path} is obtained by invoking the {@link FileSystem#getPath
- * getPath} method of the {@link FileSystems#getDefault default} {@link
- * FileSystem}.
- *
- *
Note that while this method is very convenient, using it will imply
- * an assumed reference to the default {@code FileSystem} and limit the
- * utility of the calling code. Hence it should not be used in library code
- * intended for flexible reuse. A more flexible alternative is to use an
- * existing {@code Path} instance as an anchor, such as:
- *
- * Path dir = ...
- * Path path = dir.resolve("file");
- *
+ * @implSpec
+ * This method simply invokes {@link Path#of(String,String...)
+ * Path.of(String, String...)} with the given parameters.
*
* @param first
* the path string or initial part of the path string
@@ -79,38 +63,17 @@
* if the path string cannot be converted to a {@code Path}
*
* @see FileSystem#getPath
+ * @see Path#of(String,String...)
*/
public static Path get(String first, String... more) {
- return FileSystems.getDefault().getPath(first, more);
+ return Path.of(first, more);
}
/**
* Converts the given URI to a {@link Path} object.
*
- * This method iterates over the {@link FileSystemProvider#installedProviders()
- * installed} providers to locate the provider that is identified by the
- * URI {@link URI#getScheme scheme} of the given URI. URI schemes are
- * compared without regard to case. If the provider is found then its {@link
- * FileSystemProvider#getPath getPath} method is invoked to convert the
- * URI.
- *
- *
In the case of the default provider, identified by the URI scheme
- * "file", the given URI has a non-empty path component, and undefined query
- * and fragment components. Whether the authority component may be present
- * is platform specific. The returned {@code Path} is associated with the
- * {@link FileSystems#getDefault default} file system.
- *
- *
The default provider provides a similar round-trip guarantee
- * to the {@link java.io.File} class. For a given {@code Path} p it
- * is guaranteed that
- *
{@code
- * Paths.get(}p{@code .}{@link Path#toUri() toUri}{@code ()).equals(}
- * p{@code .}{@link Path#toAbsolutePath() toAbsolutePath}{@code ())}
- *
- * so long as the original {@code Path}, the {@code URI}, and the new {@code
- * Path} are all created in (possibly different invocations of) the same
- * Java virtual machine. Whether other providers make any guarantees is
- * provider specific and therefore unspecified.
+ * @implSpec
+ * This method simply invokes {@link Path#of(URI) * Path.of(URI)} with the given parameter.
*
* @param uri
* the URI to convert
@@ -127,23 +90,10 @@
* @throws SecurityException
* if a security manager is installed and it denies an unspecified
* permission to access the file system
+ *
+ * @see Path#of(URI)
*/
public static Path get(URI uri) {
- String scheme = uri.getScheme();
- if (scheme == null)
- throw new IllegalArgumentException("Missing scheme");
-
- // check for default provider to avoid loading of installed providers
- if (scheme.equalsIgnoreCase("file"))
- return FileSystems.getDefault().provider().getPath(uri);
-
- // try to find provider
- for (FileSystemProvider provider: FileSystemProvider.installedProviders()) {
- if (provider.getScheme().equalsIgnoreCase(scheme)) {
- return provider.getPath(uri);
- }
- }
-
- throw new FileSystemNotFoundException("Provider \"" + scheme + "\" not installed");
+ return Path.of(uri);
}
}
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/java/nio/file/TempFileHelper.java
--- a/src/java.base/share/classes/java/nio/file/TempFileHelper.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/java/nio/file/TempFileHelper.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -46,7 +46,7 @@
// temporary directory location
private static final Path tmpdir =
- Paths.get(GetPropertyAction.privilegedGetProperty("java.io.tmpdir"));
+ Path.of(GetPropertyAction.privilegedGetProperty("java.io.tmpdir"));
private static final boolean isPosix =
FileSystems.getDefault().supportedFileAttributeViews().contains("posix");
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/java/util/AbstractSet.java
--- a/src/java.base/share/classes/java/util/AbstractSet.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/java/util/AbstractSet.java Fri Mar 23 18:44:47 2018 +0000
@@ -93,9 +93,7 @@
return false;
try {
return containsAll(c);
- } catch (ClassCastException unused) {
- return false;
- } catch (NullPointerException unused) {
+ } catch (ClassCastException | NullPointerException unused) {
return false;
}
}
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/java/util/ImmutableCollections.java
--- a/src/java.base/share/classes/java/util/ImmutableCollections.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/java/util/ImmutableCollections.java Fri Mar 23 18:44:47 2018 +0000
@@ -70,46 +70,297 @@
static UnsupportedOperationException uoe() { return new UnsupportedOperationException(); }
- // ---------- List Implementations ----------
-
- abstract static class AbstractImmutableList extends AbstractList
- implements RandomAccess, Serializable {
+ static abstract class AbstractImmutableCollection extends AbstractCollection {
+ // all mutating methods throw UnsupportedOperationException
@Override public boolean add(E e) { throw uoe(); }
@Override public boolean addAll(Collection c) { throw uoe(); }
- @Override public boolean addAll(int index, Collection c) { throw uoe(); }
@Override public void clear() { throw uoe(); }
@Override public boolean remove(Object o) { throw uoe(); }
@Override public boolean removeAll(Collection c) { throw uoe(); }
@Override public boolean removeIf(Predicate filter) { throw uoe(); }
+ @Override public boolean retainAll(Collection c) { throw uoe(); }
+ }
+
+ // ---------- List Implementations ----------
+
+ @SuppressWarnings("unchecked")
+ static List emptyList() {
+ return (List) ListN.EMPTY_LIST;
+ }
+
+ static abstract class AbstractImmutableList extends AbstractImmutableCollection
+ implements List, RandomAccess {
+
+ // all mutating methods throw UnsupportedOperationException
+ @Override public void add(int index, E element) { throw uoe(); }
+ @Override public boolean addAll(int index, Collection c) { throw uoe(); }
+ @Override public E remove(int index) { throw uoe(); }
@Override public void replaceAll(UnaryOperator operator) { throw uoe(); }
- @Override public boolean retainAll(Collection c) { throw uoe(); }
+ @Override public E set(int index, E element) { throw uoe(); }
@Override public void sort(Comparator c) { throw uoe(); }
+
+ @Override
+ public List subList(int fromIndex, int toIndex) {
+ int size = size();
+ subListRangeCheck(fromIndex, toIndex, size);
+ return SubList.fromList(this, fromIndex, toIndex);
+ }
+
+ static void subListRangeCheck(int fromIndex, int toIndex, int size) {
+ if (fromIndex < 0)
+ throw new IndexOutOfBoundsException("fromIndex = " + fromIndex);
+ if (toIndex > size)
+ throw new IndexOutOfBoundsException("toIndex = " + toIndex);
+ if (fromIndex > toIndex)
+ throw new IllegalArgumentException("fromIndex(" + fromIndex +
+ ") > toIndex(" + toIndex + ")");
+ }
+
+ @Override
+ public Iterator iterator() {
+ return new ListItr(this, size());
+ }
+
+ @Override
+ public ListIterator listIterator() {
+ return listIterator(0);
+ }
+
+ @Override
+ public ListIterator listIterator(final int index) {
+ int size = size();
+ if (index < 0 || index > size) {
+ throw outOfBounds(index);
+ }
+ return new ListItr(this, size, index);
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o == this) {
+ return true;
+ }
+
+ if (!(o instanceof List)) {
+ return false;
+ }
+
+ Iterator oit = ((List) o).iterator();
+ for (int i = 0, s = size(); i < s; i++) {
+ if (!oit.hasNext() || !get(i).equals(oit.next())) {
+ return false;
+ }
+ }
+ return !oit.hasNext();
+ }
+
+ @Override
+ public int indexOf(Object o) {
+ Objects.requireNonNull(o);
+ for (int i = 0, s = size(); i < s; i++) {
+ if (o.equals(get(i))) {
+ return i;
+ }
+ }
+ return -1;
+ }
+
+ @Override
+ public int lastIndexOf(Object o) {
+ Objects.requireNonNull(o);
+ for (int i = size() - 1; i >= 0; i--) {
+ if (o.equals(get(i))) {
+ return i;
+ }
+ }
+ return -1;
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = 1;
+ for (int i = 0, s = size(); i < s; i++) {
+ hash = 31 * hash + get(i).hashCode();
+ }
+ return hash;
+ }
+
+ @Override
+ public boolean contains(Object o) {
+ return indexOf(o) >= 0;
+ }
+
+ IndexOutOfBoundsException outOfBounds(int index) {
+ return new IndexOutOfBoundsException("Index: " + index + " Size: " + size());
+ }
}
- static final class List0 extends AbstractImmutableList {
- private static final List0 INSTANCE = new List0<>();
+ static final class ListItr implements ListIterator {
+
+ @Stable
+ private final List list;
+
+ @Stable
+ private final int size;
+
+ private int cursor;
+
+ ListItr(List list, int size) {
+ this(list, size, 0);
+ }
+
+ ListItr(List list, int size, int index) {
+ this.list = list;
+ this.size = size;
+ this.cursor = index;
+ }
+
+ public boolean hasNext() {
+ return cursor != size;
+ }
- @SuppressWarnings("unchecked")
- static List0 instance() {
- return (List0) INSTANCE;
+ public E next() {
+ try {
+ int i = cursor;
+ E next = list.get(i);
+ cursor = i + 1;
+ return next;
+ } catch (IndexOutOfBoundsException e) {
+ throw new NoSuchElementException();
+ }
+ }
+
+ public void remove() {
+ throw uoe();
+ }
+
+ public boolean hasPrevious() {
+ return cursor != 0;
+ }
+
+ public E previous() {
+ try {
+ int i = cursor - 1;
+ E previous = list.get(i);
+ cursor = i;
+ return previous;
+ } catch (IndexOutOfBoundsException e) {
+ throw new NoSuchElementException();
+ }
+ }
+
+ public int nextIndex() {
+ return cursor;
+ }
+
+ public int previousIndex() {
+ return cursor - 1;
+ }
+
+ public void set(E e) {
+ throw uoe();
}
- private List0() { }
+ public void add(E e) {
+ throw uoe();
+ }
+ }
+
+ static final class SubList extends AbstractImmutableList
+ implements RandomAccess {
+
+ @Stable
+ private final List root;
+
+ @Stable
+ private final int offset;
+
+ @Stable
+ private final int size;
+
+ private SubList(List root, int offset, int size) {
+ this.root = root;
+ this.offset = offset;
+ this.size = size;
+ }
+
+ /**
+ * Constructs a sublist of another SubList.
+ */
+ static SubList fromSubList(SubList parent, int fromIndex, int toIndex) {
+ return new SubList(parent.root, parent.offset + fromIndex, toIndex - fromIndex);
+ }
+
+ /**
+ * Constructs a sublist of an arbitrary AbstractImmutableList, which is
+ * not a SubList itself.
+ */
+ static SubList fromList(List list, int fromIndex, int toIndex) {
+ return new SubList(list, fromIndex, toIndex - fromIndex);
+ }
+
+ public E get(int index) {
+ Objects.checkIndex(index, size);
+ return root.get(offset + index);
+ }
+
+ public int size() {
+ return size;
+ }
+
+ public Iterator iterator() {
+ return new ListItr(this, size());
+ }
+
+ public ListIterator listIterator(int index) {
+ rangeCheck(index);
+ return new ListItr(this, size(), index);
+ }
+
+ public List subList(int fromIndex, int toIndex) {
+ subListRangeCheck(fromIndex, toIndex, size);
+ return SubList.fromSubList(this, fromIndex, toIndex);
+ }
+
+ private void rangeCheck(int index) {
+ if (index < 0 || index > size) {
+ throw outOfBounds(index);
+ }
+ }
+ }
+
+ static final class List12 extends AbstractImmutableList
+ implements Serializable {
+
+ @Stable
+ private final E e0;
+
+ @Stable
+ private final E e1;
+
+ List12(E e0) {
+ this.e0 = Objects.requireNonNull(e0);
+ this.e1 = null;
+ }
+
+ List12(E e0, E e1) {
+ this.e0 = Objects.requireNonNull(e0);
+ this.e1 = Objects.requireNonNull(e1);
+ }
@Override
public int size() {
- return 0;
+ return e1 != null ? 2 : 1;
}
@Override
public E get(int index) {
- Objects.checkIndex(index, 0); // always throws IndexOutOfBoundsException
- return null; // but the compiler doesn't know this
- }
-
- @Override
- public Iterator iterator() {
- return Collections.emptyIterator();
+ if (index == 0) {
+ return e0;
+ } else if (index == 1 && e1 != null) {
+ return e1;
+ }
+ throw outOfBounds(index);
}
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
@@ -117,111 +368,20 @@
}
private Object writeReplace() {
- return new CollSer(CollSer.IMM_LIST);
- }
-
- @Override
- public boolean contains(Object o) {
- Objects.requireNonNull(o);
- return false;
- }
-
- @Override
- public boolean containsAll(Collection o) {
- return o.isEmpty(); // implicit nullcheck of o
- }
-
- @Override
- public int hashCode() {
- return 1;
- }
- }
-
- static final class List1 extends AbstractImmutableList {
- @Stable
- private final E e0;
-
- List1(E e0) {
- this.e0 = Objects.requireNonNull(e0);
- }
-
- @Override
- public int size() {
- return 1;
- }
-
- @Override
- public E get(int index) {
- Objects.checkIndex(index, 1);
- return e0;
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- throw new InvalidObjectException("not serial proxy");
- }
-
- private Object writeReplace() {
- return new CollSer(CollSer.IMM_LIST, e0);
- }
-
- @Override
- public boolean contains(Object o) {
- return o.equals(e0); // implicit nullcheck of o
- }
-
- @Override
- public int hashCode() {
- return 31 + e0.hashCode();
- }
- }
-
- static final class List2 extends AbstractImmutableList {
- @Stable
- private final E e0;
- @Stable
- private final E e1;
-
- List2(E e0, E e1) {
- this.e0 = Objects.requireNonNull(e0);
- this.e1 = Objects.requireNonNull(e1);
- }
-
- @Override
- public int size() {
- return 2;
- }
-
- @Override
- public E get(int index) {
- Objects.checkIndex(index, 2);
- if (index == 0) {
- return e0;
- } else { // index == 1
- return e1;
+ if (e1 == null) {
+ return new CollSer(CollSer.IMM_LIST, e0);
+ } else {
+ return new CollSer(CollSer.IMM_LIST, e0, e1);
}
}
- @Override
- public boolean contains(Object o) {
- return o.equals(e0) || o.equals(e1); // implicit nullcheck of o
- }
-
- @Override
- public int hashCode() {
- int hash = 31 + e0.hashCode();
- return 31 * hash + e1.hashCode();
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- throw new InvalidObjectException("not serial proxy");
- }
-
- private Object writeReplace() {
- return new CollSer(CollSer.IMM_LIST, e0, e1);
- }
}
- static final class ListN extends AbstractImmutableList {
+ static final class ListN extends AbstractImmutableList
+ implements Serializable {
+
+ static final List EMPTY_LIST = new ListN<>();
+
@Stable
private final E[] elements;
@@ -233,7 +393,12 @@
for (int i = 0; i < input.length; i++) {
tmp[i] = Objects.requireNonNull(input[i]);
}
- this.elements = tmp;
+ elements = tmp;
+ }
+
+ @Override
+ public boolean isEmpty() {
+ return size() == 0;
}
@Override
@@ -243,29 +408,9 @@
@Override
public E get(int index) {
- Objects.checkIndex(index, elements.length);
return elements[index];
}
- @Override
- public boolean contains(Object o) {
- for (E e : elements) {
- if (o.equals(e)) { // implicit nullcheck of o
- return true;
- }
- }
- return false;
- }
-
- @Override
- public int hashCode() {
- int hash = 1;
- for (E e : elements) {
- hash = 31 * hash + e.hashCode();
- }
- return hash;
- }
-
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
throw new InvalidObjectException("not serial proxy");
}
@@ -277,105 +422,52 @@
// ---------- Set Implementations ----------
- abstract static class AbstractImmutableSet extends AbstractSet implements Serializable {
- @Override public boolean add(E e) { throw uoe(); }
- @Override public boolean addAll(Collection c) { throw uoe(); }
- @Override public void clear() { throw uoe(); }
- @Override public boolean remove(Object o) { throw uoe(); }
- @Override public boolean removeAll(Collection c) { throw uoe(); }
- @Override public boolean removeIf(Predicate filter) { throw uoe(); }
- @Override public boolean retainAll(Collection c) { throw uoe(); }
- }
-
- static final class Set0 extends AbstractImmutableSet {
- private static final Set0 INSTANCE = new Set0<>();
-
- @SuppressWarnings("unchecked")
- static Set0 instance() {
- return (Set0) INSTANCE;
- }
-
- private Set0() { }
+ static abstract class AbstractImmutableSet extends AbstractImmutableCollection
+ implements Set {
@Override
- public int size() {
- return 0;
- }
+ public boolean equals(Object o) {
+ if (o == this) {
+ return true;
+ } else if (!(o instanceof Set)) {
+ return false;
+ }
- @Override
- public boolean contains(Object o) {
- Objects.requireNonNull(o);
- return false;
- }
-
- @Override
- public boolean containsAll(Collection o) {
- return o.isEmpty(); // implicit nullcheck of o
+ Collection c = (Collection) o;
+ if (c.size() != size()) {
+ return false;
+ }
+ for (Object e : c) {
+ if (e == null || !contains(e)) {
+ return false;
+ }
+ }
+ return true;
}
@Override
- public Iterator iterator() {
- return Collections.emptyIterator();
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- throw new InvalidObjectException("not serial proxy");
- }
-
- private Object writeReplace() {
- return new CollSer(CollSer.IMM_SET);
- }
-
- @Override
- public int hashCode() {
- return 0;
- }
+ public abstract int hashCode();
}
- static final class Set1 extends AbstractImmutableSet {
- @Stable
- private final E e0;
-
- Set1(E e0) {
- this.e0 = Objects.requireNonNull(e0);
- }
-
- @Override
- public int size() {
- return 1;
- }
-
- @Override
- public boolean contains(Object o) {
- return o.equals(e0); // implicit nullcheck of o
- }
-
- @Override
- public Iterator iterator() {
- return Collections.singletonIterator(e0);
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- throw new InvalidObjectException("not serial proxy");
- }
-
- private Object writeReplace() {
- return new CollSer(CollSer.IMM_SET, e0);
- }
-
- @Override
- public int hashCode() {
- return e0.hashCode();
- }
+ @SuppressWarnings("unchecked")
+ static Set emptySet() {
+ return (Set) SetN.EMPTY_SET;
}
- static final class Set2 extends AbstractImmutableSet {
+ static final class Set12 extends AbstractImmutableSet
+ implements Serializable {
+
@Stable
final E e0;
@Stable
final E e1;
- Set2(E e0, E e1) {
+ Set12(E e0) {
+ this.e0 = Objects.requireNonNull(e0);
+ this.e1 = null;
+ }
+
+ Set12(E e0, E e1) {
if (e0.equals(Objects.requireNonNull(e1))) { // implicit nullcheck of e0
throw new IllegalArgumentException("duplicate element: " + e0);
}
@@ -391,7 +483,7 @@
@Override
public int size() {
- return 2;
+ return (e1 == null) ? 1 : 2;
}
@Override
@@ -401,26 +493,26 @@
@Override
public int hashCode() {
- return e0.hashCode() + e1.hashCode();
+ return e0.hashCode() + (e1 == null ? 0 : e1.hashCode());
}
@Override
public Iterator iterator() {
- return new Iterator() {
- private int idx = 0;
+ return new Iterator<>() {
+ private int idx = size();
@Override
public boolean hasNext() {
- return idx < 2;
+ return idx > 0;
}
@Override
public E next() {
- if (idx == 0) {
- idx = 1;
+ if (idx == 1) {
+ idx = 0;
return e0;
- } else if (idx == 1) {
- idx = 2;
+ } else if (idx == 2) {
+ idx = 1;
return e1;
} else {
throw new NoSuchElementException();
@@ -434,7 +526,11 @@
}
private Object writeReplace() {
- return new CollSer(CollSer.IMM_SET, e0, e1);
+ if (e1 == null) {
+ return new CollSer(CollSer.IMM_SET, e0);
+ } else {
+ return new CollSer(CollSer.IMM_SET, e0, e1);
+ }
}
}
@@ -444,7 +540,11 @@
* least one null is always present.
* @param the element type
*/
- static final class SetN extends AbstractImmutableSet {
+ static final class SetN extends AbstractImmutableSet
+ implements Serializable {
+
+ static final Set EMPTY_SET = new SetN<>();
+
@Stable
final E[] elements;
@Stable
@@ -474,12 +574,13 @@
@Override
public boolean contains(Object o) {
- return probe(o) >= 0; // implicit nullcheck of o
+ Objects.requireNonNull(o);
+ return size > 0 && probe(o) >= 0;
}
@Override
public Iterator iterator() {
- return new Iterator() {
+ return new Iterator<>() {
private int idx = 0;
@Override
@@ -549,6 +650,11 @@
// ---------- Map Implementations ----------
+ @SuppressWarnings("unchecked")
+ static Map emptyMap() {
+ return (Map) MapN.EMPTY_MAP;
+ }
+
abstract static class AbstractImmutableMap extends AbstractMap implements Serializable {
@Override public void clear() { throw uoe(); }
@Override public V compute(K key, BiFunction rf) { throw uoe(); }
@@ -565,47 +671,6 @@
@Override public void replaceAll(BiFunction f) { throw uoe(); }
}
- static final class Map0 extends AbstractImmutableMap {
- private static final Map0 INSTANCE = new Map0<>();
-
- @SuppressWarnings("unchecked")
- static Map0 instance() {
- return (Map0) INSTANCE;
- }
-
- private Map0() { }
-
- @Override
- public Set> entrySet() {
- return Set.of();
- }
-
- @Override
- public boolean containsKey(Object o) {
- Objects.requireNonNull(o);
- return false;
- }
-
- @Override
- public boolean containsValue(Object o) {
- Objects.requireNonNull(o);
- return false;
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- throw new InvalidObjectException("not serial proxy");
- }
-
- private Object writeReplace() {
- return new CollSer(CollSer.IMM_MAP);
- }
-
- @Override
- public int hashCode() {
- return 0;
- }
- }
-
static final class Map1 extends AbstractImmutableMap {
@Stable
private final K k0;
@@ -656,8 +721,12 @@
* @param the value type
*/
static final class MapN extends AbstractImmutableMap {
+
+ static final Map EMPTY_MAP = new MapN<>();
+
@Stable
final Object[] table; // pairs of key, value
+
@Stable
final int size; // number of pairs
@@ -689,14 +758,16 @@
@Override
public boolean containsKey(Object o) {
- return probe(o) >= 0; // implicit nullcheck of o
+ Objects.requireNonNull(o);
+ return size > 0 && probe(o) >= 0;
}
@Override
public boolean containsValue(Object o) {
+ Objects.requireNonNull(o);
for (int i = 1; i < table.length; i += 2) {
Object v = table[i];
- if (v != null && o.equals(v)) { // implicit nullcheck of o
+ if (v != null && o.equals(v)) {
return true;
}
}
@@ -718,6 +789,10 @@
@Override
@SuppressWarnings("unchecked")
public V get(Object o) {
+ if (size == 0) {
+ Objects.requireNonNull(o);
+ return null;
+ }
int i = probe(o);
if (i >= 0) {
return (V)table[i+1];
@@ -733,7 +808,7 @@
@Override
public Set> entrySet() {
- return new AbstractSet>() {
+ return new AbstractSet<>() {
@Override
public int size() {
return MapN.this.size;
@@ -741,7 +816,7 @@
@Override
public Iterator> iterator() {
- return new Iterator>() {
+ return new Iterator<>() {
int idx = 0;
@Override
@@ -948,7 +1023,7 @@
return Set.of(array);
case IMM_MAP:
if (array.length == 0) {
- return ImmutableCollections.Map0.instance();
+ return ImmutableCollections.emptyMap();
} else if (array.length == 2) {
return new ImmutableCollections.Map1<>(array[0], array[1]);
} else {
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/java/util/List.java
--- a/src/java.base/share/classes/java/util/List.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/java/util/List.java Fri Mar 23 18:44:47 2018 +0000
@@ -788,7 +788,7 @@
* @since 9
*/
static List of() {
- return ImmutableCollections.List0.instance();
+ return ImmutableCollections.emptyList();
}
/**
@@ -804,7 +804,7 @@
* @since 9
*/
static List of(E e1) {
- return new ImmutableCollections.List1<>(e1);
+ return new ImmutableCollections.List12<>(e1);
}
/**
@@ -821,7 +821,7 @@
* @since 9
*/
static List of(E e1, E e2) {
- return new ImmutableCollections.List2<>(e1, e2);
+ return new ImmutableCollections.List12<>(e1, e2);
}
/**
@@ -1031,11 +1031,11 @@
static List of(E... elements) {
switch (elements.length) { // implicit null check of elements
case 0:
- return ImmutableCollections.List0.instance();
+ return ImmutableCollections.emptyList();
case 1:
- return new ImmutableCollections.List1<>(elements[0]);
+ return new ImmutableCollections.List12<>(elements[0]);
case 2:
- return new ImmutableCollections.List2<>(elements[0], elements[1]);
+ return new ImmutableCollections.List12<>(elements[0], elements[1]);
default:
return new ImmutableCollections.ListN<>(elements);
}
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/java/util/Map.java
--- a/src/java.base/share/classes/java/util/Map.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/java/util/Map.java Fri Mar 23 18:44:47 2018 +0000
@@ -1287,7 +1287,7 @@
* @since 9
*/
static Map of() {
- return ImmutableCollections.Map0.instance();
+ return ImmutableCollections.emptyMap();
}
/**
@@ -1604,11 +1604,11 @@
@SuppressWarnings("varargs")
static Map ofEntries(Entry... entries) {
if (entries.length == 0) { // implicit null check of entries array
- return ImmutableCollections.Map0.instance();
+ return ImmutableCollections.emptyMap();
} else if (entries.length == 1) {
// implicit null check of the array slot
return new ImmutableCollections.Map1<>(entries[0].getKey(),
- entries[0].getValue());
+ entries[0].getValue());
} else {
Object[] kva = new Object[entries.length << 1];
int a = 0;
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/java/util/Scanner.java
--- a/src/java.base/share/classes/java/util/Scanner.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/java/util/Scanner.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -2897,7 +2897,7 @@
* letters:
*
* {@code
- * try (Scanner sc = new Scanner(Paths.get("input.txt"))) {
+ * try (Scanner sc = new Scanner(Path.of("input.txt"))) {
* Pattern pat = Pattern.compile("[A-Z]{7,}");
* List capWords = sc.findAll(pat)
* .map(MatchResult::group)
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/java/util/Set.java
--- a/src/java.base/share/classes/java/util/Set.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/java/util/Set.java Fri Mar 23 18:44:47 2018 +0000
@@ -449,7 +449,7 @@
* @since 9
*/
static Set of() {
- return ImmutableCollections.Set0.instance();
+ return ImmutableCollections.emptySet();
}
/**
@@ -464,7 +464,7 @@
* @since 9
*/
static Set of(E e1) {
- return new ImmutableCollections.Set1<>(e1);
+ return new ImmutableCollections.Set12<>(e1);
}
/**
@@ -481,7 +481,7 @@
* @since 9
*/
static Set of(E e1, E e2) {
- return new ImmutableCollections.Set2<>(e1, e2);
+ return new ImmutableCollections.Set12<>(e1, e2);
}
/**
@@ -692,11 +692,11 @@
static Set of(E... elements) {
switch (elements.length) { // implicit null check of elements
case 0:
- return ImmutableCollections.Set0.instance();
+ return ImmutableCollections.emptySet();
case 1:
- return new ImmutableCollections.Set1<>(elements[0]);
+ return new ImmutableCollections.Set12<>(elements[0]);
case 2:
- return new ImmutableCollections.Set2<>(elements[0], elements[1]);
+ return new ImmutableCollections.Set12<>(elements[0], elements[1]);
default:
return new ImmutableCollections.SetN<>(elements);
}
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/jdk/internal/loader/BootLoader.java
--- a/src/java.base/share/classes/jdk/internal/loader/BootLoader.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/jdk/internal/loader/BootLoader.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -32,7 +32,6 @@
import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Arrays;
@@ -243,8 +242,8 @@
mn = location.substring(5, location.length());
} else if (location.startsWith("file:/")) {
// named module in exploded image
- Path path = Paths.get(URI.create(location));
- Path modulesDir = Paths.get(JAVA_HOME, "modules");
+ Path path = Path.of(URI.create(location));
+ Path modulesDir = Path.of(JAVA_HOME, "modules");
if (path.startsWith(modulesDir)) {
mn = path.getFileName().toString();
}
@@ -267,7 +266,7 @@
private static URL toFileURL(String location) {
return AccessController.doPrivileged(new PrivilegedAction<>() {
public URL run() {
- Path path = Paths.get(location);
+ Path path = Path.of(location);
if (Files.isRegularFile(path)) {
try {
return path.toUri().toURL();
@@ -285,7 +284,7 @@
private static Manifest getManifest(String location) {
return AccessController.doPrivileged(new PrivilegedAction<>() {
public Manifest run() {
- Path jar = Paths.get(location);
+ Path jar = Path.of(location);
try (InputStream in = Files.newInputStream(jar);
JarInputStream jis = new JarInputStream(in, false)) {
return jis.getManifest();
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/jdk/internal/loader/ClassLoaders.java
--- a/src/java.base/share/classes/jdk/internal/loader/ClassLoaders.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/jdk/internal/loader/ClassLoaders.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -28,7 +28,7 @@
import java.io.IOException;
import java.net.URL;
import java.nio.file.InvalidPathException;
-import java.nio.file.Paths;
+import java.nio.file.Path;
import java.security.CodeSource;
import java.security.PermissionCollection;
import java.util.jar.Manifest;
@@ -223,7 +223,7 @@
// Use an intermediate File object to construct a URI/URL without
// authority component as URLClassPath can't handle URLs with a UNC
// server name in the authority component.
- return Paths.get(s).toRealPath().toFile().toURI().toURL();
+ return Path.of(s).toRealPath().toFile().toURI().toURL();
} catch (InvalidPathException | IOException ignore) {
// malformed path string or class path element does not exist
return null;
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
--- a/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -34,7 +34,6 @@
import java.lang.module.ResolvedModule;
import java.net.URI;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -539,7 +538,7 @@
Path[] paths = new Path[dirs.length];
int i = 0;
for (String dir: dirs) {
- paths[i++] = Paths.get(dir);
+ paths[i++] = Path.of(dir);
}
return ModulePath.of(patcher, paths);
}
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java
--- a/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -30,7 +30,6 @@
import java.lang.module.ResolvedModule;
import java.net.URI;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.ArrayDeque;
import java.util.Collections;
import java.util.Deque;
@@ -129,7 +128,7 @@
() -> new InternalError("Selected module " + name + " not on module path"));
URI uri = rm.reference().location().get();
- Path path = Paths.get(uri);
+ Path path = Path.of(uri);
String fn = path.getFileName().toString();
if (!fn.endsWith(".jar") && !fn.endsWith(".jmod")) {
throw new UnsupportedOperationException(path + " is not a modular JAR or jmod file");
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/jdk/internal/module/ModulePath.java
--- a/src/java.base/share/classes/jdk/internal/module/ModulePath.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/jdk/internal/module/ModulePath.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -43,7 +43,6 @@
import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.ArrayList;
import java.util.Collections;
@@ -360,7 +359,7 @@
URI uri = mref.location().orElse(null);
if (uri != null) {
if (uri.getScheme().equalsIgnoreCase("file")) {
- Path file = Paths.get(uri);
+ Path file = Path.of(uri);
return file.getFileName().toString();
} else {
return uri.toString();
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/jdk/internal/module/SystemModuleFinders.java
--- a/src/java.base/share/classes/jdk/internal/module/SystemModuleFinders.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/jdk/internal/module/SystemModuleFinders.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -38,7 +38,6 @@
import java.nio.ByteBuffer;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.ArrayDeque;
@@ -185,7 +184,7 @@
// probe to see if this is an images build
String home = System.getProperty("java.home");
- Path modules = Paths.get(home, "lib", "modules");
+ Path modules = Path.of(home, "lib", "modules");
if (Files.isRegularFile(modules)) {
if (USE_FAST_PATH) {
SystemModules systemModules = allSystemModules();
@@ -205,7 +204,7 @@
}
// exploded build (do not cache module finder)
- Path dir = Paths.get(home, "modules");
+ Path dir = Path.of(home, "modules");
if (!Files.isDirectory(dir))
throw new InternalError("Unable to detect the run-time image");
ModuleFinder f = ModulePath.of(ModuleBootstrap.patcher(), dir);
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/jdk/internal/perf/PerfCounter.java
--- a/src/java.base/share/classes/jdk/internal/perf/PerfCounter.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/jdk/internal/perf/PerfCounter.java Fri Mar 23 18:44:47 2018 +0000
@@ -133,10 +133,6 @@
static final PerfCounter zfot = newPerfCounter("sun.zip.zipFile.openTime");
}
- static class WindowsClientCounters {
- static final PerfCounter d3dAvailable = newConstantPerfCounter("sun.java2d.d3d.available");
- }
-
/**
* Number of findClass calls
*/
@@ -182,10 +178,4 @@
return CoreCounters.zfot;
}
- /**
- * D3D graphic pipeline available
- */
- public static PerfCounter getD3DAvailable() {
- return WindowsClientCounters.d3dAvailable;
- }
}
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/module-info.java
--- a/src/java.base/share/classes/module-info.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/module-info.java Fri Mar 23 18:44:47 2018 +0000
@@ -159,8 +159,6 @@
jdk.scripting.nashorn;
exports jdk.internal.org.objectweb.asm.signature to
jdk.scripting.nashorn;
- exports jdk.internal.math to
- java.desktop;
exports jdk.internal.misc to
java.desktop,
java.logging,
@@ -188,7 +186,6 @@
jdk.jartool,
jdk.jlink;
exports jdk.internal.perf to
- java.desktop,
java.management,
jdk.management.agent,
jdk.internal.jvmstat;
@@ -235,7 +232,6 @@
jdk.sctp,
jdk.unsupported;
exports sun.nio.cs to
- java.desktop,
jdk.charsets;
exports sun.nio.fs to
jdk.unsupported;
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java
--- a/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java Fri Mar 23 18:44:47 2018 +0000
@@ -508,8 +508,7 @@
if (remote != null) {
// connected
if (!target.equals(remote)) {
- throw new IllegalArgumentException(
- "Connected address not equal to target address");
+ throw new AlreadyConnectedException();
}
do {
n = IOUtil.write(fd, src, -1, nd);
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/sun/nio/ch/IOUtil.java
--- a/src/java.base/share/classes/sun/nio/ch/IOUtil.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/sun/nio/ch/IOUtil.java Fri Mar 23 18:44:47 2018 +0000
@@ -397,7 +397,9 @@
* The read end of the pipe is returned in the high 32 bits,
* while the write end is returned in the low 32 bits.
*/
- static native long makePipe(boolean blocking);
+ static native long makePipe(boolean blocking) throws IOException;
+
+ static native int write1(int fd, byte b) throws IOException;
static native boolean drain(int fd) throws IOException;
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/sun/nio/ch/SelectionKeyImpl.java
--- a/src/java.base/share/classes/sun/nio/ch/SelectionKeyImpl.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/sun/nio/ch/SelectionKeyImpl.java Fri Mar 23 18:44:47 2018 +0000
@@ -33,10 +33,10 @@
/**
- * An implementation of SelectionKey for Solaris.
+ * An implementation of SelectionKey.
*/
-public class SelectionKeyImpl
+public final class SelectionKeyImpl
extends AbstractSelectionKey
{
@@ -54,12 +54,14 @@
selector = sel;
}
+ @Override
public SelectableChannel channel() {
return (SelectableChannel)channel;
}
+ @Override
public Selector selector() {
- return selector;
+ return (Selector)selector;
}
int getIndex() { // package-private
@@ -75,16 +77,19 @@
throw new CancelledKeyException();
}
+ @Override
public int interestOps() {
ensureValid();
return interestOps;
}
+ @Override
public SelectionKey interestOps(int ops) {
ensureValid();
return nioInterestOps(ops);
}
+ @Override
public int readyOps() {
ensureValid();
return readyOps;
@@ -131,4 +136,6 @@
return sb.toString();
}
+ // used by Selector implementations to record when the key was selected
+ int lastPolled;
}
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/sun/nio/ch/SelectorImpl.java
--- a/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/sun/nio/ch/SelectorImpl.java Fri Mar 23 18:44:47 2018 +0000
@@ -78,6 +78,16 @@
return publicSelectedKeys;
}
+ /**
+ * Returns the public view of the key sets
+ */
+ protected final Set nioKeys() {
+ return publicKeys;
+ }
+ protected final Set nioSelectedKeys() {
+ return publicSelectedKeys;
+ }
+
protected abstract int doSelect(long timeout) throws IOException;
private int lockAndDoSelect(long timeout) throws IOException {
@@ -125,8 +135,6 @@
protected abstract void implClose() throws IOException;
- public abstract void putEventOps(SelectionKeyImpl sk, int ops);
-
@Override
protected final SelectionKey register(AbstractSelectableChannel ch,
int ops,
@@ -166,4 +174,9 @@
}
}
}
+
+ /**
+ * Invoked to change the key's interest set
+ */
+ public abstract void putEventOps(SelectionKeyImpl ski, int ops);
}
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
--- a/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java Fri Mar 23 18:44:47 2018 +0000
@@ -210,25 +210,20 @@
@Override
public ServerSocketChannel bind(SocketAddress local, int backlog) throws IOException {
- acceptLock.lock();
- try {
- synchronized (stateLock) {
- ensureOpen();
- if (localAddress != null)
- throw new AlreadyBoundException();
- InetSocketAddress isa = (local == null)
- ? new InetSocketAddress(0)
- : Net.checkAddress(local);
- SecurityManager sm = System.getSecurityManager();
- if (sm != null)
- sm.checkListen(isa.getPort());
- NetHooks.beforeTcpBind(fd, isa.getAddress(), isa.getPort());
- Net.bind(fd, isa.getAddress(), isa.getPort());
- Net.listen(fd, backlog < 1 ? 50 : backlog);
- localAddress = Net.localAddress(fd);
- }
- } finally {
- acceptLock.unlock();
+ synchronized (stateLock) {
+ ensureOpen();
+ if (localAddress != null)
+ throw new AlreadyBoundException();
+ InetSocketAddress isa = (local == null)
+ ? new InetSocketAddress(0)
+ : Net.checkAddress(local);
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null)
+ sm.checkListen(isa.getPort());
+ NetHooks.beforeTcpBind(fd, isa.getAddress(), isa.getPort());
+ Net.bind(fd, isa.getAddress(), isa.getPort());
+ Net.listen(fd, backlog < 1 ? 50 : backlog);
+ localAddress = Net.localAddress(fd);
}
return this;
}
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/sun/security/provider/PolicyFile.java
--- a/src/java.base/share/classes/sun/security/provider/PolicyFile.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/sun/security/provider/PolicyFile.java Fri Mar 23 18:44:47 2018 +0000
@@ -30,7 +30,7 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URI;
-import java.nio.file.Paths;
+import java.nio.file.Path;
import java.util.*;
import java.security.*;
import java.security.cert.Certificate;
@@ -278,7 +278,7 @@
public URL run() {
String sep = File.separator;
try {
- return Paths.get(System.getProperty("java.home"),
+ return Path.of(System.getProperty("java.home"),
"lib", "security",
"default.policy").toUri().toURL();
} catch (MalformedURLException mue) {
diff -r eb72d194235c -r 514c68575523 src/java.base/share/classes/sun/security/tools/keytool/Main.java
--- a/src/java.base/share/classes/sun/security/tools/keytool/Main.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/classes/sun/security/tools/keytool/Main.java Fri Mar 23 18:44:47 2018 +0000
@@ -27,7 +27,7 @@
import java.io.*;
import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.nio.file.Path;
import java.security.CodeSigner;
import java.security.CryptoPrimitive;
import java.security.KeyStore;
@@ -2189,7 +2189,7 @@
inplaceBackupName = srcksfname + ".old" + (n == 1 ? "" : n);
File bkFile = new File(inplaceBackupName);
if (!bkFile.exists()) {
- Files.copy(Paths.get(srcksfname), bkFile.toPath());
+ Files.copy(Path.of(srcksfname), bkFile.toPath());
break;
}
}
diff -r eb72d194235c -r 514c68575523 src/java.base/share/native/libjava/System.c
--- a/src/java.base/share/native/libjava/System.c Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/share/native/libjava/System.c Fri Mar 23 18:44:47 2018 +0000
@@ -244,21 +244,8 @@
PUTPROP(props, "line.separator", sprops->line_separator);
/*
- * user.language
- * user.script, user.country, user.variant (if user's environment specifies them)
- * file.encoding
+ * file encoding for stdout and stderr
*/
- PUTPROP(props, "user.language", sprops->language);
- if (sprops->script) {
- PUTPROP(props, "user.script", sprops->script);
- }
- if (sprops->country) {
- PUTPROP(props, "user.country", sprops->country);
- }
- if (sprops->variant) {
- PUTPROP(props, "user.variant", sprops->variant);
- }
- PUTPROP(props, "file.encoding", sprops->encoding);
if (sprops->sun_stdout_encoding != NULL) {
PUTPROP(props, "sun.stdout.encoding", sprops->sun_stdout_encoding);
}
@@ -314,7 +301,7 @@
#endif
/* !!! DO NOT call PUTPROP_ForPlatformNString before this line !!!
- * !!! I18n properties have not been set up yet !!!
+ * !!! The platform native encoding for strings has not been set up yet !!!
*/
InitializeEncoding(env, sprops->sun_jnu_encoding);
@@ -379,17 +366,6 @@
PUTPROP(props, "sun.desktop", sprops->desktop);
}
- /*
- * unset "user.language", "user.script", "user.country", and "user.variant"
- * in order to tell whether the command line option "-DXXXX=YYYY" is
- * specified or not. They will be reset in fillI18nProps() below.
- */
- REMOVEPROP(props, "user.language");
- REMOVEPROP(props, "user.script");
- REMOVEPROP(props, "user.country");
- REMOVEPROP(props, "user.variant");
- REMOVEPROP(props, "file.encoding");
-
ret = JVM_InitProperties(env, props);
/* reconstruct i18n related properties */
diff -r eb72d194235c -r 514c68575523 src/java.base/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java
--- a/src/java.base/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java Fri Mar 23 18:44:47 2018 +0000
@@ -127,7 +127,7 @@
// descriptor is registered with /dev/poll.
private final BitSet registered = new BitSet();
- DevPollArrayWrapper() {
+ DevPollArrayWrapper() throws IOException {
int allocationSize = NUM_POLLFDS * SIZE_POLLFD;
pollArray = new AllocatedNativeObject(allocationSize, true);
pollArrayAddress = pollArray.address();
@@ -136,7 +136,7 @@
eventsHigh = new HashMap<>();
}
- void initInterrupt(int fd0, int fd1) {
+ void initInterrupt(int fd0, int fd1) throws IOException {
outgoingInterruptFD = fd1;
incomingInterruptFD = fd0;
register(wfd, fd0, POLLIN);
@@ -200,7 +200,7 @@
}
}
- void release(int fd) {
+ void release(int fd) throws IOException {
synchronized (updateLock) {
// ignore any pending update for this file descriptor
setUpdateEvents(fd, IGNORE);
@@ -297,7 +297,11 @@
boolean interrupted = false;
public void interrupt() {
- interrupt(outgoingInterruptFD);
+ try {
+ IOUtil.write1(outgoingInterruptFD, (byte)0);
+ } catch (IOException ioe) {
+ throw new InternalError(ioe);
+ }
}
public int interruptedIndex() {
@@ -312,13 +316,12 @@
interrupted = false;
}
- private native int init();
- private native void register(int wfd, int fd, int mask);
+ private native int init() throws IOException;
+ private native void register(int wfd, int fd, int mask) throws IOException;
private native void registerMultiple(int wfd, long address, int len)
throws IOException;
- private native int poll0(long pollAddress, int numfds, long timeout,
- int wfd);
- private static native void interrupt(int fd);
+ private native int poll0(long pollAddress, int numfds, long timeout, int wfd)
+ throws IOException;
static {
IOUtil.load();
diff -r eb72d194235c -r 514c68575523 src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java
--- a/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java Fri Mar 23 18:44:47 2018 +0000
@@ -61,7 +61,7 @@
* Package private constructor called by factory method in
* the abstract superclass Selector.
*/
- DevPollSelectorImpl(SelectorProvider sp) {
+ DevPollSelectorImpl(SelectorProvider sp) throws IOException {
super(sp);
long pipeFds = IOUtil.makePipe(false);
fd0 = (int) (pipeFds >>> 32);
diff -r eb72d194235c -r 514c68575523 src/java.base/solaris/classes/sun/nio/ch/EventPortWrapper.java
--- a/src/java.base/solaris/classes/sun/nio/ch/EventPortWrapper.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/solaris/classes/sun/nio/ch/EventPortWrapper.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -181,12 +181,26 @@
}
// poll for events
- int updated = port_getn(pfd, pollArrayAddress, POLL_MAX, timeout);
+ int numEntries;
+ long to = timeout;
+ boolean timedPoll = (to > 0);
+ do {
+ long startTime = timedPoll ? System.currentTimeMillis() : 0;
+ numEntries = port_getn(pfd, pollArrayAddress, POLL_MAX, timeout);
+ if (numEntries == IOStatus.INTERRUPTED && timedPoll) {
+ // timed poll interrupted so need to adjust timeout
+ to -= System.currentTimeMillis() - startTime;
+ if (to <= 0) {
+ // timeout also expired so no retry
+ numEntries = 0;
+ }
+ }
+ } while (numEntries == IOStatus.INTERRUPTED);
// after polling we need to queue all polled file descriptors as they
// are candidates to register for the next poll.
synchronized (updateLock) {
- for (int i=0; i
+#include
+#include
+#include
+
#include "jni.h"
#include "jni_util.h"
#include "jvm.h"
#include "jlong.h"
+#include "nio.h"
#include "nio_util.h"
-#include
-#include
-#include
-#include
-
#include "sun_nio_ch_SolarisEventPort.h"
JNIEXPORT jint JNICALL
@@ -51,8 +52,10 @@
Java_sun_nio_ch_SolarisEventPort_port_1close
(JNIEnv* env, jclass clazz, jint port)
{
- int res;
- RESTARTABLE(close(port), res);
+ int res = close(port);
+ if (res < 0 && res != EINTR) {
+ JNU_ThrowIOExceptionWithLastError(env, "close failed");
+ }
}
JNIEXPORT jboolean JNICALL
@@ -93,17 +96,23 @@
}
}
-JNIEXPORT void JNICALL
+JNIEXPORT jint JNICALL
Java_sun_nio_ch_SolarisEventPort_port_1get(JNIEnv* env, jclass clazz,
jint port, jlong eventAddress)
{
int res;
port_event_t* ev = (port_event_t*)jlong_to_ptr(eventAddress);
- RESTARTABLE(port_get((int)port, ev, NULL), res);
+ res = port_get((int)port, ev, NULL);
if (res == -1) {
- JNU_ThrowIOExceptionWithLastError(env, "port_get");
+ if (errno == EINTR) {
+ return IOS_INTERRUPTED;
+ } else {
+ JNU_ThrowIOExceptionWithLastError(env, "port_get failed");
+ return IOS_THROWN;
+ }
}
+ return res;
}
JNIEXPORT jint JNICALL
@@ -125,9 +134,13 @@
}
res = port_getn((int)port, list, (uint_t)max, &n, tsp);
- if (res == -1) {
- if (errno != ETIME && errno != EINTR)
- JNU_ThrowIOExceptionWithLastError(env, "port_getn");
+ if (res == -1 && errno != ETIME) {
+ if (errno == EINTR) {
+ return IOS_INTERRUPTED;
+ } else {
+ JNU_ThrowIOExceptionWithLastError(env, "port_getn failed");
+ return IOS_THROWN;
+ }
}
return (jint)n;
diff -r eb72d194235c -r 514c68575523 src/java.base/unix/classes/module-info.java.extra
--- a/src/java.base/unix/classes/module-info.java.extra Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/unix/classes/module-info.java.extra Fri Mar 23 18:44:47 2018 +0000
@@ -23,3 +23,4 @@
* questions.
*/
+exports sun.nio.cs to java.desktop;
diff -r eb72d194235c -r 514c68575523 src/java.base/unix/classes/sun/nio/ch/PipeImpl.java
--- a/src/java.base/unix/classes/sun/nio/ch/PipeImpl.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/unix/classes/sun/nio/ch/PipeImpl.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -38,7 +38,7 @@
private final SourceChannel source;
private final SinkChannel sink;
- PipeImpl(SelectorProvider sp) {
+ PipeImpl(SelectorProvider sp) throws IOException {
long pipeFds = IOUtil.makePipe(true);
int readFd = (int) (pipeFds >>> 32);
int writeFd = (int) pipeFds;
diff -r eb72d194235c -r 514c68575523 src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java
--- a/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/unix/classes/sun/nio/ch/PollSelectorImpl.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -51,7 +51,7 @@
* Package private constructor called by factory method in
* the abstract superclass Selector.
*/
- PollSelectorImpl(SelectorProvider sp) {
+ PollSelectorImpl(SelectorProvider sp) throws IOException {
super(sp, 1, 1);
long pipeFds = IOUtil.makePipe(false);
fd0 = (int) (pipeFds >>> 32);
diff -r eb72d194235c -r 514c68575523 src/java.base/unix/classes/sun/nio/ch/SocketDispatcher.java
--- a/src/java.base/unix/classes/sun/nio/ch/SocketDispatcher.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/unix/classes/sun/nio/ch/SocketDispatcher.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -25,15 +25,15 @@
package sun.nio.ch;
-import java.io.*;
+import java.io.FileDescriptor;
+import java.io.IOException;
/**
* Allows different platforms to call different native methods
* for read and write operations.
*/
-class SocketDispatcher extends NativeDispatcher
-{
+class SocketDispatcher extends NativeDispatcher {
int read(FileDescriptor fd, long address, int len) throws IOException {
return FileDispatcherImpl.read0(fd, address, len);
diff -r eb72d194235c -r 514c68575523 src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java
--- a/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/unix/classes/sun/nio/fs/UnixFileStore.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -260,7 +260,7 @@
private static Properties loadProperties() {
Properties result = new Properties();
String fstypes = System.getProperty("java.home") + "/lib/fstypes.properties";
- Path file = Paths.get(fstypes);
+ Path file = Path.of(fstypes);
try {
try (ReadableByteChannel rbc = Files.newByteChannel(file)) {
result.load(Channels.newReader(rbc, "UTF-8"));
diff -r eb72d194235c -r 514c68575523 src/java.base/unix/native/libnio/ch/IOUtil.c
--- a/src/java.base/unix/native/libnio/ch/IOUtil.c Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.base/unix/native/libnio/ch/IOUtil.c Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -104,10 +104,19 @@
return ((jlong) fd[0] << 32) | (jlong) fd[1];
}
+
+JNIEXPORT jint JNICALL
+Java_sun_nio_ch_IOUtil_write1(JNIEnv *env, jclass cl, jint fd, jbyte b)
+{
+ char c = (char)b;
+ return convertReturnVal(env, write(fd, &c, 1), JNI_FALSE);
+}
+
+
JNIEXPORT jboolean JNICALL
Java_sun_nio_ch_IOUtil_drain(JNIEnv *env, jclass cl, jint fd)
{
- char buf[128];
+ char buf[16];
int tn = 0;
for (;;) {
diff -r eb72d194235c -r 514c68575523 src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c Fri Mar 23 18:44:47 2018 +0000
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2003, 2015, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+//#define USE_ERROR
+//#define USE_TRACE
+
+#include "PLATFORM_API_LinuxOS_ALSA_CommonUtils.h"
+
+static void alsaDebugOutput(const char *file, int line, const char *function, int err, const char *fmt, ...) {
+#ifdef USE_ERROR
+ va_list args;
+ va_start(args, fmt);
+ printf("%s:%d function %s: error %d: %s\n", file, line, function, err, snd_strerror(err));
+ if (strlen(fmt) > 0) {
+ vprintf(fmt, args);
+ }
+ va_end(args);
+#endif
+}
+
+static int alsa_inited = 0;
+static int alsa_enumerate_pcm_subdevices = FALSE; // default: no
+static int alsa_enumerate_midi_subdevices = FALSE; // default: no
+
+/*
+ * Declare library specific JNI_Onload entry if static build
+ */
+DEF_STATIC_JNI_OnLoad
+
+void initAlsaSupport() {
+ char* enumerate;
+ if (!alsa_inited) {
+ alsa_inited = TRUE;
+ snd_lib_error_set_handler(&alsaDebugOutput);
+
+ enumerate = getenv(ENV_ENUMERATE_PCM_SUBDEVICES);
+ if (enumerate != NULL && strlen(enumerate) > 0
+ && (enumerate[0] != 'f') // false
+ && (enumerate[0] != 'F') // False
+ && (enumerate[0] != 'n') // no
+ && (enumerate[0] != 'N')) { // NO
+ alsa_enumerate_pcm_subdevices = TRUE;
+ }
+#ifdef ALSA_MIDI_ENUMERATE_SUBDEVICES
+ alsa_enumerate_midi_subdevices = TRUE;
+#endif
+ }
+}
+
+
+/* if true (non-zero), ALSA sub devices should be listed as separate devices
+ */
+int needEnumerateSubdevices(int isMidi) {
+ initAlsaSupport();
+ return isMidi ? alsa_enumerate_midi_subdevices
+ : alsa_enumerate_pcm_subdevices;
+}
+
+
+/*
+ * deviceID contains packed card, device and subdevice numbers
+ * each number takes 10 bits
+ * "default" device has id == ALSA_DEFAULT_DEVICE_ID
+ */
+UINT32 encodeDeviceID(int card, int device, int subdevice) {
+ return (((card & 0x3FF) << 20) | ((device & 0x3FF) << 10)
+ | (subdevice & 0x3FF)) + 1;
+}
+
+
+void decodeDeviceID(UINT32 deviceID, int* card, int* device, int* subdevice,
+ int isMidi) {
+ deviceID--;
+ *card = (deviceID >> 20) & 0x3FF;
+ *device = (deviceID >> 10) & 0x3FF;
+ if (needEnumerateSubdevices(isMidi)) {
+ *subdevice = deviceID & 0x3FF;
+ } else {
+ *subdevice = -1; // ALSA will choose any subdevices
+ }
+}
+
+
+void getDeviceString(char* buffer, int card, int device, int subdevice,
+ int usePlugHw, int isMidi) {
+ if (needEnumerateSubdevices(isMidi)) {
+ sprintf(buffer, "%s:%d,%d,%d",
+ usePlugHw ? ALSA_PLUGHARDWARE : ALSA_HARDWARE,
+ card, device, subdevice);
+ } else {
+ sprintf(buffer, "%s:%d,%d",
+ usePlugHw ? ALSA_PLUGHARDWARE : ALSA_HARDWARE,
+ card, device);
+ }
+}
+
+
+void getDeviceStringFromDeviceID(char* buffer, UINT32 deviceID,
+ int usePlugHw, int isMidi) {
+ int card, device, subdevice;
+
+ if (deviceID == ALSA_DEFAULT_DEVICE_ID) {
+ strcpy(buffer, ALSA_DEFAULT_DEVICE_NAME);
+ } else {
+ decodeDeviceID(deviceID, &card, &device, &subdevice, isMidi);
+ getDeviceString(buffer, card, device, subdevice, usePlugHw, isMidi);
+ }
+}
+
+
+static int hasGottenALSAVersion = FALSE;
+#define ALSAVersionString_LENGTH 200
+static char ALSAVersionString[ALSAVersionString_LENGTH];
+
+void getALSAVersion(char* buffer, int len) {
+ if (!hasGottenALSAVersion) {
+ // get alsa version from proc interface
+ FILE* file;
+ int curr, len, totalLen, inVersionString;
+ file = fopen(ALSA_VERSION_PROC_FILE, "r");
+ ALSAVersionString[0] = 0;
+ if (file) {
+ if (NULL != fgets(ALSAVersionString, ALSAVersionString_LENGTH, file)) {
+ // parse for version number
+ totalLen = strlen(ALSAVersionString);
+ inVersionString = FALSE;
+ len = 0;
+ curr = 0;
+ while (curr < totalLen) {
+ if (!inVersionString) {
+ // is this char the beginning of a version string ?
+ if (ALSAVersionString[curr] >= '0'
+ && ALSAVersionString[curr] <= '9') {
+ inVersionString = TRUE;
+ }
+ }
+ if (inVersionString) {
+ // the version string ends with white space
+ if (ALSAVersionString[curr] <= 32) {
+ break;
+ }
+ if (curr != len) {
+ // copy this char to the beginning of the string
+ ALSAVersionString[len] = ALSAVersionString[curr];
+ }
+ len++;
+ }
+ curr++;
+ }
+ // remove trailing dots
+ while ((len > 0) && (ALSAVersionString[len - 1] == '.')) {
+ len--;
+ }
+ // null terminate
+ ALSAVersionString[len] = 0;
+ }
+ fclose(file);
+ hasGottenALSAVersion = TRUE;
+ }
+ }
+ strncpy(buffer, ALSAVersionString, len);
+}
+
+
+/* end */
diff -r eb72d194235c -r 514c68575523 src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.h Fri Mar 23 18:44:47 2018 +0000
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2003, 2007, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+#include
+#include "Utilities.h"
+
+#ifndef PLATFORM_API_LINUXOS_ALSA_COMMONUTILS_H_INCLUDED
+#define PLATFORM_API_LINUXOS_ALSA_COMMONUTILS_H_INCLUDED
+
+#define ALSA_VERSION_PROC_FILE "/proc/asound/version"
+#define ALSA_HARDWARE "hw"
+#define ALSA_HARDWARE_CARD ALSA_HARDWARE":%d"
+#define ALSA_HARDWARE_DEVICE ALSA_HARDWARE_CARD",%d"
+#define ALSA_HARDWARE_SUBDEVICE ALSA_HARDWARE_DEVICE",%d"
+
+#define ALSA_PLUGHARDWARE "plughw"
+#define ALSA_DEFAULT_DEVICE_NAME "default"
+
+#define ALSA_DEFAULT_DEVICE_ID (0)
+
+#define ALSA_PCM (0)
+#define ALSA_RAWMIDI (1)
+
+// for use in info objects
+#define ALSA_VENDOR "ALSA (http://www.alsa-project.org)"
+
+// Environment variable for inclusion of subdevices in device listing.
+// If this variable is unset or "no", then subdevices are ignored, and
+// it's ALSA's choice which one to use (enables hardware mixing)
+#define ENV_ENUMERATE_PCM_SUBDEVICES "ALSA_ENUMERATE_PCM_SUBDEVICES"
+
+// if defined, subdevices are listed.
+//#undef ALSA_MIDI_ENUMERATE_SUBDEVICES
+#define ALSA_MIDI_ENUMERATE_SUBDEVICES
+
+// must be called before any ALSA calls
+void initAlsaSupport();
+
+/* if true (non-zero), ALSA sub devices should be listed as separate devices
+ */
+int needEnumerateSubdevices(int isMidi);
+
+
+/*
+ * deviceID contains packed card, device and subdevice numbers
+ * each number takes 10 bits
+ * "default" device has id == ALSA_DEFAULT_DEVICE_ID
+ */
+UINT32 encodeDeviceID(int card, int device, int subdevice);
+
+void decodeDeviceID(UINT32 deviceID, int* card, int* device, int* subdevice,
+ int isMidi);
+
+void getDeviceStringFromDeviceID(char* buffer, UINT32 deviceID,
+ int usePlugHw, int isMidi);
+
+void getALSAVersion(char* buffer, int len);
+
+
+#endif // PLATFORM_API_LINUXOS_ALSA_COMMONUTILS_H_INCLUDED
diff -r eb72d194235c -r 514c68575523 src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c Fri Mar 23 18:44:47 2018 +0000
@@ -0,0 +1,354 @@
+/*
+ * Copyright (c) 2003, 2010, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+#define USE_ERROR
+#define USE_TRACE
+
+#if USE_PLATFORM_MIDI_IN == TRUE
+
+
+#include
+#include "PlatformMidi.h"
+#include "PLATFORM_API_LinuxOS_ALSA_MidiUtils.h"
+#if defined(i586)
+#include
+#endif
+
+/*
+ * Helper methods
+ */
+
+static inline UINT32 packMessage(int status, int data1, int data2) {
+ return ((status & 0xFF) | ((data1 & 0xFF) << 8) | ((data2 & 0xFF) << 16));
+}
+
+
+static void setShortMessage(MidiMessage* message,
+ int status, int data1, int data2) {
+ message->type = SHORT_MESSAGE;
+ message->data.s.packedMsg = packMessage(status, data1, data2);
+}
+
+
+static void setRealtimeMessage(MidiMessage* message, int status) {
+ setShortMessage(message, status, 0, 0);
+}
+
+
+static void set14bitMessage(MidiMessage* message, int status, int value) {
+ TRACE3("14bit value: %d, lsb: %d, msb: %d\n", value, value & 0x7F, (value >> 7) & 0x7F);
+ value &= 0x3FFF;
+ TRACE3("14bit value (2): %d, lsb: %d, msb: %d\n", value, value & 0x7F, (value >> 7) & 0x7F);
+ setShortMessage(message, status,
+ value & 0x7F,
+ (value >> 7) & 0x7F);
+}
+
+
+/*
+ * implementation of the platform-dependent
+ * MIDI in functions declared in PlatformMidi.h
+ */
+
+char* MIDI_IN_GetErrorStr(INT32 err) {
+ return (char*) getErrorStr(err);
+}
+
+INT32 MIDI_IN_GetNumDevices() {
+/* Workaround for 6842956: 32bit app on 64bit linux
+ * gets assertion failure trying to open midiIn ports.
+ * Untill the issue is fixed in ALSA
+ * (https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4807)
+ * report no midi in devices in the configuration.
+ */
+#if defined(i586)
+ static int jre32onlinux64 = -1;
+ if (jre32onlinux64 < 0) {
+ jre32onlinux64 = 0;
+ /* The workaround may be disabled setting "JAVASOUND_ENABLE_MIDIIN"
+ * environment variable.
+ */
+ if (getenv("JAVASOUND_ENABLE_MIDIIN") == NULL) {
+ struct utsname u;
+ jre32onlinux64 = 0;
+ if (uname(&u) == 0) {
+ if (strstr(u.machine, "64") != NULL) {
+ TRACE0("jre32 on linux64 detected - report no midiIn devices\n");
+ jre32onlinux64 = 1;
+ }
+ }
+ }
+ }
+ if (jre32onlinux64) {
+ return 0;
+ }
+#endif
+
+ TRACE0("MIDI_IN_GetNumDevices()\n");
+
+ return getMidiDeviceCount(SND_RAWMIDI_STREAM_INPUT);
+}
+
+
+INT32 MIDI_IN_GetDeviceName(INT32 deviceIndex, char *name, UINT32 nameLength) {
+ int ret = getMidiDeviceName(SND_RAWMIDI_STREAM_INPUT, deviceIndex,
+ name, nameLength);
+ return ret;
+}
+
+
+INT32 MIDI_IN_GetDeviceVendor(INT32 deviceIndex, char *name, UINT32 nameLength) {
+ int ret = getMidiDeviceVendor(deviceIndex, name, nameLength);
+ return ret;
+}
+
+
+INT32 MIDI_IN_GetDeviceDescription(INT32 deviceIndex, char *name, UINT32 nameLength) {
+ int ret = getMidiDeviceDescription(SND_RAWMIDI_STREAM_INPUT, deviceIndex,
+ name, nameLength);
+ return ret;
+}
+
+
+INT32 MIDI_IN_GetDeviceVersion(INT32 deviceIndex, char *name, UINT32 nameLength) {
+ int ret = getMidiDeviceVersion(deviceIndex, name, nameLength);
+ return ret;
+}
+
+/*************************************************************************/
+
+INT32 MIDI_IN_OpenDevice(INT32 deviceIndex, MidiDeviceHandle** handle) {
+ INT32 ret;
+ TRACE0("> MIDI_IN_OpenDevice\n");
+ ret = openMidiDevice(SND_RAWMIDI_STREAM_INPUT, deviceIndex, handle);
+ TRACE1("< MIDI_IN_OpenDevice: returning %d\n", (int) ret);
+ return ret;
+}
+
+
+INT32 MIDI_IN_CloseDevice(MidiDeviceHandle* handle) {
+ INT32 ret;
+ TRACE0("> MIDI_IN_CloseDevice\n");
+ ret = closeMidiDevice(handle);
+ TRACE1("< MIDI_IN_CloseDevice: returning %d\n", (int) ret);
+ return ret;
+}
+
+
+INT32 MIDI_IN_StartDevice(MidiDeviceHandle* handle) {
+ TRACE0("MIDI_IN_StartDevice\n");
+ return MIDI_SUCCESS;
+}
+
+
+INT32 MIDI_IN_StopDevice(MidiDeviceHandle* handle) {
+ TRACE0("MIDI_IN_StopDevice\n");
+ return MIDI_SUCCESS;
+}
+
+
+INT64 MIDI_IN_GetTimeStamp(MidiDeviceHandle* handle) {
+ return getMidiTimestamp(handle);
+}
+
+
+/* read the next message from the queue */
+MidiMessage* MIDI_IN_GetMessage(MidiDeviceHandle* handle) {
+ snd_seq_event_t alsa_message;
+ MidiMessage* jdk_message;
+ int err;
+ char buffer[1];
+ int status;
+
+ TRACE0("> MIDI_IN_GetMessage\n");
+ if (!handle) {
+ ERROR0("< ERROR: MIDI_IN_GetMessage(): handle is NULL\n");
+ return NULL;
+ }
+ if (!handle->deviceHandle) {
+ ERROR0("< ERROR: MIDI_IN_GetMessage(): native handle is NULL\n");
+ return NULL;
+ }
+ if (!handle->platformData) {
+ ERROR0("< ERROR: MIDI_IN_GetMessage(): platformData is NULL\n");
+ return NULL;
+ }
+
+ /* For MIDI In, the device is left in non blocking mode. So if there is
+ no data from the device, snd_rawmidi_read() returns with -11 (EAGAIN).
+ This results in jumping back to the Java layer. */
+ while (TRUE) {
+ TRACE0("before snd_rawmidi_read()\n");
+ err = snd_rawmidi_read((snd_rawmidi_t*) handle->deviceHandle, buffer, 1);
+ TRACE0("after snd_rawmidi_read()\n");
+ if (err != 1) {
+ ERROR2("< ERROR: MIDI_IN_GetMessage(): snd_rawmidi_read() returned %d : %s\n", err, snd_strerror(err));
+ return NULL;
+ }
+ // printf("received byte: %d\n", buffer[0]);
+ err = snd_midi_event_encode_byte((snd_midi_event_t*) handle->platformData,
+ (int) buffer[0],
+ &alsa_message);
+ if (err == 1) {
+ break;
+ } else if (err < 0) {
+ ERROR1("< ERROR: MIDI_IN_GetMessage(): snd_midi_event_encode_byte() returned %d\n", err);
+ return NULL;
+ }
+ }
+ jdk_message = (MidiMessage*) calloc(sizeof(MidiMessage), 1);
+ if (!jdk_message) {
+ ERROR0("< ERROR: MIDI_IN_GetMessage(): out of memory\n");
+ return NULL;
+ }
+ // TODO: tra
+ switch (alsa_message.type) {
+ case SND_SEQ_EVENT_NOTEON:
+ case SND_SEQ_EVENT_NOTEOFF:
+ case SND_SEQ_EVENT_KEYPRESS:
+ status = (alsa_message.type == SND_SEQ_EVENT_KEYPRESS) ? 0xA0 :
+ (alsa_message.type == SND_SEQ_EVENT_NOTEON) ? 0x90 : 0x80;
+ status |= alsa_message.data.note.channel;
+ setShortMessage(jdk_message, status,
+ alsa_message.data.note.note,
+ alsa_message.data.note.velocity);
+ break;
+
+ case SND_SEQ_EVENT_CONTROLLER:
+ status = 0xB0 | alsa_message.data.control.channel;
+ setShortMessage(jdk_message, status,
+ alsa_message.data.control.param,
+ alsa_message.data.control.value);
+ break;
+
+ case SND_SEQ_EVENT_PGMCHANGE:
+ case SND_SEQ_EVENT_CHANPRESS:
+ status = (alsa_message.type == SND_SEQ_EVENT_PGMCHANGE) ? 0xC0 : 0xD0;
+ status |= alsa_message.data.control.channel;
+ setShortMessage(jdk_message, status,
+ alsa_message.data.control.value, 0);
+ break;
+
+ case SND_SEQ_EVENT_PITCHBEND:
+ status = 0xE0 | alsa_message.data.control.channel;
+ // $$mp 2003-09-23:
+ // possible hack to work around a bug in ALSA. Necessary for
+ // ALSA 0.9.2. May be fixed in newer versions of ALSA.
+ // alsa_message.data.control.value ^= 0x2000;
+ // TRACE1("pitchbend value: %d\n", alsa_message.data.control.value);
+ set14bitMessage(jdk_message, status,
+ alsa_message.data.control.value);
+ break;
+
+ /* System exclusive messages */
+
+ case SND_SEQ_EVENT_SYSEX:
+ jdk_message->type = LONG_MESSAGE;
+ jdk_message->data.l.size = alsa_message.data.ext.len;
+ jdk_message->data.l.data = malloc(alsa_message.data.ext.len);
+ if (jdk_message->data.l.data == NULL) {
+ ERROR0("< ERROR: MIDI_IN_GetMessage(): out of memory\n");
+ free(jdk_message);
+ jdk_message = NULL;
+ } else {
+ memcpy(jdk_message->data.l.data, alsa_message.data.ext.ptr, alsa_message.data.ext.len);
+ }
+ break;
+
+ /* System common messages */
+
+ case SND_SEQ_EVENT_QFRAME:
+ setShortMessage(jdk_message, 0xF1,
+ alsa_message.data.control.value & 0x7F, 0);
+ break;
+
+ case SND_SEQ_EVENT_SONGPOS:
+ set14bitMessage(jdk_message, 0xF2,
+ alsa_message.data.control.value);
+ break;
+
+ case SND_SEQ_EVENT_SONGSEL:
+ setShortMessage(jdk_message, 0xF3,
+ alsa_message.data.control.value & 0x7F, 0);
+ break;
+
+ case SND_SEQ_EVENT_TUNE_REQUEST:
+ setRealtimeMessage(jdk_message, 0xF6);
+ break;
+
+ /* System realtime messages */
+
+ case SND_SEQ_EVENT_CLOCK:
+ setRealtimeMessage(jdk_message, 0xF8);
+ break;
+
+ case SND_SEQ_EVENT_START:
+ setRealtimeMessage(jdk_message, 0xFA);
+ break;
+
+ case SND_SEQ_EVENT_CONTINUE:
+ setRealtimeMessage(jdk_message, 0xFB);
+ break;
+
+ case SND_SEQ_EVENT_STOP:
+ setRealtimeMessage(jdk_message, 0xFC);
+ break;
+
+ case SND_SEQ_EVENT_SENSING:
+ setRealtimeMessage(jdk_message, 0xFE);
+ break;
+
+ case SND_SEQ_EVENT_RESET:
+ setRealtimeMessage(jdk_message, 0xFF);
+ break;
+
+ default:
+ ERROR0("< ERROR: MIDI_IN_GetMessage(): unhandled ALSA MIDI message type\n");
+ free(jdk_message);
+ jdk_message = NULL;
+
+ }
+
+ // set timestamp
+ if (jdk_message != NULL) {
+ jdk_message->timestamp = getMidiTimestamp(handle);
+ }
+ TRACE1("< MIDI_IN_GetMessage: returning %p\n", jdk_message);
+ return jdk_message;
+}
+
+
+void MIDI_IN_ReleaseMessage(MidiDeviceHandle* handle, MidiMessage* msg) {
+ if (!msg) {
+ ERROR0("< ERROR: MIDI_IN_ReleaseMessage(): message is NULL\n");
+ return;
+ }
+ if (msg->type == LONG_MESSAGE && msg->data.l.data) {
+ free(msg->data.l.data);
+ }
+ free(msg);
+}
+
+#endif /* USE_PLATFORM_MIDI_IN */
diff -r eb72d194235c -r 514c68575523 src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiOut.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiOut.c Fri Mar 23 18:44:47 2018 +0000
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2003, 2007, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+#define USE_ERROR
+#define USE_TRACE
+
+#if USE_PLATFORM_MIDI_OUT == TRUE
+
+#include
+#include "PlatformMidi.h"
+#include "PLATFORM_API_LinuxOS_ALSA_MidiUtils.h"
+
+
+
+static int CHANNEL_MESSAGE_LENGTH[] = {
+ -1, -1, -1, -1, -1, -1, -1, -1, 3, 3, 3, 3, 2, 2, 3 };
+/* 8x 9x Ax Bx Cx Dx Ex */
+
+static int SYSTEM_MESSAGE_LENGTH[] = {
+ -1, 2, 3, 2, -1, -1, 1, 1, 1, -1, 1, 1, 1, -1, 1, 1 };
+/* F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE FF */
+
+
+// the returned length includes the status byte.
+// for illegal messages, -1 is returned.
+static int getShortMessageLength(int status) {
+ int dataLength = 0;
+ if (status < 0xF0) { // channel voice message
+ dataLength = CHANNEL_MESSAGE_LENGTH[(status >> 4) & 0xF];
+ } else {
+ dataLength = SYSTEM_MESSAGE_LENGTH[status & 0xF];
+ }
+ return dataLength;
+}
+
+
+/*
+ * implementation of the platform-dependent
+ * MIDI out functions declared in PlatformMidi.h
+ */
+char* MIDI_OUT_GetErrorStr(INT32 err) {
+ return (char*) getErrorStr(err);
+}
+
+
+INT32 MIDI_OUT_GetNumDevices() {
+ TRACE0("MIDI_OUT_GetNumDevices()\n");
+ return getMidiDeviceCount(SND_RAWMIDI_STREAM_OUTPUT);
+}
+
+
+INT32 MIDI_OUT_GetDeviceName(INT32 deviceIndex, char *name, UINT32 nameLength) {
+ TRACE0("MIDI_OUT_GetDeviceName()\n");
+ return getMidiDeviceName(SND_RAWMIDI_STREAM_OUTPUT, deviceIndex,
+ name, nameLength);
+}
+
+
+INT32 MIDI_OUT_GetDeviceVendor(INT32 deviceIndex, char *name, UINT32 nameLength) {
+ TRACE0("MIDI_OUT_GetDeviceVendor()\n");
+ return getMidiDeviceVendor(deviceIndex, name, nameLength);
+}
+
+
+INT32 MIDI_OUT_GetDeviceDescription(INT32 deviceIndex, char *name, UINT32 nameLength) {
+ TRACE0("MIDI_OUT_GetDeviceDescription()\n");
+ return getMidiDeviceDescription(SND_RAWMIDI_STREAM_OUTPUT, deviceIndex,
+ name, nameLength);
+}
+
+
+INT32 MIDI_OUT_GetDeviceVersion(INT32 deviceIndex, char *name, UINT32 nameLength) {
+ TRACE0("MIDI_OUT_GetDeviceVersion()\n");
+ return getMidiDeviceVersion(deviceIndex, name, nameLength);
+}
+
+
+/* *************************** MidiOutDevice implementation *************** */
+
+INT32 MIDI_OUT_OpenDevice(INT32 deviceIndex, MidiDeviceHandle** handle) {
+ TRACE1("MIDI_OUT_OpenDevice(): deviceIndex: %d\n", (int) deviceIndex);
+ return openMidiDevice(SND_RAWMIDI_STREAM_OUTPUT, deviceIndex, handle);
+}
+
+
+INT32 MIDI_OUT_CloseDevice(MidiDeviceHandle* handle) {
+ TRACE0("MIDI_OUT_CloseDevice()\n");
+ return closeMidiDevice(handle);
+}
+
+
+INT64 MIDI_OUT_GetTimeStamp(MidiDeviceHandle* handle) {
+ return getMidiTimestamp(handle);
+}
+
+
+INT32 MIDI_OUT_SendShortMessage(MidiDeviceHandle* handle, UINT32 packedMsg,
+ UINT32 timestamp) {
+ int err;
+ int status;
+ int data1;
+ int data2;
+ char buffer[3];
+
+ TRACE2("> MIDI_OUT_SendShortMessage() %x, time: %u\n", packedMsg, (unsigned int) timestamp);
+ if (!handle) {
+ ERROR0("< ERROR: MIDI_OUT_SendShortMessage(): handle is NULL\n");
+ return MIDI_INVALID_HANDLE;
+ }
+ if (!handle->deviceHandle) {
+ ERROR0("< ERROR: MIDI_OUT_SendLongMessage(): native handle is NULL\n");
+ return MIDI_INVALID_HANDLE;
+ }
+ status = (packedMsg & 0xFF);
+ buffer[0] = (char) status;
+ buffer[1] = (char) ((packedMsg >> 8) & 0xFF);
+ buffer[2] = (char) ((packedMsg >> 16) & 0xFF);
+ TRACE4("status: %d, data1: %d, data2: %d, length: %d\n", (int) buffer[0], (int) buffer[1], (int) buffer[2], getShortMessageLength(status));
+ err = snd_rawmidi_write((snd_rawmidi_t*) handle->deviceHandle, buffer, getShortMessageLength(status));
+ if (err < 0) {
+ ERROR1(" ERROR: MIDI_OUT_SendShortMessage(): snd_rawmidi_write() returned %d\n", err);
+ }
+
+ TRACE0("< MIDI_OUT_SendShortMessage()\n");
+ return err;
+}
+
+
+INT32 MIDI_OUT_SendLongMessage(MidiDeviceHandle* handle, UBYTE* data,
+ UINT32 size, UINT32 timestamp) {
+ int err;
+
+ TRACE2("> MIDI_OUT_SendLongMessage() size %u, time: %u\n", (unsigned int) size, (unsigned int) timestamp);
+ if (!handle) {
+ ERROR0("< ERROR: MIDI_OUT_SendLongMessage(): handle is NULL\n");
+ return MIDI_INVALID_HANDLE;
+ }
+ if (!handle->deviceHandle) {
+ ERROR0("< ERROR: MIDI_OUT_SendLongMessage(): native handle is NULL\n");
+ return MIDI_INVALID_HANDLE;
+ }
+ if (!data) {
+ ERROR0("< ERROR: MIDI_OUT_SendLongMessage(): data is NULL\n");
+ return MIDI_INVALID_HANDLE;
+ }
+ err = snd_rawmidi_write((snd_rawmidi_t*) handle->deviceHandle,
+ data, size);
+ if (err < 0) {
+ ERROR1(" ERROR: MIDI_OUT_SendLongMessage(): snd_rawmidi_write() returned %d\n", err);
+ }
+
+ TRACE0("< MIDI_OUT_SendLongMessage()\n");
+ return err;
+}
+
+
+#endif /* USE_PLATFORM_MIDI_OUT */
diff -r eb72d194235c -r 514c68575523 src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c Fri Mar 23 18:44:47 2018 +0000
@@ -0,0 +1,481 @@
+/*
+ * Copyright (c) 2003, 2014, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+#define USE_ERROR
+#define USE_TRACE
+
+#include "PLATFORM_API_LinuxOS_ALSA_MidiUtils.h"
+#include "PLATFORM_API_LinuxOS_ALSA_CommonUtils.h"
+#include
+#include
+
+static INT64 getTimeInMicroseconds() {
+ struct timeval tv;
+
+ gettimeofday(&tv, NULL);
+ return (tv.tv_sec * 1000000UL) + tv.tv_usec;
+}
+
+
+const char* getErrorStr(INT32 err) {
+ return snd_strerror((int) err);
+}
+
+
+
+// callback for iteration through devices
+// returns TRUE if iteration should continue
+typedef int (*DeviceIteratorPtr)(UINT32 deviceID,
+ snd_rawmidi_info_t* rawmidi_info,
+ snd_ctl_card_info_t* cardinfo,
+ void *userData);
+
+// for each ALSA device, call iterator. userData is passed to the iterator
+// returns total number of iterations
+static int iterateRawmidiDevices(snd_rawmidi_stream_t direction,
+ DeviceIteratorPtr iterator,
+ void* userData) {
+ int count = 0;
+ int subdeviceCount;
+ int card, dev, subDev;
+ char devname[16];
+ int err;
+ snd_ctl_t *handle;
+ snd_rawmidi_t *rawmidi;
+ snd_rawmidi_info_t *rawmidi_info;
+ snd_ctl_card_info_t *card_info, *defcardinfo = NULL;
+ UINT32 deviceID;
+ int doContinue = TRUE;
+
+ snd_rawmidi_info_malloc(&rawmidi_info);
+ snd_ctl_card_info_malloc(&card_info);
+
+ // 1st try "default" device
+ if (direction == SND_RAWMIDI_STREAM_INPUT) {
+ err = snd_rawmidi_open(&rawmidi, NULL, ALSA_DEFAULT_DEVICE_NAME,
+ SND_RAWMIDI_NONBLOCK);
+ } else if (direction == SND_RAWMIDI_STREAM_OUTPUT) {
+ err = snd_rawmidi_open(NULL, &rawmidi, ALSA_DEFAULT_DEVICE_NAME,
+ SND_RAWMIDI_NONBLOCK);
+ } else {
+ ERROR0("ERROR: iterateRawmidiDevices(): direction is neither"
+ " SND_RAWMIDI_STREAM_INPUT nor SND_RAWMIDI_STREAM_OUTPUT\n");
+ err = MIDI_INVALID_ARGUMENT;
+ }
+ if (err < 0) {
+ ERROR1("ERROR: snd_rawmidi_open (\"default\"): %s\n",
+ snd_strerror(err));
+ } else {
+ err = snd_rawmidi_info(rawmidi, rawmidi_info);
+
+ snd_rawmidi_close(rawmidi);
+ if (err < 0) {
+ ERROR1("ERROR: snd_rawmidi_info (\"default\"): %s\n",
+ snd_strerror(err));
+ } else {
+ // try to get card info
+ card = snd_rawmidi_info_get_card(rawmidi_info);
+ if (card >= 0) {
+ sprintf(devname, ALSA_HARDWARE_CARD, card);
+ if (snd_ctl_open(&handle, devname, SND_CTL_NONBLOCK) >= 0) {
+ if (snd_ctl_card_info(handle, card_info) >= 0) {
+ defcardinfo = card_info;
+ }
+ snd_ctl_close(handle);
+ }
+ }
+ // call calback function for the device
+ if (iterator != NULL) {
+ doContinue = (*iterator)(ALSA_DEFAULT_DEVICE_ID, rawmidi_info,
+ defcardinfo, userData);
+ }
+ count++;
+ }
+ }
+
+ // iterate cards
+ card = -1;
+ TRACE0("testing for cards...\n");
+ if (snd_card_next(&card) >= 0) {
+ TRACE1("Found card %d\n", card);
+ while (doContinue && (card >= 0)) {
+ sprintf(devname, ALSA_HARDWARE_CARD, card);
+ TRACE1("Opening control for alsa rawmidi device \"%s\"...\n", devname);
+ err = snd_ctl_open(&handle, devname, SND_CTL_NONBLOCK);
+ if (err < 0) {
+ ERROR2("ERROR: snd_ctl_open, card=%d: %s\n", card, snd_strerror(err));
+ } else {
+ TRACE0("snd_ctl_open() SUCCESS\n");
+ err = snd_ctl_card_info(handle, card_info);
+ if (err < 0) {
+ ERROR2("ERROR: snd_ctl_card_info, card=%d: %s\n", card, snd_strerror(err));
+ } else {
+ TRACE0("snd_ctl_card_info() SUCCESS\n");
+ dev = -1;
+ while (doContinue) {
+ if (snd_ctl_rawmidi_next_device(handle, &dev) < 0) {
+ ERROR0("snd_ctl_rawmidi_next_device\n");
+ }
+ TRACE0("snd_ctl_rawmidi_next_device() SUCCESS\n");
+ if (dev < 0) {
+ break;
+ }
+ snd_rawmidi_info_set_device(rawmidi_info, dev);
+ snd_rawmidi_info_set_subdevice(rawmidi_info, 0);
+ snd_rawmidi_info_set_stream(rawmidi_info, direction);
+ err = snd_ctl_rawmidi_info(handle, rawmidi_info);
+ TRACE0("after snd_ctl_rawmidi_info()\n");
+ if (err < 0) {
+ if (err != -ENOENT) {
+ ERROR2("ERROR: snd_ctl_rawmidi_info, card=%d: %s", card, snd_strerror(err));
+ }
+ } else {
+ TRACE0("snd_ctl_rawmidi_info() SUCCESS\n");
+ subdeviceCount = needEnumerateSubdevices(ALSA_RAWMIDI)
+ ? snd_rawmidi_info_get_subdevices_count(rawmidi_info)
+ : 1;
+ if (iterator!=NULL) {
+ for (subDev = 0; subDev < subdeviceCount; subDev++) {
+ TRACE3(" Iterating %d,%d,%d\n", card, dev, subDev);
+ deviceID = encodeDeviceID(card, dev, subDev);
+ doContinue = (*iterator)(deviceID, rawmidi_info,
+ card_info, userData);
+ count++;
+ TRACE0("returned from iterator\n");
+ if (!doContinue) {
+ break;
+ }
+ }
+ } else {
+ count += subdeviceCount;
+ }
+ }
+ } // of while(doContinue)
+ }
+ snd_ctl_close(handle);
+ }
+ if (snd_card_next(&card) < 0) {
+ break;
+ }
+ }
+ } else {
+ ERROR0("No cards found!\n");
+ }
+ snd_ctl_card_info_free(card_info);
+ snd_rawmidi_info_free(rawmidi_info);
+ return count;
+}
+
+
+
+int getMidiDeviceCount(snd_rawmidi_stream_t direction) {
+ int deviceCount;
+ TRACE0("> getMidiDeviceCount()\n");
+ initAlsaSupport();
+ deviceCount = iterateRawmidiDevices(direction, NULL, NULL);
+ TRACE0("< getMidiDeviceCount()\n");
+ return deviceCount;
+}
+
+
+
+/*
+ userData is assumed to be a pointer to ALSA_MIDIDeviceDescription.
+ ALSA_MIDIDeviceDescription->index has to be set to the index of the device
+ we want to get information of before this method is called the first time via
+ iterateRawmidiDevices(). On each call of this method,
+ ALSA_MIDIDeviceDescription->index is decremented. If it is equal to zero,
+ we have reached the desired device, so action is taken.
+ So after successful completion of iterateRawmidiDevices(),
+ ALSA_MIDIDeviceDescription->index is zero. If it isn't, this is an
+ indication of an error.
+*/
+static int deviceInfoIterator(UINT32 deviceID, snd_rawmidi_info_t *rawmidi_info,
+ snd_ctl_card_info_t *cardinfo, void *userData) {
+ char buffer[300];
+ ALSA_MIDIDeviceDescription* desc = (ALSA_MIDIDeviceDescription*)userData;
+#ifdef ALSA_MIDI_USE_PLUGHW
+ int usePlugHw = 1;
+#else
+ int usePlugHw = 0;
+#endif
+
+ TRACE0("deviceInfoIterator\n");
+ initAlsaSupport();
+ if (desc->index == 0) {
+ // we found the device with correct index
+ desc->deviceID = deviceID;
+
+ buffer[0]=' '; buffer[1]='[';
+ // buffer[300] is enough to store the actual device string w/o overrun
+ getDeviceStringFromDeviceID(&buffer[2], deviceID, usePlugHw, ALSA_RAWMIDI);
+ strncat(buffer, "]", sizeof(buffer) - strlen(buffer) - 1);
+ strncpy(desc->name,
+ (cardinfo != NULL)
+ ? snd_ctl_card_info_get_id(cardinfo)
+ : snd_rawmidi_info_get_id(rawmidi_info),
+ desc->strLen - strlen(buffer));
+ strncat(desc->name, buffer, desc->strLen - strlen(desc->name));
+ desc->description[0] = 0;
+ if (cardinfo != NULL) {
+ strncpy(desc->description, snd_ctl_card_info_get_name(cardinfo),
+ desc->strLen);
+ strncat(desc->description, ", ",
+ desc->strLen - strlen(desc->description));
+ }
+ strncat(desc->description, snd_rawmidi_info_get_id(rawmidi_info),
+ desc->strLen - strlen(desc->description));
+ strncat(desc->description, ", ", desc->strLen - strlen(desc->description));
+ strncat(desc->description, snd_rawmidi_info_get_name(rawmidi_info),
+ desc->strLen - strlen(desc->description));
+ TRACE2("Returning %s, %s\n", desc->name, desc->description);
+ return FALSE; // do not continue iteration
+ }
+ desc->index--;
+ return TRUE;
+}
+
+
+static int getMIDIDeviceDescriptionByIndex(snd_rawmidi_stream_t direction,
+ ALSA_MIDIDeviceDescription* desc) {
+ initAlsaSupport();
+ TRACE1(" getMIDIDeviceDescriptionByIndex (index = %d)\n", desc->index);
+ iterateRawmidiDevices(direction, &deviceInfoIterator, desc);
+ return (desc->index == 0) ? MIDI_SUCCESS : MIDI_INVALID_DEVICEID;
+}
+
+
+
+int initMIDIDeviceDescription(ALSA_MIDIDeviceDescription* desc, int index) {
+ int ret = MIDI_SUCCESS;
+ desc->index = index;
+ desc->strLen = 200;
+ desc->name = (char*) calloc(desc->strLen + 1, 1);
+ desc->description = (char*) calloc(desc->strLen + 1, 1);
+ if (! desc->name ||
+ ! desc->description) {
+ ret = MIDI_OUT_OF_MEMORY;
+ }
+ return ret;
+}
+
+
+void freeMIDIDeviceDescription(ALSA_MIDIDeviceDescription* desc) {
+ if (desc->name) {
+ free(desc->name);
+ }
+ if (desc->description) {
+ free(desc->description);
+ }
+}
+
+
+int getMidiDeviceName(snd_rawmidi_stream_t direction, int index, char *name,
+ UINT32 nameLength) {
+ ALSA_MIDIDeviceDescription desc;
+ int ret;
+
+ TRACE1("getMidiDeviceName: nameLength: %d\n", (int) nameLength);
+ ret = initMIDIDeviceDescription(&desc, index);
+ if (ret == MIDI_SUCCESS) {
+ TRACE0("getMidiDeviceName: initMIDIDeviceDescription() SUCCESS\n");
+ ret = getMIDIDeviceDescriptionByIndex(direction, &desc);
+ if (ret == MIDI_SUCCESS) {
+ TRACE1("getMidiDeviceName: desc.name: %s\n", desc.name);
+ strncpy(name, desc.name, nameLength - 1);
+ name[nameLength - 1] = 0;
+ }
+ }
+ freeMIDIDeviceDescription(&desc);
+ return ret;
+}
+
+
+int getMidiDeviceVendor(int index, char *name, UINT32 nameLength) {
+ strncpy(name, ALSA_VENDOR, nameLength - 1);
+ name[nameLength - 1] = 0;
+ return MIDI_SUCCESS;
+}
+
+
+int getMidiDeviceDescription(snd_rawmidi_stream_t direction,
+ int index, char *name, UINT32 nameLength) {
+ ALSA_MIDIDeviceDescription desc;
+ int ret;
+
+ ret = initMIDIDeviceDescription(&desc, index);
+ if (ret == MIDI_SUCCESS) {
+ ret = getMIDIDeviceDescriptionByIndex(direction, &desc);
+ if (ret == MIDI_SUCCESS) {
+ strncpy(name, desc.description, nameLength - 1);
+ name[nameLength - 1] = 0;
+ }
+ }
+ freeMIDIDeviceDescription(&desc);
+ return ret;
+}
+
+
+int getMidiDeviceVersion(int index, char *name, UINT32 nameLength) {
+ getALSAVersion(name, nameLength);
+ return MIDI_SUCCESS;
+}
+
+
+static int getMidiDeviceID(snd_rawmidi_stream_t direction, int index,
+ UINT32* deviceID) {
+ ALSA_MIDIDeviceDescription desc;
+ int ret;
+
+ ret = initMIDIDeviceDescription(&desc, index);
+ if (ret == MIDI_SUCCESS) {
+ ret = getMIDIDeviceDescriptionByIndex(direction, &desc);
+ if (ret == MIDI_SUCCESS) {
+ // TRACE1("getMidiDeviceName: desc.name: %s\n", desc.name);
+ *deviceID = desc.deviceID;
+ }
+ }
+ freeMIDIDeviceDescription(&desc);
+ return ret;
+}
+
+
+/*
+ direction has to be either SND_RAWMIDI_STREAM_INPUT or
+ SND_RAWMIDI_STREAM_OUTPUT.
+ Returns 0 on success. Otherwise, MIDI_OUT_OF_MEMORY, MIDI_INVALID_ARGUMENT
+ or a negative ALSA error code is returned.
+*/
+INT32 openMidiDevice(snd_rawmidi_stream_t direction, INT32 deviceIndex,
+ MidiDeviceHandle** handle) {
+ snd_rawmidi_t* native_handle;
+ snd_midi_event_t* event_parser = NULL;
+ int err;
+ UINT32 deviceID = 0;
+ char devicename[100];
+#ifdef ALSA_MIDI_USE_PLUGHW
+ int usePlugHw = 1;
+#else
+ int usePlugHw = 0;
+#endif
+
+ TRACE0("> openMidiDevice()\n");
+
+ (*handle) = (MidiDeviceHandle*) calloc(sizeof(MidiDeviceHandle), 1);
+ if (!(*handle)) {
+ ERROR0("ERROR: openDevice: out of memory\n");
+ return MIDI_OUT_OF_MEMORY;
+ }
+
+ // TODO: iterate to get dev ID from index
+ err = getMidiDeviceID(direction, deviceIndex, &deviceID);
+ TRACE1(" openMidiDevice(): deviceID: %d\n", (int) deviceID);
+ getDeviceStringFromDeviceID(devicename, deviceID,
+ usePlugHw, ALSA_RAWMIDI);
+ TRACE1(" openMidiDevice(): deviceString: %s\n", devicename);
+
+ // finally open the device
+ if (direction == SND_RAWMIDI_STREAM_INPUT) {
+ err = snd_rawmidi_open(&native_handle, NULL, devicename,
+ SND_RAWMIDI_NONBLOCK);
+ } else if (direction == SND_RAWMIDI_STREAM_OUTPUT) {
+ err = snd_rawmidi_open(NULL, &native_handle, devicename,
+ SND_RAWMIDI_NONBLOCK);
+ } else {
+ ERROR0(" ERROR: openMidiDevice(): direction is neither SND_RAWMIDI_STREAM_INPUT nor SND_RAWMIDI_STREAM_OUTPUT\n");
+ err = MIDI_INVALID_ARGUMENT;
+ }
+ if (err < 0) {
+ ERROR1("< ERROR: openMidiDevice(): snd_rawmidi_open() returned %d\n", err);
+ free(*handle);
+ (*handle) = NULL;
+ return err;
+ }
+ /* We opened with non-blocking behaviour to not get hung if the device
+ is used by a different process. Writing, however, should
+ be blocking. So we change it here. */
+ if (direction == SND_RAWMIDI_STREAM_OUTPUT) {
+ err = snd_rawmidi_nonblock(native_handle, 0);
+ if (err < 0) {
+ ERROR1(" ERROR: openMidiDevice(): snd_rawmidi_nonblock() returned %d\n", err);
+ snd_rawmidi_close(native_handle);
+ free(*handle);
+ (*handle) = NULL;
+ return err;
+ }
+ }
+ if (direction == SND_RAWMIDI_STREAM_INPUT) {
+ err = snd_midi_event_new(EVENT_PARSER_BUFSIZE, &event_parser);
+ if (err < 0) {
+ ERROR1(" ERROR: openMidiDevice(): snd_midi_event_new() returned %d\n", err);
+ snd_rawmidi_close(native_handle);
+ free(*handle);
+ (*handle) = NULL;
+ return err;
+ }
+ }
+
+ (*handle)->deviceHandle = (void*) native_handle;
+ (*handle)->startTime = getTimeInMicroseconds();
+ (*handle)->platformData = event_parser;
+ TRACE0("< openMidiDevice(): succeeded\n");
+ return err;
+}
+
+
+
+INT32 closeMidiDevice(MidiDeviceHandle* handle) {
+ int err;
+
+ TRACE0("> closeMidiDevice()\n");
+ if (!handle) {
+ ERROR0("< ERROR: closeMidiDevice(): handle is NULL\n");
+ return MIDI_INVALID_HANDLE;
+ }
+ if (!handle->deviceHandle) {
+ ERROR0("< ERROR: closeMidiDevice(): native handle is NULL\n");
+ return MIDI_INVALID_HANDLE;
+ }
+ err = snd_rawmidi_close((snd_rawmidi_t*) handle->deviceHandle);
+ TRACE1(" snd_rawmidi_close() returns %d\n", err);
+ if (handle->platformData) {
+ snd_midi_event_free((snd_midi_event_t*) handle->platformData);
+ }
+ free(handle);
+ TRACE0("< closeMidiDevice: succeeded\n");
+ return err;
+}
+
+
+INT64 getMidiTimestamp(MidiDeviceHandle* handle) {
+ if (!handle) {
+ ERROR0("< ERROR: closeMidiDevice(): handle is NULL\n");
+ return MIDI_INVALID_HANDLE;
+ }
+ return getTimeInMicroseconds() - handle->startTime;
+}
+
+
+/* end */
diff -r eb72d194235c -r 514c68575523 src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.h Fri Mar 23 18:44:47 2018 +0000
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2003, 2007, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+#include
+#include "Utilities.h"
+#include "PlatformMidi.h"
+
+
+#ifndef PLATFORM_API_LINUXOS_ALSA_MIDIUTILS_H_INCLUDED
+#define PLATFORM_API_LINUXOS_ALSA_MIDIUTILS_H_INCLUDED
+
+#define EVENT_PARSER_BUFSIZE (2048)
+
+// if this is defined, use plughw: devices
+//#define ALSA_MIDI_USE_PLUGHW
+#undef ALSA_MIDI_USE_PLUGHW
+
+typedef struct tag_ALSA_MIDIDeviceDescription {
+ int index; // in
+ int strLen; // in
+ INT32 deviceID; // out
+ char* name; // out
+ char* description; // out
+} ALSA_MIDIDeviceDescription;
+
+
+const char* getErrorStr(INT32 err);
+
+/* Returns the number of devices. */
+/* direction is either SND_RAWMIDI_STREAM_OUTPUT or
+ SND_RAWMIDI_STREAM_INPUT. */
+int getMidiDeviceCount(snd_rawmidi_stream_t direction);
+
+/* Returns MIDI_SUCCESS or MIDI_INVALID_DEVICEID */
+/* direction is either SND_RAWMIDI_STREAM_OUTPUT or
+ SND_RAWMIDI_STREAM_INPUT. */
+int getMidiDeviceName(snd_rawmidi_stream_t direction, int index,
+ char *name, UINT32 nameLength);
+
+/* Returns MIDI_SUCCESS or MIDI_INVALID_DEVICEID */
+int getMidiDeviceVendor(int index, char *name, UINT32 nameLength);
+
+/* Returns MIDI_SUCCESS or MIDI_INVALID_DEVICEID */
+/* direction is either SND_RAWMIDI_STREAM_OUTPUT or
+ SND_RAWMIDI_STREAM_INPUT. */
+int getMidiDeviceDescription(snd_rawmidi_stream_t direction, int index,
+ char *name, UINT32 nameLength);
+
+/* Returns MIDI_SUCCESS or MIDI_INVALID_DEVICEID */
+int getMidiDeviceVersion(int index, char *name, UINT32 nameLength);
+
+// returns 0 on success, otherwise MIDI_OUT_OF_MEMORY or ALSA error code
+/* direction is either SND_RAWMIDI_STREAM_OUTPUT or
+ SND_RAWMIDI_STREAM_INPUT. */
+INT32 openMidiDevice(snd_rawmidi_stream_t direction, INT32 deviceIndex,
+ MidiDeviceHandle** handle);
+
+// returns 0 on success, otherwise a (negative) ALSA error code
+INT32 closeMidiDevice(MidiDeviceHandle* handle);
+
+INT64 getMidiTimestamp(MidiDeviceHandle* handle);
+
+#endif // PLATFORM_API_LINUXOS_ALSA_MIDIUTILS_H_INCLUDED
diff -r eb72d194235c -r 514c68575523 src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCM.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCM.c Fri Mar 23 18:44:47 2018 +0000
@@ -0,0 +1,941 @@
+/*
+ * Copyright (c) 2002, 2011, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+#define USE_ERROR
+#define USE_TRACE
+
+#include "PLATFORM_API_LinuxOS_ALSA_PCMUtils.h"
+#include "PLATFORM_API_LinuxOS_ALSA_CommonUtils.h"
+#include "DirectAudio.h"
+
+#if USE_DAUDIO == TRUE
+
+// GetPosition method 1: based on how many bytes are passed to the kernel driver
+// + does not need much processor resources
+// - not very exact, "jumps"
+// GetPosition method 2: ask kernel about actual position of playback.
+// - very exact
+// - switch to kernel layer for each call
+// GetPosition method 3: use snd_pcm_avail() call - not yet in official ALSA
+// quick tests on a Pentium 200MMX showed max. 1.5% processor usage
+// for playing back a CD-quality file and printing 20x per second a line
+// on the console with the current time. So I guess performance is not such a
+// factor here.
+//#define GET_POSITION_METHOD1
+#define GET_POSITION_METHOD2
+
+
+// The default time for a period in microseconds.
+// For very small buffers, only 2 periods are used.
+#define DEFAULT_PERIOD_TIME 20000 /* 20ms */
+
+///// implemented functions of DirectAudio.h
+
+INT32 DAUDIO_GetDirectAudioDeviceCount() {
+ return (INT32) getAudioDeviceCount();
+}
+
+
+INT32 DAUDIO_GetDirectAudioDeviceDescription(INT32 mixerIndex, DirectAudioDeviceDescription* description) {
+ ALSA_AudioDeviceDescription adesc;
+
+ adesc.index = (int) mixerIndex;
+ adesc.strLen = DAUDIO_STRING_LENGTH;
+
+ adesc.maxSimultaneousLines = (int*) (&(description->maxSimulLines));
+ adesc.deviceID = &(description->deviceID);
+ adesc.name = description->name;
+ adesc.vendor = description->vendor;
+ adesc.description = description->description;
+ adesc.version = description->version;
+
+ return getAudioDeviceDescriptionByIndex(&adesc);
+}
+
+#define MAX_BIT_INDEX 6
+// returns
+// 6: for anything above 24-bit
+// 5: for 4 bytes sample size, 24-bit
+// 4: for 3 bytes sample size, 24-bit
+// 3: for 3 bytes sample size, 20-bit
+// 2: for 2 bytes sample size, 16-bit
+// 1: for 1 byte sample size, 8-bit
+// 0: for anything else
+int getBitIndex(int sampleSizeInBytes, int significantBits) {
+ if (significantBits > 24) return 6;
+ if (sampleSizeInBytes == 4 && significantBits == 24) return 5;
+ if (sampleSizeInBytes == 3) {
+ if (significantBits == 24) return 4;
+ if (significantBits == 20) return 3;
+ }
+ if (sampleSizeInBytes == 2 && significantBits == 16) return 2;
+ if (sampleSizeInBytes == 1 && significantBits == 8) return 1;
+ return 0;
+}
+
+int getSampleSizeInBytes(int bitIndex, int sampleSizeInBytes) {
+ switch(bitIndex) {
+ case 1: return 1;
+ case 2: return 2;
+ case 3: /* fall through */
+ case 4: return 3;
+ case 5: return 4;
+ }
+ return sampleSizeInBytes;
+}
+
+int getSignificantBits(int bitIndex, int significantBits) {
+ switch(bitIndex) {
+ case 1: return 8;
+ case 2: return 16;
+ case 3: return 20;
+ case 4: /* fall through */
+ case 5: return 24;
+ }
+ return significantBits;
+}
+
+void DAUDIO_GetFormats(INT32 mixerIndex, INT32 deviceID, int isSource, void* creator) {
+ snd_pcm_t* handle;
+ snd_pcm_format_mask_t* formatMask;
+ snd_pcm_format_t format;
+ snd_pcm_hw_params_t* hwParams;
+ int handledBits[MAX_BIT_INDEX+1];
+
+ int ret;
+ int sampleSizeInBytes, significantBits, isSigned, isBigEndian, enc;
+ int origSampleSizeInBytes, origSignificantBits;
+ unsigned int channels, minChannels, maxChannels;
+ int rate, bitIndex;
+
+ for (bitIndex = 0; bitIndex <= MAX_BIT_INDEX; bitIndex++) handledBits[bitIndex] = FALSE;
+ if (openPCMfromDeviceID(deviceID, &handle, isSource, TRUE /*query hardware*/) < 0) {
+ return;
+ }
+ ret = snd_pcm_format_mask_malloc(&formatMask);
+ if (ret != 0) {
+ ERROR1("snd_pcm_format_mask_malloc returned error %d\n", ret);
+ } else {
+ ret = snd_pcm_hw_params_malloc(&hwParams);
+ if (ret != 0) {
+ ERROR1("snd_pcm_hw_params_malloc returned error %d\n", ret);
+ } else {
+ ret = snd_pcm_hw_params_any(handle, hwParams);
+ /* snd_pcm_hw_params_any can return a positive value on success too */
+ if (ret < 0) {
+ ERROR1("snd_pcm_hw_params_any returned error %d\n", ret);
+ } else {
+ /* for the logic following this code, set ret to 0 to indicate success */
+ ret = 0;
+ }
+ }
+ snd_pcm_hw_params_get_format_mask(hwParams, formatMask);
+ if (ret == 0) {
+ ret = snd_pcm_hw_params_get_channels_min(hwParams, &minChannels);
+ if (ret != 0) {
+ ERROR1("snd_pcm_hw_params_get_channels_min returned error %d\n", ret);
+ }
+ }
+ if (ret == 0) {
+ ret = snd_pcm_hw_params_get_channels_max(hwParams, &maxChannels);
+ if (ret != 0) {
+ ERROR1("snd_pcm_hw_params_get_channels_max returned error %d\n", ret);
+ }
+ }
+
+ // since we queried the hw: device, for many soundcards, it will only
+ // report the maximum number of channels (which is the only way to talk
+ // to the hw: device). Since we will, however, open the plughw: device
+ // when opening the Source/TargetDataLine, we can safely assume that
+ // also the channels 1..maxChannels are available.
+#ifdef ALSA_PCM_USE_PLUGHW
+ minChannels = 1;
+#endif
+ if (ret == 0) {
+ // plughw: supports any sample rate
+ rate = -1;
+ for (format = 0; format <= SND_PCM_FORMAT_LAST; format++) {
+ if (snd_pcm_format_mask_test(formatMask, format)) {
+ // format exists
+ if (getFormatFromAlsaFormat(format, &origSampleSizeInBytes,
+ &origSignificantBits,
+ &isSigned, &isBigEndian, &enc)) {
+ // now if we use plughw:, we can use any bit size below the
+ // natively supported ones. Some ALSA drivers only support the maximum
+ // bit size, so we add any sample rates below the reported one.
+ // E.g. this iteration reports support for 16-bit.
+ // getBitIndex will return 2, so it will add entries for
+ // 16-bit (bitIndex=2) and in the next do-while loop iteration,
+ // it will decrease bitIndex and will therefore add 8-bit support.
+ bitIndex = getBitIndex(origSampleSizeInBytes, origSignificantBits);
+ do {
+ if (bitIndex == 0
+ || bitIndex == MAX_BIT_INDEX
+ || !handledBits[bitIndex]) {
+ handledBits[bitIndex] = TRUE;
+ sampleSizeInBytes = getSampleSizeInBytes(bitIndex, origSampleSizeInBytes);
+ significantBits = getSignificantBits(bitIndex, origSignificantBits);
+ if (maxChannels - minChannels > MAXIMUM_LISTED_CHANNELS) {
+ // avoid too many channels explicitly listed
+ // just add -1, min, and max
+ DAUDIO_AddAudioFormat(creator, significantBits,
+ -1, -1, rate,
+ enc, isSigned, isBigEndian);
+ DAUDIO_AddAudioFormat(creator, significantBits,
+ sampleSizeInBytes * minChannels,
+ minChannels, rate,
+ enc, isSigned, isBigEndian);
+ DAUDIO_AddAudioFormat(creator, significantBits,
+ sampleSizeInBytes * maxChannels,
+ maxChannels, rate,
+ enc, isSigned, isBigEndian);
+ } else {
+ for (channels = minChannels; channels <= maxChannels; channels++) {
+ DAUDIO_AddAudioFormat(creator, significantBits,
+ sampleSizeInBytes * channels,
+ channels, rate,
+ enc, isSigned, isBigEndian);
+ }
+ }
+ }
+#ifndef ALSA_PCM_USE_PLUGHW
+ // without plugin, do not add fake formats
+ break;
+#endif
+ } while (--bitIndex > 0);
+ } else {
+ TRACE1("could not get format from alsa for format %d\n", format);
+ }
+ } else {
+ //TRACE1("Format %d not supported\n", format);
+ }
+ } // for loop
+ snd_pcm_hw_params_free(hwParams);
+ }
+ snd_pcm_format_mask_free(formatMask);
+ }
+ snd_pcm_close(handle);
+}
+
+/** Workaround for cr 7033899, 7030629:
+ * dmix plugin doesn't like flush (snd_pcm_drop) when the buffer is empty
+ * (just opened, underruned or already flushed).
+ * Sometimes it causes PCM falls to -EBADFD error,
+ * sometimes causes bufferSize change.
+ * To prevent unnecessary flushes AlsaPcmInfo::isRunning & isFlushed are used.
+ */
+/* ******* ALSA PCM INFO ******************** */
+typedef struct tag_AlsaPcmInfo {
+ snd_pcm_t* handle;
+ snd_pcm_hw_params_t* hwParams;
+ snd_pcm_sw_params_t* swParams;
+ int bufferSizeInBytes;
+ int frameSize; // storage size in Bytes
+ unsigned int periods;
+ snd_pcm_uframes_t periodSize;
+ short int isRunning; // see comment above
+ short int isFlushed; // see comment above
+#ifdef GET_POSITION_METHOD2
+ // to be used exclusively by getBytePosition!
+ snd_pcm_status_t* positionStatus;
+#endif
+} AlsaPcmInfo;
+
+
+int setStartThresholdNoCommit(AlsaPcmInfo* info, int useThreshold) {
+ int ret;
+ int threshold;
+
+ if (useThreshold) {
+ // start device whenever anything is written to the buffer
+ threshold = 1;
+ } else {
+ // never start the device automatically
+ threshold = 2000000000; /* near UINT_MAX */
+ }
+ ret = snd_pcm_sw_params_set_start_threshold(info->handle, info->swParams, threshold);
+ if (ret < 0) {
+ ERROR1("Unable to set start threshold mode: %s\n", snd_strerror(ret));
+ return FALSE;
+ }
+ return TRUE;
+}
+
+int setStartThreshold(AlsaPcmInfo* info, int useThreshold) {
+ int ret = 0;
+
+ if (!setStartThresholdNoCommit(info, useThreshold)) {
+ ret = -1;
+ }
+ if (ret == 0) {
+ // commit it
+ ret = snd_pcm_sw_params(info->handle, info->swParams);
+ if (ret < 0) {
+ ERROR1("Unable to set sw params: %s\n", snd_strerror(ret));
+ }
+ }
+ return (ret == 0)?TRUE:FALSE;
+}
+
+
+// returns TRUE if successful
+int setHWParams(AlsaPcmInfo* info,
+ float sampleRate,
+ int channels,
+ int bufferSizeInFrames,
+ snd_pcm_format_t format) {
+ unsigned int rrate, periodTime, periods;
+ int ret, dir;
+ snd_pcm_uframes_t alsaBufferSizeInFrames = (snd_pcm_uframes_t) bufferSizeInFrames;
+
+ /* choose all parameters */
+ ret = snd_pcm_hw_params_any(info->handle, info->hwParams);
+ if (ret < 0) {
+ ERROR1("Broken configuration: no configurations available: %s\n", snd_strerror(ret));
+ return FALSE;
+ }
+ /* set the interleaved read/write format */
+ ret = snd_pcm_hw_params_set_access(info->handle, info->hwParams, SND_PCM_ACCESS_RW_INTERLEAVED);
+ if (ret < 0) {
+ ERROR1("SND_PCM_ACCESS_RW_INTERLEAVED access type not available: %s\n", snd_strerror(ret));
+ return FALSE;
+ }
+ /* set the sample format */
+ ret = snd_pcm_hw_params_set_format(info->handle, info->hwParams, format);
+ if (ret < 0) {
+ ERROR1("Sample format not available: %s\n", snd_strerror(ret));
+ return FALSE;
+ }
+ /* set the count of channels */
+ ret = snd_pcm_hw_params_set_channels(info->handle, info->hwParams, channels);
+ if (ret < 0) {
+ ERROR2("Channels count (%d) not available: %s\n", channels, snd_strerror(ret));
+ return FALSE;
+ }
+ /* set the stream rate */
+ rrate = (int) (sampleRate + 0.5f);
+ dir = 0;
+ ret = snd_pcm_hw_params_set_rate_near(info->handle, info->hwParams, &rrate, &dir);
+ if (ret < 0) {
+ ERROR2("Rate %dHz not available for playback: %s\n", (int) (sampleRate+0.5f), snd_strerror(ret));
+ return FALSE;
+ }
+ if ((rrate-sampleRate > 2) || (rrate-sampleRate < - 2)) {
+ ERROR2("Rate doesn't match (requested %2.2fHz, got %dHz)\n", sampleRate, rrate);
+ return FALSE;
+ }
+ /* set the buffer time */
+ ret = snd_pcm_hw_params_set_buffer_size_near(info->handle, info->hwParams, &alsaBufferSizeInFrames);
+ if (ret < 0) {
+ ERROR2("Unable to set buffer size to %d frames: %s\n",
+ (int) alsaBufferSizeInFrames, snd_strerror(ret));
+ return FALSE;
+ }
+ bufferSizeInFrames = (int) alsaBufferSizeInFrames;
+ /* set the period time */
+ if (bufferSizeInFrames > 1024) {
+ dir = 0;
+ periodTime = DEFAULT_PERIOD_TIME;
+ ret = snd_pcm_hw_params_set_period_time_near(info->handle, info->hwParams, &periodTime, &dir);
+ if (ret < 0) {
+ ERROR2("Unable to set period time to %d: %s\n", DEFAULT_PERIOD_TIME, snd_strerror(ret));
+ return FALSE;
+ }
+ } else {
+ /* set the period count for very small buffer sizes to 2 */
+ dir = 0;
+ periods = 2;
+ ret = snd_pcm_hw_params_set_periods_near(info->handle, info->hwParams, &periods, &dir);
+ if (ret < 0) {
+ ERROR2("Unable to set period count to %d: %s\n", /*periods*/ 2, snd_strerror(ret));
+ return FALSE;
+ }
+ }
+ /* write the parameters to device */
+ ret = snd_pcm_hw_params(info->handle, info->hwParams);
+ if (ret < 0) {
+ ERROR1("Unable to set hw params: %s\n", snd_strerror(ret));
+ return FALSE;
+ }
+ return TRUE;
+}
+
+// returns 1 if successful
+int setSWParams(AlsaPcmInfo* info) {
+ int ret;
+
+ /* get the current swparams */
+ ret = snd_pcm_sw_params_current(info->handle, info->swParams);
+ if (ret < 0) {
+ ERROR1("Unable to determine current swparams: %s\n", snd_strerror(ret));
+ return FALSE;
+ }
+ /* never start the transfer automatically */
+ if (!setStartThresholdNoCommit(info, FALSE /* don't use threshold */)) {
+ return FALSE;
+ }
+
+ /* allow the transfer when at least period_size samples can be processed */
+ ret = snd_pcm_sw_params_set_avail_min(info->handle, info->swParams, info->periodSize);
+ if (ret < 0) {
+ ERROR1("Unable to set avail min for playback: %s\n", snd_strerror(ret));
+ return FALSE;
+ }
+ /* write the parameters to the playback device */
+ ret = snd_pcm_sw_params(info->handle, info->swParams);
+ if (ret < 0) {
+ ERROR1("Unable to set sw params: %s\n", snd_strerror(ret));
+ return FALSE;
+ }
+ return TRUE;
+}
+
+static snd_output_t* ALSA_OUTPUT = NULL;
+
+void* DAUDIO_Open(INT32 mixerIndex, INT32 deviceID, int isSource,
+ int encoding, float sampleRate, int sampleSizeInBits,
+ int frameSize, int channels,
+ int isSigned, int isBigEndian, int bufferSizeInBytes) {
+ snd_pcm_format_mask_t* formatMask;
+ snd_pcm_format_t format;
+ int dir;
+ int ret = 0;
+ AlsaPcmInfo* info = NULL;
+ /* snd_pcm_uframes_t is 64 bit on 64-bit systems */
+ snd_pcm_uframes_t alsaBufferSizeInFrames = 0;
+
+
+ TRACE0("> DAUDIO_Open\n");
+#ifdef USE_TRACE
+ // for using ALSA debug dump methods
+ if (ALSA_OUTPUT == NULL) {
+ snd_output_stdio_attach(&ALSA_OUTPUT, stdout, 0);
+ }
+#endif
+ if (channels <= 0) {
+ ERROR1("ERROR: Invalid number of channels=%d!\n", channels);
+ return NULL;
+ }
+ info = (AlsaPcmInfo*) malloc(sizeof(AlsaPcmInfo));
+ if (!info) {
+ ERROR0("Out of memory\n");
+ return NULL;
+ }
+ memset(info, 0, sizeof(AlsaPcmInfo));
+ // initial values are: stopped, flushed
+ info->isRunning = 0;
+ info->isFlushed = 1;
+
+ ret = openPCMfromDeviceID(deviceID, &(info->handle), isSource, FALSE /* do open device*/);
+ if (ret == 0) {
+ // set to blocking mode
+ snd_pcm_nonblock(info->handle, 0);
+ ret = snd_pcm_hw_params_malloc(&(info->hwParams));
+ if (ret != 0) {
+ ERROR1(" snd_pcm_hw_params_malloc returned error %d\n", ret);
+ } else {
+ ret = -1;
+ if (getAlsaFormatFromFormat(&format, frameSize / channels, sampleSizeInBits,
+ isSigned, isBigEndian, encoding)) {
+ if (setHWParams(info,
+ sampleRate,
+ channels,
+ bufferSizeInBytes / frameSize,
+ format)) {
+ info->frameSize = frameSize;
+ ret = snd_pcm_hw_params_get_period_size(info->hwParams, &info->periodSize, &dir);
+ if (ret < 0) {
+ ERROR1("ERROR: snd_pcm_hw_params_get_period: %s\n", snd_strerror(ret));
+ }
+ snd_pcm_hw_params_get_periods(info->hwParams, &(info->periods), &dir);
+ snd_pcm_hw_params_get_buffer_size(info->hwParams, &alsaBufferSizeInFrames);
+ info->bufferSizeInBytes = (int) alsaBufferSizeInFrames * frameSize;
+ TRACE3(" DAUDIO_Open: period size = %d frames, periods = %d. Buffer size: %d bytes.\n",
+ (int) info->periodSize, info->periods, info->bufferSizeInBytes);
+ }
+ }
+ }
+ if (ret == 0) {
+ // set software parameters
+ ret = snd_pcm_sw_params_malloc(&(info->swParams));
+ if (ret != 0) {
+ ERROR1("snd_pcm_hw_params_malloc returned error %d\n", ret);
+ } else {
+ if (!setSWParams(info)) {
+ ret = -1;
+ }
+ }
+ }
+ if (ret == 0) {
+ // prepare device
+ ret = snd_pcm_prepare(info->handle);
+ if (ret < 0) {
+ ERROR1("ERROR: snd_pcm_prepare: %s\n", snd_strerror(ret));
+ }
+ }
+
+#ifdef GET_POSITION_METHOD2
+ if (ret == 0) {
+ ret = snd_pcm_status_malloc(&(info->positionStatus));
+ if (ret != 0) {
+ ERROR1("ERROR in snd_pcm_status_malloc: %s\n", snd_strerror(ret));
+ }
+ }
+#endif
+ }
+ if (ret != 0) {
+ DAUDIO_Close((void*) info, isSource);
+ info = NULL;
+ } else {
+ // set to non-blocking mode
+ snd_pcm_nonblock(info->handle, 1);
+ TRACE1("< DAUDIO_Open: Opened device successfully. Handle=%p\n",
+ (void*) info->handle);
+ }
+ return (void*) info;
+}
+
+#ifdef USE_TRACE
+void printState(snd_pcm_state_t state) {
+ if (state == SND_PCM_STATE_OPEN) {
+ TRACE0("State: SND_PCM_STATE_OPEN\n");
+ }
+ else if (state == SND_PCM_STATE_SETUP) {
+ TRACE0("State: SND_PCM_STATE_SETUP\n");
+ }
+ else if (state == SND_PCM_STATE_PREPARED) {
+ TRACE0("State: SND_PCM_STATE_PREPARED\n");
+ }
+ else if (state == SND_PCM_STATE_RUNNING) {
+ TRACE0("State: SND_PCM_STATE_RUNNING\n");
+ }
+ else if (state == SND_PCM_STATE_XRUN) {
+ TRACE0("State: SND_PCM_STATE_XRUN\n");
+ }
+ else if (state == SND_PCM_STATE_DRAINING) {
+ TRACE0("State: SND_PCM_STATE_DRAINING\n");
+ }
+ else if (state == SND_PCM_STATE_PAUSED) {
+ TRACE0("State: SND_PCM_STATE_PAUSED\n");
+ }
+ else if (state == SND_PCM_STATE_SUSPENDED) {
+ TRACE0("State: SND_PCM_STATE_SUSPENDED\n");
+ }
+}
+#endif
+
+int DAUDIO_Start(void* id, int isSource) {
+ AlsaPcmInfo* info = (AlsaPcmInfo*) id;
+ int ret;
+ snd_pcm_state_t state;
+
+ TRACE0("> DAUDIO_Start\n");
+ // set to blocking mode
+ snd_pcm_nonblock(info->handle, 0);
+ // set start mode so that it always starts as soon as data is there
+ setStartThreshold(info, TRUE /* use threshold */);
+ state = snd_pcm_state(info->handle);
+ if (state == SND_PCM_STATE_PAUSED) {
+ // in case it was stopped previously
+ TRACE0(" Un-pausing...\n");
+ ret = snd_pcm_pause(info->handle, FALSE);
+ if (ret != 0) {
+ ERROR2(" NOTE: error in snd_pcm_pause:%d: %s\n", ret, snd_strerror(ret));
+ }
+ }
+ if (state == SND_PCM_STATE_SUSPENDED) {
+ TRACE0(" Resuming...\n");
+ ret = snd_pcm_resume(info->handle);
+ if (ret < 0) {
+ if ((ret != -EAGAIN) && (ret != -ENOSYS)) {
+ ERROR2(" ERROR: error in snd_pcm_resume:%d: %s\n", ret, snd_strerror(ret));
+ }
+ }
+ }
+ if (state == SND_PCM_STATE_SETUP) {
+ TRACE0("need to call prepare again...\n");
+ // prepare device
+ ret = snd_pcm_prepare(info->handle);
+ if (ret < 0) {
+ ERROR1("ERROR: snd_pcm_prepare: %s\n", snd_strerror(ret));
+ }
+ }
+ // in case there is still data in the buffers
+ ret = snd_pcm_start(info->handle);
+ if (ret != 0) {
+ if (ret != -EPIPE) {
+ ERROR2(" NOTE: error in snd_pcm_start: %d: %s\n", ret, snd_strerror(ret));
+ }
+ }
+ // set to non-blocking mode
+ ret = snd_pcm_nonblock(info->handle, 1);
+ if (ret != 0) {
+ ERROR1(" ERROR in snd_pcm_nonblock: %s\n", snd_strerror(ret));
+ }
+ state = snd_pcm_state(info->handle);
+#ifdef USE_TRACE
+ printState(state);
+#endif
+ ret = (state == SND_PCM_STATE_PREPARED)
+ || (state == SND_PCM_STATE_RUNNING)
+ || (state == SND_PCM_STATE_XRUN)
+ || (state == SND_PCM_STATE_SUSPENDED);
+ if (ret) {
+ info->isRunning = 1;
+ // source line should keep isFlushed value until Write() is called;
+ // for target data line reset it right now.
+ if (!isSource) {
+ info->isFlushed = 0;
+ }
+ }
+ TRACE1("< DAUDIO_Start %s\n", ret?"success":"error");
+ return ret?TRUE:FALSE;
+}
+
+int DAUDIO_Stop(void* id, int isSource) {
+ AlsaPcmInfo* info = (AlsaPcmInfo*) id;
+ int ret;
+
+ TRACE0("> DAUDIO_Stop\n");
+ // set to blocking mode
+ snd_pcm_nonblock(info->handle, 0);
+ setStartThreshold(info, FALSE /* don't use threshold */); // device will not start after buffer xrun
+ ret = snd_pcm_pause(info->handle, 1);
+ // set to non-blocking mode
+ snd_pcm_nonblock(info->handle, 1);
+ if (ret != 0) {
+ ERROR1("ERROR in snd_pcm_pause: %s\n", snd_strerror(ret));
+ return FALSE;
+ }
+ info->isRunning = 0;
+ TRACE0("< DAUDIO_Stop success\n");
+ return TRUE;
+}
+
+void DAUDIO_Close(void* id, int isSource) {
+ AlsaPcmInfo* info = (AlsaPcmInfo*) id;
+
+ TRACE0("DAUDIO_Close\n");
+ if (info != NULL) {
+ if (info->handle != NULL) {
+ snd_pcm_close(info->handle);
+ }
+ if (info->hwParams) {
+ snd_pcm_hw_params_free(info->hwParams);
+ }
+ if (info->swParams) {
+ snd_pcm_sw_params_free(info->swParams);
+ }
+#ifdef GET_POSITION_METHOD2
+ if (info->positionStatus) {
+ snd_pcm_status_free(info->positionStatus);
+ }
+#endif
+ free(info);
+ }
+}
+
+/*
+ * Underrun and suspend recovery
+ * returns
+ * 0: exit native and return 0
+ * 1: try again to write/read
+ * -1: error - exit native with return value -1
+ */
+int xrun_recovery(AlsaPcmInfo* info, int err) {
+ int ret;
+
+ if (err == -EPIPE) { /* underrun / overflow */
+ TRACE0("xrun_recovery: underrun/overflow.\n");
+ ret = snd_pcm_prepare(info->handle);
+ if (ret < 0) {
+ ERROR1("Can't recover from underrun/overflow, prepare failed: %s\n", snd_strerror(ret));
+ return -1;
+ }
+ return 1;
+ } else if (err == -ESTRPIPE) {
+ TRACE0("xrun_recovery: suspended.\n");
+ ret = snd_pcm_resume(info->handle);
+ if (ret < 0) {
+ if (ret == -EAGAIN) {
+ return 0; /* wait until the suspend flag is released */
+ }
+ return -1;
+ }
+ ret = snd_pcm_prepare(info->handle);
+ if (ret < 0) {
+ ERROR1("Can't recover from underrun/overflow, prepare failed: %s\n", snd_strerror(ret));
+ return -1;
+ }
+ return 1;
+ } else if (err == -EAGAIN) {
+ TRACE0("xrun_recovery: EAGAIN try again flag.\n");
+ return 0;
+ }
+
+ TRACE2("xrun_recovery: unexpected error %d: %s\n", err, snd_strerror(err));
+ return -1;
+}
+
+// returns -1 on error
+int DAUDIO_Write(void* id, char* data, int byteSize) {
+ AlsaPcmInfo* info = (AlsaPcmInfo*) id;
+ int ret, count;
+ snd_pcm_sframes_t frameSize, writtenFrames;
+
+ TRACE1("> DAUDIO_Write %d bytes\n", byteSize);
+
+ /* sanity */
+ if (byteSize <= 0 || info->frameSize <= 0) {
+ ERROR2(" DAUDIO_Write: byteSize=%d, frameSize=%d!\n",
+ (int) byteSize, (int) info->frameSize);
+ TRACE0("< DAUDIO_Write returning -1\n");
+ return -1;
+ }
+
+ count = 2; // maximum number of trials to recover from underrun
+ //frameSize = snd_pcm_bytes_to_frames(info->handle, byteSize);
+ frameSize = (snd_pcm_sframes_t) (byteSize / info->frameSize);
+ do {
+ writtenFrames = snd_pcm_writei(info->handle, (const void*) data, (snd_pcm_uframes_t) frameSize);
+
+ if (writtenFrames < 0) {
+ ret = xrun_recovery(info, (int) writtenFrames);
+ if (ret <= 0) {
+ TRACE1("DAUDIO_Write: xrun recovery returned %d -> return.\n", ret);
+ return ret;
+ }
+ if (count-- <= 0) {
+ ERROR0("DAUDIO_Write: too many attempts to recover from xrun/suspend\n");
+ return -1;
+ }
+ } else {
+ break;
+ }
+ } while (TRUE);
+ //ret = snd_pcm_frames_to_bytes(info->handle, writtenFrames);
+
+ if (writtenFrames > 0) {
+ // reset "flushed" flag
+ info->isFlushed = 0;
+ }
+
+ ret = (int) (writtenFrames * info->frameSize);
+ TRACE1("< DAUDIO_Write: returning %d bytes.\n", ret);
+ return ret;
+}
+
+// returns -1 on error
+int DAUDIO_Read(void* id, char* data, int byteSize) {
+ AlsaPcmInfo* info = (AlsaPcmInfo*) id;
+ int ret, count;
+ snd_pcm_sframes_t frameSize, readFrames;
+
+ TRACE1("> DAUDIO_Read %d bytes\n", byteSize);
+ /*TRACE3(" info=%p, data=%p, byteSize=%d\n",
+ (void*) info, (void*) data, (int) byteSize);
+ TRACE2(" info->frameSize=%d, info->handle=%p\n",
+ (int) info->frameSize, (void*) info->handle);
+ */
+ /* sanity */
+ if (byteSize <= 0 || info->frameSize <= 0) {
+ ERROR2(" DAUDIO_Read: byteSize=%d, frameSize=%d!\n",
+ (int) byteSize, (int) info->frameSize);
+ TRACE0("< DAUDIO_Read returning -1\n");
+ return -1;
+ }
+ if (!info->isRunning && info->isFlushed) {
+ // PCM has nothing to read
+ return 0;
+ }
+
+ count = 2; // maximum number of trials to recover from error
+ //frameSize = snd_pcm_bytes_to_frames(info->handle, byteSize);
+ frameSize = (snd_pcm_sframes_t) (byteSize / info->frameSize);
+ do {
+ readFrames = snd_pcm_readi(info->handle, (void*) data, (snd_pcm_uframes_t) frameSize);
+ if (readFrames < 0) {
+ ret = xrun_recovery(info, (int) readFrames);
+ if (ret <= 0) {
+ TRACE1("DAUDIO_Read: xrun recovery returned %d -> return.\n", ret);
+ return ret;
+ }
+ if (count-- <= 0) {
+ ERROR0("DAUDIO_Read: too many attempts to recover from xrun/suspend\n");
+ return -1;
+ }
+ } else {
+ break;
+ }
+ } while (TRUE);
+ //ret = snd_pcm_frames_to_bytes(info->handle, readFrames);
+ ret = (int) (readFrames * info->frameSize);
+ TRACE1("< DAUDIO_Read: returning %d bytes.\n", ret);
+ return ret;
+}
+
+
+int DAUDIO_GetBufferSize(void* id, int isSource) {
+ AlsaPcmInfo* info = (AlsaPcmInfo*) id;
+
+ return info->bufferSizeInBytes;
+}
+
+int DAUDIO_StillDraining(void* id, int isSource) {
+ AlsaPcmInfo* info = (AlsaPcmInfo*) id;
+ snd_pcm_state_t state;
+
+ state = snd_pcm_state(info->handle);
+ //printState(state);
+ //TRACE1("Still draining: %s\n", (state != SND_PCM_STATE_XRUN)?"TRUE":"FALSE");
+ return (state == SND_PCM_STATE_RUNNING)?TRUE:FALSE;
+}
+
+
+int DAUDIO_Flush(void* id, int isSource) {
+ AlsaPcmInfo* info = (AlsaPcmInfo*) id;
+ int ret;
+
+ TRACE0("DAUDIO_Flush\n");
+
+ if (info->isFlushed) {
+ // nothing to drop
+ return 1;
+ }
+
+ ret = snd_pcm_drop(info->handle);
+ if (ret != 0) {
+ ERROR1("ERROR in snd_pcm_drop: %s\n", snd_strerror(ret));
+ return FALSE;
+ }
+
+ info->isFlushed = 1;
+ if (info->isRunning) {
+ ret = DAUDIO_Start(id, isSource);
+ }
+ return ret;
+}
+
+int DAUDIO_GetAvailable(void* id, int isSource) {
+ AlsaPcmInfo* info = (AlsaPcmInfo*) id;
+ snd_pcm_sframes_t availableInFrames;
+ snd_pcm_state_t state;
+ int ret;
+
+ state = snd_pcm_state(info->handle);
+ if (info->isFlushed || state == SND_PCM_STATE_XRUN) {
+ // if in xrun state then we have the entire buffer available,
+ // not 0 as alsa reports
+ ret = info->bufferSizeInBytes;
+ } else {
+ availableInFrames = snd_pcm_avail_update(info->handle);
+ if (availableInFrames < 0) {
+ ret = 0;
+ } else {
+ //ret = snd_pcm_frames_to_bytes(info->handle, availableInFrames);
+ ret = (int) (availableInFrames * info->frameSize);
+ }
+ }
+ TRACE1("DAUDIO_GetAvailable returns %d bytes\n", ret);
+ return ret;
+}
+
+INT64 estimatePositionFromAvail(AlsaPcmInfo* info, int isSource, INT64 javaBytePos, int availInBytes) {
+ // estimate the current position with the buffer size and
+ // the available bytes to read or write in the buffer.
+ // not an elegant solution - bytePos will stop on xruns,
+ // and in race conditions it may jump backwards
+ // Advantage is that it is indeed based on the samples that go through
+ // the system (rather than time-based methods)
+ if (isSource) {
+ // javaBytePos is the position that is reached when the current
+ // buffer is played completely
+ return (INT64) (javaBytePos - info->bufferSizeInBytes + availInBytes);
+ } else {
+ // javaBytePos is the position that was when the current buffer was empty
+ return (INT64) (javaBytePos + availInBytes);
+ }
+}
+
+INT64 DAUDIO_GetBytePosition(void* id, int isSource, INT64 javaBytePos) {
+ AlsaPcmInfo* info = (AlsaPcmInfo*) id;
+ int ret;
+ INT64 result = javaBytePos;
+ snd_pcm_state_t state;
+ state = snd_pcm_state(info->handle);
+
+ if (!info->isFlushed && state != SND_PCM_STATE_XRUN) {
+#ifdef GET_POSITION_METHOD2
+ snd_timestamp_t* ts;
+ snd_pcm_uframes_t framesAvail;
+
+ // note: slight race condition if this is called simultaneously from 2 threads
+ ret = snd_pcm_status(info->handle, info->positionStatus);
+ if (ret != 0) {
+ ERROR1("ERROR in snd_pcm_status: %s\n", snd_strerror(ret));
+ result = javaBytePos;
+ } else {
+ // calculate from time value, or from available bytes
+ framesAvail = snd_pcm_status_get_avail(info->positionStatus);
+ result = estimatePositionFromAvail(info, isSource, javaBytePos, framesAvail * info->frameSize);
+ }
+#endif
+#ifdef GET_POSITION_METHOD3
+ snd_pcm_uframes_t framesAvail;
+ ret = snd_pcm_avail(info->handle, &framesAvail);
+ if (ret != 0) {
+ ERROR1("ERROR in snd_pcm_avail: %s\n", snd_strerror(ret));
+ result = javaBytePos;
+ } else {
+ result = estimatePositionFromAvail(info, isSource, javaBytePos, framesAvail * info->frameSize);
+ }
+#endif
+#ifdef GET_POSITION_METHOD1
+ result = estimatePositionFromAvail(info, isSource, javaBytePos, DAUDIO_GetAvailable(id, isSource));
+#endif
+ }
+ //printf("getbyteposition: javaBytePos=%d , return=%d\n", (int) javaBytePos, (int) result);
+ return result;
+}
+
+
+
+void DAUDIO_SetBytePosition(void* id, int isSource, INT64 javaBytePos) {
+ /* save to ignore, since GetBytePosition
+ * takes the javaBytePos param into account
+ */
+}
+
+int DAUDIO_RequiresServicing(void* id, int isSource) {
+ // never need servicing on Linux
+ return FALSE;
+}
+
+void DAUDIO_Service(void* id, int isSource) {
+ // never need servicing on Linux
+}
+
+
+#endif // USE_DAUDIO
diff -r eb72d194235c -r 514c68575523 src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.c Fri Mar 23 18:44:47 2018 +0000
@@ -0,0 +1,292 @@
+/*
+ * Copyright (c) 2003, 2014, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+//#define USE_ERROR
+//#define USE_TRACE
+
+#include "PLATFORM_API_LinuxOS_ALSA_PCMUtils.h"
+#include "PLATFORM_API_LinuxOS_ALSA_CommonUtils.h"
+
+
+
+// callback for iteration through devices
+// returns TRUE if iteration should continue
+// NOTE: cardinfo may be NULL (for "default" device)
+typedef int (*DeviceIteratorPtr)(UINT32 deviceID, snd_pcm_info_t* pcminfo,
+ snd_ctl_card_info_t* cardinfo, void *userData);
+
+// for each ALSA device, call iterator. userData is passed to the iterator
+// returns total number of iterations
+int iteratePCMDevices(DeviceIteratorPtr iterator, void* userData) {
+ int count = 0;
+ int subdeviceCount;
+ int card, dev, subDev;
+ char devname[16];
+ int err;
+ snd_ctl_t *handle;
+ snd_pcm_t *pcm;
+ snd_pcm_info_t* pcminfo;
+ snd_ctl_card_info_t *cardinfo, *defcardinfo = NULL;
+ UINT32 deviceID;
+ int doContinue = TRUE;
+
+ snd_pcm_info_malloc(&pcminfo);
+ snd_ctl_card_info_malloc(&cardinfo);
+
+ // 1st try "default" device
+ err = snd_pcm_open(&pcm, ALSA_DEFAULT_DEVICE_NAME,
+ SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK);
+ if (err < 0) {
+ // try with the other direction
+ err = snd_pcm_open(&pcm, ALSA_DEFAULT_DEVICE_NAME,
+ SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK);
+ }
+ if (err < 0) {
+ ERROR1("ERROR: snd_pcm_open (\"default\"): %s\n", snd_strerror(err));
+ } else {
+ err = snd_pcm_info(pcm, pcminfo);
+ snd_pcm_close(pcm);
+ if (err < 0) {
+ ERROR1("ERROR: snd_pcm_info (\"default\"): %s\n",
+ snd_strerror(err));
+ } else {
+ // try to get card info
+ card = snd_pcm_info_get_card(pcminfo);
+ if (card >= 0) {
+ sprintf(devname, ALSA_HARDWARE_CARD, card);
+ if (snd_ctl_open(&handle, devname, SND_CTL_NONBLOCK) >= 0) {
+ if (snd_ctl_card_info(handle, cardinfo) >= 0) {
+ defcardinfo = cardinfo;
+ }
+ snd_ctl_close(handle);
+ }
+ }
+ // call callback function for the device
+ if (iterator != NULL) {
+ doContinue = (*iterator)(ALSA_DEFAULT_DEVICE_ID, pcminfo,
+ defcardinfo, userData);
+ }
+ count++;
+ }
+ }
+
+ // iterate cards
+ card = -1;
+ while (doContinue) {
+ if (snd_card_next(&card) < 0) {
+ break;
+ }
+ if (card < 0) {
+ break;
+ }
+ sprintf(devname, ALSA_HARDWARE_CARD, card);
+ TRACE1("Opening alsa device \"%s\"...\n", devname);
+ err = snd_ctl_open(&handle, devname, SND_CTL_NONBLOCK);
+ if (err < 0) {
+ ERROR2("ERROR: snd_ctl_open, card=%d: %s\n",
+ card, snd_strerror(err));
+ } else {
+ err = snd_ctl_card_info(handle, cardinfo);
+ if (err < 0) {
+ ERROR2("ERROR: snd_ctl_card_info, card=%d: %s\n",
+ card, snd_strerror(err));
+ } else {
+ dev = -1;
+ while (doContinue) {
+ if (snd_ctl_pcm_next_device(handle, &dev) < 0) {
+ ERROR0("snd_ctl_pcm_next_device\n");
+ }
+ if (dev < 0) {
+ break;
+ }
+ snd_pcm_info_set_device(pcminfo, dev);
+ snd_pcm_info_set_subdevice(pcminfo, 0);
+ snd_pcm_info_set_stream(pcminfo, SND_PCM_STREAM_PLAYBACK);
+ err = snd_ctl_pcm_info(handle, pcminfo);
+ if (err == -ENOENT) {
+ // try with the other direction
+ snd_pcm_info_set_stream(pcminfo, SND_PCM_STREAM_CAPTURE);
+ err = snd_ctl_pcm_info(handle, pcminfo);
+ }
+ if (err < 0) {
+ if (err != -ENOENT) {
+ ERROR2("ERROR: snd_ctl_pcm_info, card=%d: %s",
+ card, snd_strerror(err));
+ }
+ } else {
+ subdeviceCount = needEnumerateSubdevices(ALSA_PCM) ?
+ snd_pcm_info_get_subdevices_count(pcminfo) : 1;
+ if (iterator!=NULL) {
+ for (subDev = 0; subDev < subdeviceCount; subDev++) {
+ deviceID = encodeDeviceID(card, dev, subDev);
+ doContinue = (*iterator)(deviceID, pcminfo,
+ cardinfo, userData);
+ count++;
+ if (!doContinue) {
+ break;
+ }
+ }
+ } else {
+ count += subdeviceCount;
+ }
+ }
+ } // of while(doContinue)
+ }
+ snd_ctl_close(handle);
+ }
+ }
+ snd_ctl_card_info_free(cardinfo);
+ snd_pcm_info_free(pcminfo);
+ return count;
+}
+
+int getAudioDeviceCount() {
+ initAlsaSupport();
+ return iteratePCMDevices(NULL, NULL);
+}
+
+int deviceInfoIterator(UINT32 deviceID, snd_pcm_info_t* pcminfo,
+ snd_ctl_card_info_t* cardinfo, void* userData) {
+ char buffer[300];
+ ALSA_AudioDeviceDescription* desc = (ALSA_AudioDeviceDescription*)userData;
+#ifdef ALSA_PCM_USE_PLUGHW
+ int usePlugHw = 1;
+#else
+ int usePlugHw = 0;
+#endif
+
+ initAlsaSupport();
+ if (desc->index == 0) {
+ // we found the device with correct index
+ *(desc->maxSimultaneousLines) = needEnumerateSubdevices(ALSA_PCM) ?
+ 1 : snd_pcm_info_get_subdevices_count(pcminfo);
+ *desc->deviceID = deviceID;
+ buffer[0]=' '; buffer[1]='[';
+ // buffer[300] is enough to store the actual device string w/o overrun
+ getDeviceStringFromDeviceID(&buffer[2], deviceID, usePlugHw, ALSA_PCM);
+ strncat(buffer, "]", sizeof(buffer) - strlen(buffer) - 1);
+ strncpy(desc->name,
+ (cardinfo != NULL)
+ ? snd_ctl_card_info_get_id(cardinfo)
+ : snd_pcm_info_get_id(pcminfo),
+ desc->strLen - strlen(buffer));
+ strncat(desc->name, buffer, desc->strLen - strlen(desc->name));
+ strncpy(desc->vendor, "ALSA (http://www.alsa-project.org)", desc->strLen);
+ strncpy(desc->description,
+ (cardinfo != NULL)
+ ? snd_ctl_card_info_get_name(cardinfo)
+ : snd_pcm_info_get_name(pcminfo),
+ desc->strLen);
+ strncat(desc->description, ", ", desc->strLen - strlen(desc->description));
+ strncat(desc->description, snd_pcm_info_get_id(pcminfo), desc->strLen - strlen(desc->description));
+ strncat(desc->description, ", ", desc->strLen - strlen(desc->description));
+ strncat(desc->description, snd_pcm_info_get_name(pcminfo), desc->strLen - strlen(desc->description));
+ getALSAVersion(desc->version, desc->strLen);
+ TRACE4("Returning %s, %s, %s, %s\n", desc->name, desc->vendor, desc->description, desc->version);
+ return FALSE; // do not continue iteration
+ }
+ desc->index--;
+ return TRUE;
+}
+
+// returns 0 if successful
+int openPCMfromDeviceID(int deviceID, snd_pcm_t** handle, int isSource, int hardware) {
+ char buffer[200];
+ int ret;
+
+ initAlsaSupport();
+ getDeviceStringFromDeviceID(buffer, deviceID, !hardware, ALSA_PCM);
+
+ TRACE1("Opening ALSA device %s\n", buffer);
+ ret = snd_pcm_open(handle, buffer,
+ isSource?SND_PCM_STREAM_PLAYBACK:SND_PCM_STREAM_CAPTURE,
+ SND_PCM_NONBLOCK);
+ if (ret != 0) {
+ ERROR1("snd_pcm_open returned error code %d \n", ret);
+ *handle = NULL;
+ }
+ return ret;
+}
+
+
+int getAudioDeviceDescriptionByIndex(ALSA_AudioDeviceDescription* desc) {
+ initAlsaSupport();
+ TRACE1(" getAudioDeviceDescriptionByIndex(mixerIndex = %d\n", desc->index);
+ iteratePCMDevices(&deviceInfoIterator, desc);
+ return (desc->index == 0)?TRUE:FALSE;
+}
+
+// returns 1 if successful
+// enc: 0 for PCM, 1 for ULAW, 2 for ALAW (see DirectAudio.h)
+int getFormatFromAlsaFormat(snd_pcm_format_t alsaFormat,
+ int* sampleSizeInBytes, int* significantBits,
+ int* isSigned, int* isBigEndian, int* enc) {
+
+ *sampleSizeInBytes = (snd_pcm_format_physical_width(alsaFormat) + 7) / 8;
+ *significantBits = snd_pcm_format_width(alsaFormat);
+
+ // defaults
+ *enc = 0; // PCM
+ *isSigned = (snd_pcm_format_signed(alsaFormat) > 0);
+ *isBigEndian = (snd_pcm_format_big_endian(alsaFormat) > 0);
+
+ // non-PCM formats
+ if (alsaFormat == SND_PCM_FORMAT_MU_LAW) { // Mu-Law
+ *sampleSizeInBytes = 8; *enc = 1; *significantBits = *sampleSizeInBytes;
+ }
+ else if (alsaFormat == SND_PCM_FORMAT_A_LAW) { // A-Law
+ *sampleSizeInBytes = 8; *enc = 2; *significantBits = *sampleSizeInBytes;
+ }
+ else if (snd_pcm_format_linear(alsaFormat) < 1) {
+ return 0;
+ }
+ return (*sampleSizeInBytes > 0);
+}
+
+// returns 1 if successful
+int getAlsaFormatFromFormat(snd_pcm_format_t* alsaFormat,
+ int sampleSizeInBytes, int significantBits,
+ int isSigned, int isBigEndian, int enc) {
+ *alsaFormat = SND_PCM_FORMAT_UNKNOWN;
+
+ if (enc == 0) {
+ *alsaFormat = snd_pcm_build_linear_format(significantBits,
+ sampleSizeInBytes * 8,
+ isSigned?0:1,
+ isBigEndian?1:0);
+ }
+ else if ((sampleSizeInBytes == 1) && (significantBits == 8)) {
+ if (enc == 1) { // ULAW
+ *alsaFormat = SND_PCM_FORMAT_MU_LAW;
+ }
+ else if (enc == 2) { // ALAW
+ *alsaFormat = SND_PCM_FORMAT_A_LAW;
+ }
+ }
+ return (*alsaFormat == SND_PCM_FORMAT_UNKNOWN)?0:1;
+}
+
+
+/* end */
diff -r eb72d194235c -r 514c68575523 src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.h Fri Mar 23 18:44:47 2018 +0000
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2003, 2010, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+// define this with a later version of ALSA than 0.9.0rc3
+// (starting from 1.0.0 it became default behaviour)
+#define ALSA_PCM_NEW_HW_PARAMS_API
+#include
+#include "Utilities.h"
+
+#ifndef PLATFORM_API_LINUXOS_ALSA_PCMUTILS_H_INCLUDED
+#define PLATFORM_API_LINUXOS_ALSA_PCMUTILS_H_INCLUDED
+
+// if this is defined, use plughw: devices
+#define ALSA_PCM_USE_PLUGHW
+//#undef ALSA_PCM_USE_PLUGHW
+
+
+// maximum number of channels that is listed in the formats. If more, than
+// just -1 for channel count is used.
+#define MAXIMUM_LISTED_CHANNELS 32
+
+typedef struct tag_ALSA_AudioDeviceDescription {
+ int index; // in
+ int strLen; // in
+ INT32* deviceID; // out
+ int* maxSimultaneousLines; // out
+ char* name; // out
+ char* vendor; // out
+ char* description; // out
+ char* version; // out
+} ALSA_AudioDeviceDescription;
+
+
+
+int getAudioDeviceCount();
+int getAudioDeviceDescriptionByIndex(ALSA_AudioDeviceDescription* desc);
+
+// returns ALSA error code, or 0 if successful
+int openPCMfromDeviceID(int deviceID, snd_pcm_t** handle, int isSource, int hardware);
+
+// returns 1 if successful
+// enc: 0 for PCM, 1 for ULAW, 2 for ALAW (see DirectAudio.h)
+int getFormatFromAlsaFormat(snd_pcm_format_t alsaFormat,
+ int* sampleSizeInBytes, int* significantBits,
+ int* isSigned, int* isBigEndian, int* enc);
+
+int getAlsaFormatFromFormat(snd_pcm_format_t* alsaFormat,
+ int sampleSizeInBytes, int significantBits,
+ int isSigned, int isBigEndian, int enc);
+
+#endif // PLATFORM_API_LINUXOS_ALSA_PCMUTILS_H_INCLUDED
diff -r eb72d194235c -r 514c68575523 src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_Ports.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.desktop/linux/native/libjsound/PLATFORM_API_LinuxOS_ALSA_Ports.c Fri Mar 23 18:44:47 2018 +0000
@@ -0,0 +1,724 @@
+/*
+ * Copyright (c) 2003, 2016, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+#define USE_ERROR
+//#define USE_TRACE
+
+#include "Ports.h"
+#include "PLATFORM_API_LinuxOS_ALSA_CommonUtils.h"
+#include
+
+#if USE_PORTS == TRUE
+
+#define MAX_ELEMS (300)
+#define MAX_CONTROLS (MAX_ELEMS * 4)
+
+#define CHANNELS_MONO (SND_MIXER_SCHN_LAST + 1)
+#define CHANNELS_STEREO (SND_MIXER_SCHN_LAST + 2)
+
+typedef struct {
+ snd_mixer_elem_t* elem;
+ INT32 portType; /* one of PORT_XXX_xx */
+ char* controlType; /* one of CONTROL_TYPE_xx */
+ /* Values: either SND_MIXER_SCHN_FRONT_xx, CHANNELS_MONO or CHANNELS_STEREO.
+ For SND_MIXER_SCHN_FRONT_xx, exactly this channel is set/retrieved directly.
+ For CHANNELS_MONO, ALSA channel SND_MIXER_SCHN_MONO is set/retrieved directly.
+ For CHANNELS_STEREO, ALSA channels SND_MIXER_SCHN_FRONT_LEFT and SND_MIXER_SCHN_FRONT_RIGHT
+ are set after a calculation that takes balance into account. Retrieved? Average of both
+ channels? (Using a cached value is not a good idea since the value in the HW may have been
+ altered.) */
+ INT32 channel;
+} PortControl;
+
+
+typedef struct tag_PortMixer {
+ snd_mixer_t* mixer_handle;
+ /* Number of array elements used in elems and types. */
+ int numElems;
+ snd_mixer_elem_t** elems;
+ /* Array of port types (PORT_SRC_UNKNOWN etc.). Indices are the same as in elems. */
+ INT32* types;
+ /* Number of array elements used in controls. */
+ int numControls;
+ PortControl* controls;
+} PortMixer;
+
+
+///// implemented functions of Ports.h
+
+INT32 PORT_GetPortMixerCount() {
+ INT32 mixerCount;
+ int card;
+ char devname[16];
+ int err;
+ snd_ctl_t *handle;
+ snd_ctl_card_info_t* info;
+
+ TRACE0("> PORT_GetPortMixerCount\n");
+
+ initAlsaSupport();
+
+ snd_ctl_card_info_malloc(&info);
+ card = -1;
+ mixerCount = 0;
+ if (snd_card_next(&card) >= 0) {
+ while (card >= 0) {
+ sprintf(devname, ALSA_HARDWARE_CARD, card);
+ TRACE1("PORT_GetPortMixerCount: Opening alsa device \"%s\"...\n", devname);
+ err = snd_ctl_open(&handle, devname, 0);
+ if (err < 0) {
+ ERROR2("ERROR: snd_ctl_open, card=%d: %s\n", card, snd_strerror(err));
+ } else {
+ mixerCount++;
+ snd_ctl_close(handle);
+ }
+ if (snd_card_next(&card) < 0) {
+ break;
+ }
+ }
+ }
+ snd_ctl_card_info_free(info);
+ TRACE0("< PORT_GetPortMixerCount\n");
+ return mixerCount;
+}
+
+
+INT32 PORT_GetPortMixerDescription(INT32 mixerIndex, PortMixerDescription* description) {
+ snd_ctl_t* handle;
+ snd_ctl_card_info_t* card_info;
+ char devname[16];
+ int err;
+ char buffer[100];
+
+ TRACE0("> PORT_GetPortMixerDescription\n");
+ snd_ctl_card_info_malloc(&card_info);
+
+ sprintf(devname, ALSA_HARDWARE_CARD, (int) mixerIndex);
+ TRACE1("Opening alsa device \"%s\"...\n", devname);
+ err = snd_ctl_open(&handle, devname, 0);
+ if (err < 0) {
+ ERROR2("ERROR: snd_ctl_open, card=%d: %s\n", (int) mixerIndex, snd_strerror(err));
+ return FALSE;
+ }
+ err = snd_ctl_card_info(handle, card_info);
+ if (err < 0) {
+ ERROR2("ERROR: snd_ctl_card_info, card=%d: %s\n", (int) mixerIndex, snd_strerror(err));
+ }
+ strncpy(description->name, snd_ctl_card_info_get_id(card_info), PORT_STRING_LENGTH - 1);
+ sprintf(buffer, " [%s]", devname);
+ strncat(description->name, buffer, PORT_STRING_LENGTH - 1 - strlen(description->name));
+ strncpy(description->vendor, "ALSA (http://www.alsa-project.org)", PORT_STRING_LENGTH - 1);
+ strncpy(description->description, snd_ctl_card_info_get_name(card_info), PORT_STRING_LENGTH - 1);
+ strncat(description->description, ", ", PORT_STRING_LENGTH - 1 - strlen(description->description));
+ strncat(description->description, snd_ctl_card_info_get_mixername(card_info), PORT_STRING_LENGTH - 1 - strlen(description->description));
+ getALSAVersion(description->version, PORT_STRING_LENGTH - 1);
+
+ snd_ctl_close(handle);
+ snd_ctl_card_info_free(card_info);
+ TRACE0("< PORT_GetPortMixerDescription\n");
+ return TRUE;
+}
+
+
+void* PORT_Open(INT32 mixerIndex) {
+ char devname[16];
+ snd_mixer_t* mixer_handle;
+ int err;
+ PortMixer* handle;
+
+ TRACE0("> PORT_Open\n");
+ sprintf(devname, ALSA_HARDWARE_CARD, (int) mixerIndex);
+ if ((err = snd_mixer_open(&mixer_handle, 0)) < 0) {
+ ERROR2("Mixer %s open error: %s", devname, snd_strerror(err));
+ return NULL;
+ }
+ if ((err = snd_mixer_attach(mixer_handle, devname)) < 0) {
+ ERROR2("Mixer attach %s error: %s", devname, snd_strerror(err));
+ snd_mixer_close(mixer_handle);
+ return NULL;
+ }
+ if ((err = snd_mixer_selem_register(mixer_handle, NULL, NULL)) < 0) {
+ ERROR1("Mixer register error: %s", snd_strerror(err));
+ snd_mixer_close(mixer_handle);
+ return NULL;
+ }
+ err = snd_mixer_load(mixer_handle);
+ if (err < 0) {
+ ERROR2("Mixer %s load error: %s", devname, snd_strerror(err));
+ snd_mixer_close(mixer_handle);
+ return NULL;
+ }
+ handle = (PortMixer*) calloc(1, sizeof(PortMixer));
+ if (handle == NULL) {
+ ERROR0("malloc() failed.");
+ snd_mixer_close(mixer_handle);
+ return NULL;
+ }
+ handle->numElems = 0;
+ handle->elems = (snd_mixer_elem_t**) calloc(MAX_ELEMS, sizeof(snd_mixer_elem_t*));
+ if (handle->elems == NULL) {
+ ERROR0("malloc() failed.");
+ snd_mixer_close(mixer_handle);
+ free(handle);
+ return NULL;
+ }
+ handle->types = (INT32*) calloc(MAX_ELEMS, sizeof(INT32));
+ if (handle->types == NULL) {
+ ERROR0("malloc() failed.");
+ snd_mixer_close(mixer_handle);
+ free(handle->elems);
+ free(handle);
+ return NULL;
+ }
+ handle->controls = (PortControl*) calloc(MAX_CONTROLS, sizeof(PortControl));
+ if (handle->controls == NULL) {
+ ERROR0("malloc() failed.");
+ snd_mixer_close(mixer_handle);
+ free(handle->elems);
+ free(handle->types);
+ free(handle);
+ return NULL;
+ }
+ handle->mixer_handle = mixer_handle;
+ // necessary to initialize data structures
+ PORT_GetPortCount(handle);
+ TRACE0("< PORT_Open\n");
+ return handle;
+}
+
+
+void PORT_Close(void* id) {
+ TRACE0("> PORT_Close\n");
+ if (id != NULL) {
+ PortMixer* handle = (PortMixer*) id;
+ if (handle->mixer_handle != NULL) {
+ snd_mixer_close(handle->mixer_handle);
+ }
+ if (handle->elems != NULL) {
+ free(handle->elems);
+ }
+ if (handle->types != NULL) {
+ free(handle->types);
+ }
+ if (handle->controls != NULL) {
+ free(handle->controls);
+ }
+ free(handle);
+ }
+ TRACE0("< PORT_Close\n");
+}
+
+
+
+INT32 PORT_GetPortCount(void* id) {
+ PortMixer* portMixer;
+ snd_mixer_elem_t *elem;
+
+ TRACE0("> PORT_GetPortCount\n");
+ if (id == NULL) {
+ // $$mp: Should become a descriptive error code (invalid handle).
+ return -1;
+ }
+ portMixer = (PortMixer*) id;
+ if (portMixer->numElems == 0) {
+ for (elem = snd_mixer_first_elem(portMixer->mixer_handle); elem; elem = snd_mixer_elem_next(elem)) {
+ if (!snd_mixer_selem_is_active(elem))
+ continue;
+ TRACE2("Simple mixer control '%s',%i\n",
+ snd_mixer_selem_get_name(elem),
+ snd_mixer_selem_get_index(elem));
+ if (snd_mixer_selem_has_playback_volume(elem)) {
+ portMixer->elems[portMixer->numElems] = elem;
+ portMixer->types[portMixer->numElems] = PORT_DST_UNKNOWN;
+ portMixer->numElems++;
+ }
+ // to prevent buffer overflow
+ if (portMixer->numElems >= MAX_ELEMS) {
+ break;
+ }
+ /* If an element has both playback an capture volume, it is put into the arrays
+ twice. */
+ if (snd_mixer_selem_has_capture_volume(elem)) {
+ portMixer->elems[portMixer->numElems] = elem;
+ portMixer->types[portMixer->numElems] = PORT_SRC_UNKNOWN;
+ portMixer->numElems++;
+ }
+ // to prevent buffer overflow
+ if (portMixer->numElems >= MAX_ELEMS) {
+ break;
+ }
+ }
+ }
+ TRACE0("< PORT_GetPortCount\n");
+ return portMixer->numElems;
+}
+
+
+INT32 PORT_GetPortType(void* id, INT32 portIndex) {
+ PortMixer* portMixer;
+ INT32 type;
+ TRACE0("> PORT_GetPortType\n");
+ if (id == NULL) {
+ // $$mp: Should become a descriptive error code (invalid handle).
+ return -1;
+ }
+ portMixer = (PortMixer*) id;
+ if (portIndex < 0 || portIndex >= portMixer->numElems) {
+ // $$mp: Should become a descriptive error code (index out of bounds).
+ return -1;
+ }
+ type = portMixer->types[portIndex];
+ TRACE0("< PORT_GetPortType\n");
+ return type;
+}
+
+
+INT32 PORT_GetPortName(void* id, INT32 portIndex, char* name, INT32 len) {
+ PortMixer* portMixer;
+ const char* nam;
+
+ TRACE0("> PORT_GetPortName\n");
+ if (id == NULL) {
+ // $$mp: Should become a descriptive error code (invalid handle).
+ return -1;
+ }
+ portMixer = (PortMixer*) id;
+ if (portIndex < 0 || portIndex >= portMixer->numElems) {
+ // $$mp: Should become a descriptive error code (index out of bounds).
+ return -1;
+ }
+ nam = snd_mixer_selem_get_name(portMixer->elems[portIndex]);
+ strncpy(name, nam, len - 1);
+ name[len - 1] = 0;
+ TRACE0("< PORT_GetPortName\n");
+ return TRUE;
+}
+
+
+static int isPlaybackFunction(INT32 portType) {
+ return (portType & PORT_DST_MASK);
+}
+
+
+/* Sets portControl to a pointer to the next free array element in the PortControl (pointer)
+ array of the passed portMixer. Returns TRUE if successful. May return FALSE if there is no
+ free slot. In this case, portControl is not altered */
+static int getControlSlot(PortMixer* portMixer, PortControl** portControl) {
+ if (portMixer->numControls >= MAX_CONTROLS) {
+ return FALSE;
+ } else {
+ *portControl = &(portMixer->controls[portMixer->numControls]);
+ portMixer->numControls++;
+ return TRUE;
+ }
+}
+
+
+/* Protect against illegal min-max values, preventing divisions by zero.
+ */
+inline static long getRange(long min, long max) {
+ if (max > min) {
+ return max - min;
+ } else {
+ return 1;
+ }
+}
+
+
+/* Idea: we may specify that if unit is an empty string, the values are linear and if unit is "dB",
+ the values are logarithmic.
+*/
+static void* createVolumeControl(PortControlCreator* creator,
+ PortControl* portControl,
+ snd_mixer_elem_t* elem, int isPlayback) {
+ void* control;
+ float precision;
+ long min, max;
+
+ if (isPlayback) {
+ snd_mixer_selem_get_playback_volume_range(elem, &min, &max);
+ } else {
+ snd_mixer_selem_get_capture_volume_range(elem, &min, &max);
+ }
+ /* $$mp: The volume values retrieved with the ALSA API are strongly supposed to be logarithmic.
+ So the following calculation is wrong. However, there is no correct calculation, since
+ for equal-distant logarithmic steps, the precision expressed in linear varies over the
+ scale. */
+ precision = 1.0F / getRange(min, max);
+ control = (creator->newFloatControl)(creator, portControl, CONTROL_TYPE_VOLUME, 0.0F, +1.0F, precision, "");
+ return control;
+}
+
+
+void PORT_GetControls(void* id, INT32 portIndex, PortControlCreator* creator) {
+ PortMixer* portMixer;
+ snd_mixer_elem_t* elem;
+ void* control;
+ PortControl* portControl;
+ void* controls[10];
+ int numControls;
+ char* portName;
+ int isPlayback = 0;
+ int isMono;
+ int isStereo;
+ char* type;
+ snd_mixer_selem_channel_id_t channel;
+ memset(controls, 0, sizeof(controls));
+
+ TRACE0("> PORT_GetControls\n");
+ if (id == NULL) {
+ ERROR0("Invalid handle!");
+ // $$mp: an error code should be returned.
+ return;
+ }
+ portMixer = (PortMixer*) id;
+ if (portIndex < 0 || portIndex >= portMixer->numElems) {
+ ERROR0("Port index out of range!");
+ // $$mp: an error code should be returned.
+ return;
+ }
+ numControls = 0;
+ elem = portMixer->elems[portIndex];
+ if (snd_mixer_selem_has_playback_volume(elem) || snd_mixer_selem_has_capture_volume(elem)) {
+ /* Since we've split/duplicated elements with both playback and capture on the recovery
+ of elements, we now can assume that we handle only to deal with either playback or
+ capture. */
+ isPlayback = isPlaybackFunction(portMixer->types[portIndex]);
+ isMono = (isPlayback && snd_mixer_selem_is_playback_mono(elem)) ||
+ (!isPlayback && snd_mixer_selem_is_capture_mono(elem));
+ isStereo = (isPlayback &&
+ snd_mixer_selem_has_playback_channel(elem, SND_MIXER_SCHN_FRONT_LEFT) &&
+ snd_mixer_selem_has_playback_channel(elem, SND_MIXER_SCHN_FRONT_RIGHT)) ||
+ (!isPlayback &&
+ snd_mixer_selem_has_capture_channel(elem, SND_MIXER_SCHN_FRONT_LEFT) &&
+ snd_mixer_selem_has_capture_channel(elem, SND_MIXER_SCHN_FRONT_RIGHT));
+ // single volume control
+ if (isMono || isStereo) {
+ if (getControlSlot(portMixer, &portControl)) {
+ portControl->elem = elem;
+ portControl->portType = portMixer->types[portIndex];
+ portControl->controlType = CONTROL_TYPE_VOLUME;
+ if (isMono) {
+ portControl->channel = CHANNELS_MONO;
+ } else {
+ portControl->channel = CHANNELS_STEREO;
+ }
+ control = createVolumeControl(creator, portControl, elem, isPlayback);
+ if (control != NULL) {
+ controls[numControls++] = control;
+ }
+ }
+ } else { // more than two channels, each channels has its own control.
+ for (channel = SND_MIXER_SCHN_FRONT_LEFT; channel <= SND_MIXER_SCHN_LAST; channel++) {
+ if ((isPlayback && snd_mixer_selem_has_playback_channel(elem, channel)) ||
+ (!isPlayback && snd_mixer_selem_has_capture_channel(elem, channel))) {
+ if (getControlSlot(portMixer, &portControl)) {
+ portControl->elem = elem;
+ portControl->portType = portMixer->types[portIndex];
+ portControl->controlType = CONTROL_TYPE_VOLUME;
+ portControl->channel = channel;
+ control = createVolumeControl(creator, portControl, elem, isPlayback);
+ // We wrap in a compound control to provide the channel name.
+ if (control != NULL) {
+ /* $$mp 2003-09-14: The following cast shouln't be necessary. Instead, the
+ declaration of PORT_NewCompoundControlPtr in Ports.h should be changed
+ to take a const char* parameter. */
+ control = (creator->newCompoundControl)(creator, (char*) snd_mixer_selem_channel_name(channel), &control, 1);
+ }
+ if (control != NULL) {
+ controls[numControls++] = control;
+ }
+ }
+ }
+ }
+ }
+ // BALANCE control
+ if (isStereo) {
+ if (getControlSlot(portMixer, &portControl)) {
+ portControl->elem = elem;
+ portControl->portType = portMixer->types[portIndex];
+ portControl->controlType = CONTROL_TYPE_BALANCE;
+ portControl->channel = CHANNELS_STEREO;
+ /* $$mp: The value for precision is chosen more or less arbitrarily. */
+ control = (creator->newFloatControl)(creator, portControl, CONTROL_TYPE_BALANCE, -1.0F, 1.0F, 0.01F, "");
+ if (control != NULL) {
+ controls[numControls++] = control;
+ }
+ }
+ }
+ }
+ if (snd_mixer_selem_has_playback_switch(elem) || snd_mixer_selem_has_capture_switch(elem)) {
+ if (getControlSlot(portMixer, &portControl)) {
+ type = isPlayback ? CONTROL_TYPE_MUTE : CONTROL_TYPE_SELECT;
+ portControl->elem = elem;
+ portControl->portType = portMixer->types[portIndex];
+ portControl->controlType = type;
+ control = (creator->newBooleanControl)(creator, portControl, type);
+ if (control != NULL) {
+ controls[numControls++] = control;
+ }
+ }
+ }
+ /* $$mp 2003-09-14: The following cast shouln't be necessary. Instead, the
+ declaration of PORT_NewCompoundControlPtr in Ports.h should be changed
+ to take a const char* parameter. */
+ portName = (char*) snd_mixer_selem_get_name(elem);
+ control = (creator->newCompoundControl)(creator, portName, controls, numControls);
+ if (control != NULL) {
+ (creator->addControl)(creator, control);
+ }
+ TRACE0("< PORT_GetControls\n");
+}
+
+
+INT32 PORT_GetIntValue(void* controlIDV) {
+ PortControl* portControl = (PortControl*) controlIDV;
+ int value = 0;
+ snd_mixer_selem_channel_id_t channel;
+
+ if (portControl != NULL) {
+ switch (portControl->channel) {
+ case CHANNELS_MONO:
+ channel = SND_MIXER_SCHN_MONO;
+ break;
+
+ case CHANNELS_STEREO:
+ channel = SND_MIXER_SCHN_FRONT_LEFT;
+ break;
+
+ default:
+ channel = portControl->channel;
+ }
+ if (portControl->controlType == CONTROL_TYPE_MUTE ||
+ portControl->controlType == CONTROL_TYPE_SELECT) {
+ if (isPlaybackFunction(portControl->portType)) {
+ snd_mixer_selem_get_playback_switch(portControl->elem, channel, &value);
+ } else {
+ snd_mixer_selem_get_capture_switch(portControl->elem, channel, &value);
+ }
+ if (portControl->controlType == CONTROL_TYPE_MUTE) {
+ value = ! value;
+ }
+ } else {
+ ERROR1("PORT_GetIntValue(): inappropriate control type: %s\n",
+ portControl->controlType);
+ }
+ }
+ return (INT32) value;
+}
+
+
+void PORT_SetIntValue(void* controlIDV, INT32 value) {
+ PortControl* portControl = (PortControl*) controlIDV;
+ snd_mixer_selem_channel_id_t channel;
+
+ if (portControl != NULL) {
+ if (portControl->controlType == CONTROL_TYPE_MUTE) {
+ value = ! value;
+ }
+ if (portControl->controlType == CONTROL_TYPE_MUTE ||
+ portControl->controlType == CONTROL_TYPE_SELECT) {
+ if (isPlaybackFunction(portControl->portType)) {
+ snd_mixer_selem_set_playback_switch_all(portControl->elem, value);
+ } else {
+ snd_mixer_selem_set_capture_switch_all(portControl->elem, value);
+ }
+ } else {
+ ERROR1("PORT_SetIntValue(): inappropriate control type: %s\n",
+ portControl->controlType);
+ }
+ }
+}
+
+
+static float scaleVolumeValueToNormalized(long value, long min, long max) {
+ return (float) (value - min) / getRange(min, max);
+}
+
+
+static long scaleVolumeValueToHardware(float value, long min, long max) {
+ return (long)(value * getRange(min, max) + min);
+}
+
+
+float getRealVolume(PortControl* portControl,
+ snd_mixer_selem_channel_id_t channel) {
+ float fValue;
+ long lValue = 0;
+ long min = 0;
+ long max = 0;
+
+ if (isPlaybackFunction(portControl->portType)) {
+ snd_mixer_selem_get_playback_volume_range(portControl->elem,
+ &min, &max);
+ snd_mixer_selem_get_playback_volume(portControl->elem,
+ channel, &lValue);
+ } else {
+ snd_mixer_selem_get_capture_volume_range(portControl->elem,
+ &min, &max);
+ snd_mixer_selem_get_capture_volume(portControl->elem,
+ channel, &lValue);
+ }
+ fValue = scaleVolumeValueToNormalized(lValue, min, max);
+ return fValue;
+}
+
+
+void setRealVolume(PortControl* portControl,
+ snd_mixer_selem_channel_id_t channel, float value) {
+ long lValue = 0;
+ long min = 0;
+ long max = 0;
+
+ if (isPlaybackFunction(portControl->portType)) {
+ snd_mixer_selem_get_playback_volume_range(portControl->elem,
+ &min, &max);
+ lValue = scaleVolumeValueToHardware(value, min, max);
+ snd_mixer_selem_set_playback_volume(portControl->elem,
+ channel, lValue);
+ } else {
+ snd_mixer_selem_get_capture_volume_range(portControl->elem,
+ &min, &max);
+ lValue = scaleVolumeValueToHardware(value, min, max);
+ snd_mixer_selem_set_capture_volume(portControl->elem,
+ channel, lValue);
+ }
+}
+
+
+static float getFakeBalance(PortControl* portControl) {
+ float volL, volR;
+
+ // pan is the ratio of left and right
+ volL = getRealVolume(portControl, SND_MIXER_SCHN_FRONT_LEFT);
+ volR = getRealVolume(portControl, SND_MIXER_SCHN_FRONT_RIGHT);
+ if (volL > volR) {
+ return -1.0f + (volR / volL);
+ }
+ else if (volR > volL) {
+ return 1.0f - (volL / volR);
+ }
+ return 0.0f;
+}
+
+
+static float getFakeVolume(PortControl* portControl) {
+ float valueL;
+ float valueR;
+ float value;
+
+ valueL = getRealVolume(portControl, SND_MIXER_SCHN_FRONT_LEFT);
+ valueR = getRealVolume(portControl, SND_MIXER_SCHN_FRONT_RIGHT);
+ // volume is the greater value of both
+ value = valueL > valueR ? valueL : valueR ;
+ return value;
+}
+
+
+/*
+ * sets the unsigned values for left and right volume according to
+ * the given volume (0...1) and balance (-1..0..+1)
+ */
+static void setFakeVolume(PortControl* portControl, float vol, float bal) {
+ float volumeLeft;
+ float volumeRight;
+
+ if (bal < 0.0f) {
+ volumeLeft = vol;
+ volumeRight = vol * (bal + 1.0f);
+ } else {
+ volumeLeft = vol * (1.0f - bal);
+ volumeRight = vol;
+ }
+ setRealVolume(portControl, SND_MIXER_SCHN_FRONT_LEFT, volumeLeft);
+ setRealVolume(portControl, SND_MIXER_SCHN_FRONT_RIGHT, volumeRight);
+}
+
+
+float PORT_GetFloatValue(void* controlIDV) {
+ PortControl* portControl = (PortControl*) controlIDV;
+ float value = 0.0F;
+
+ if (portControl != NULL) {
+ if (portControl->controlType == CONTROL_TYPE_VOLUME) {
+ switch (portControl->channel) {
+ case CHANNELS_MONO:
+ value = getRealVolume(portControl, SND_MIXER_SCHN_MONO);
+ break;
+
+ case CHANNELS_STEREO:
+ value = getFakeVolume(portControl);
+ break;
+
+ default:
+ value = getRealVolume(portControl, portControl->channel);
+ }
+ } else if (portControl->controlType == CONTROL_TYPE_BALANCE) {
+ if (portControl->channel == CHANNELS_STEREO) {
+ value = getFakeBalance(portControl);
+ } else {
+ ERROR0("PORT_GetFloatValue(): Balance only allowed for stereo channels!\n");
+ }
+ } else {
+ ERROR1("PORT_GetFloatValue(): inappropriate control type: %s!\n",
+ portControl->controlType);
+ }
+ }
+ return value;
+}
+
+
+void PORT_SetFloatValue(void* controlIDV, float value) {
+ PortControl* portControl = (PortControl*) controlIDV;
+
+ if (portControl != NULL) {
+ if (portControl->controlType == CONTROL_TYPE_VOLUME) {
+ switch (portControl->channel) {
+ case CHANNELS_MONO:
+ setRealVolume(portControl, SND_MIXER_SCHN_MONO, value);
+ break;
+
+ case CHANNELS_STEREO:
+ setFakeVolume(portControl, value, getFakeBalance(portControl));
+ break;
+
+ default:
+ setRealVolume(portControl, portControl->channel, value);
+ }
+ } else if (portControl->controlType == CONTROL_TYPE_BALANCE) {
+ if (portControl->channel == CHANNELS_STEREO) {
+ setFakeVolume(portControl, getFakeVolume(portControl), value);
+ } else {
+ ERROR0("PORT_SetFloatValue(): Balance only allowed for stereo channels!\n");
+ }
+ } else {
+ ERROR1("PORT_SetFloatValue(): inappropriate control type: %s!\n",
+ portControl->controlType);
+ }
+ }
+}
+
+
+#endif // USE_PORTS
diff -r eb72d194235c -r 514c68575523 src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Fri Mar 23 18:44:47 2018 +0000
@@ -859,7 +859,7 @@
@Override
public void updateFocusableWindowState() {
final boolean isFocusable = isNativelyFocusableWindow();
- setStyleBits(SHOULD_BECOME_KEY | SHOULD_BECOME_MAIN, isFocusable); // set both bits at once
+ setStyleBits(SHOULD_BECOME_KEY | SHOULD_BECOME_MAIN | RESIZABLE, isFocusable); // set bits at once
}
@Override
diff -r eb72d194235c -r 514c68575523 src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPConstants.java
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPConstants.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPConstants.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -30,6 +30,7 @@
static final String VERSION_2 = "BMP v. 2.x";
static final String VERSION_3 = "BMP v. 3.x";
static final String VERSION_3_NT = "BMP v. 3.x NT";
+ static final String VERSION_3_EXT = "BMP V2/V3 INFO";
static final String VERSION_4 = "BMP v. 4.x";
static final String VERSION_5 = "BMP v. 5.x";
@@ -48,3 +49,4 @@
static final int BI_JPEG = 4;
static final int BI_PNG = 5;
}
+
diff -r eb72d194235c -r 514c68575523 src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -78,6 +78,8 @@
*
* This class supports Microsoft Windows Bitmap Version 3-5,
* as well as OS/2 Bitmap Version 2.x (for single-image BMP file).
+ * It also supports undocumented DIB header of type BITMAPV2INFOHEADER
+ * & BITMAPV3INFOHEADER.
*/
public class BMPImageReader extends ImageReader implements BMPConstants {
// BMP Image types
@@ -94,16 +96,25 @@
private static final int VERSION_3_NT_16_BIT = 8;
private static final int VERSION_3_NT_32_BIT = 9;
- private static final int VERSION_4_1_BIT = 10;
- private static final int VERSION_4_4_BIT = 11;
- private static final int VERSION_4_8_BIT = 12;
- private static final int VERSION_4_16_BIT = 13;
- private static final int VERSION_4_24_BIT = 14;
- private static final int VERSION_4_32_BIT = 15;
+ // All VERSION_3_EXT_* are for BITMAPV2INFOHEADER & BITMAPV3INFOHEADER
+ private static final int VERSION_3_EXT_1_BIT = 10;
+ private static final int VERSION_3_EXT_4_BIT = 11;
+ private static final int VERSION_3_EXT_8_BIT = 12;
+ private static final int VERSION_3_EXT_16_BIT = 13;
+ private static final int VERSION_3_EXT_24_BIT = 14;
+ private static final int VERSION_3_EXT_32_BIT = 15;
- private static final int VERSION_3_XP_EMBEDDED = 16;
- private static final int VERSION_4_XP_EMBEDDED = 17;
- private static final int VERSION_5_XP_EMBEDDED = 18;
+ private static final int VERSION_4_1_BIT = 16;
+ private static final int VERSION_4_4_BIT = 17;
+ private static final int VERSION_4_8_BIT = 18;
+ private static final int VERSION_4_16_BIT = 19;
+ private static final int VERSION_4_24_BIT = 20;
+ private static final int VERSION_4_32_BIT = 21;
+
+ private static final int VERSION_3_XP_EMBEDDED = 22;
+ private static final int VERSION_3_EXT_EMBEDDED = 23;
+ private static final int VERSION_4_XP_EMBEDDED = 24;
+ private static final int VERSION_5_XP_EMBEDDED = 25;
// BMP variables
private long bitmapFileSize;
@@ -409,6 +420,63 @@
throw new
IIOException(I18N.getString("BMPImageReader2"));
}
+ } else if (size == 52 || size == 56) {
+ // BITMAPV2INFOHEADER or BITMAPV3INFOHEADER
+ redMask = (int)iis.readUnsignedInt();
+ greenMask = (int)iis.readUnsignedInt();
+ blueMask = (int)iis.readUnsignedInt();
+ if (size == 56) {
+ alphaMask = (int)iis.readUnsignedInt();
+ }
+
+ metadata.bmpVersion = VERSION_3_EXT;
+ // Read in the palette
+ int numberOfEntries = (int)((bitmapOffset-14-size) / 4);
+ int sizeOfPalette = numberOfEntries*4;
+ palette = new byte[sizeOfPalette];
+ iis.readFully(palette, 0, sizeOfPalette);
+ metadata.palette = palette;
+ metadata.paletteSize = numberOfEntries;
+
+ switch((int)compression) {
+
+ case BI_JPEG:
+ case BI_PNG:
+ imageType = VERSION_3_EXT_EMBEDDED;
+ break;
+ default:
+ if (bitsPerPixel == 1) {
+ imageType = VERSION_3_EXT_1_BIT;
+ } else if (bitsPerPixel == 4) {
+ imageType = VERSION_3_EXT_4_BIT;
+ } else if (bitsPerPixel == 8) {
+ imageType = VERSION_3_EXT_8_BIT;
+ } else if (bitsPerPixel == 16) {
+ imageType = VERSION_3_EXT_16_BIT;
+ if ((int)compression == BI_RGB) {
+ redMask = 0x7C00;
+ greenMask = 0x3E0;
+ blueMask = 0x1F;
+ }
+ } else if (bitsPerPixel == 24) {
+ imageType = VERSION_3_EXT_24_BIT;
+ } else if (bitsPerPixel == 32) {
+ imageType = VERSION_3_EXT_32_BIT;
+ if ((int)compression == BI_RGB) {
+ redMask = 0x00FF0000;
+ greenMask = 0x0000FF00;
+ blueMask = 0x000000FF;
+ }
+ } else {
+ throw new
+ IIOException(I18N.getString("BMPImageReader8"));
+ }
+
+ metadata.redMask = redMask;
+ metadata.greenMask = greenMask;
+ metadata.blueMask = blueMask;
+ metadata.alphaMask = alphaMask;
+ }
} else if (size == 108 || size == 124) {
// Windows 4.x BMP
if (size == 108)
@@ -908,15 +976,18 @@
break;
case VERSION_3_XP_EMBEDDED:
+ case VERSION_3_EXT_EMBEDDED:
case VERSION_4_XP_EMBEDDED:
case VERSION_5_XP_EMBEDDED:
bi = readEmbedded((int)compression, bi, param);
break;
+ case VERSION_3_EXT_1_BIT:
case VERSION_4_1_BIT:
read1Bit(bdata);
break;
+ case VERSION_3_EXT_4_BIT:
case VERSION_4_4_BIT:
switch((int)compression) {
@@ -934,6 +1005,7 @@
}
break;
+ case VERSION_3_EXT_8_BIT:
case VERSION_4_8_BIT:
switch((int)compression) {
@@ -951,14 +1023,17 @@
}
break;
+ case VERSION_3_EXT_16_BIT:
case VERSION_4_16_BIT:
read16Bit(sdata);
break;
+ case VERSION_3_EXT_24_BIT:
case VERSION_4_24_BIT:
read24Bit(bdata);
break;
+ case VERSION_3_EXT_32_BIT:
case VERSION_4_32_BIT:
read32Bit(idata);
break;
@@ -2000,3 +2075,4 @@
}
}
}
+
diff -r eb72d194235c -r 514c68575523 src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormat.java
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormat.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormat.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -119,10 +119,10 @@
"1", "65535", true, true);
addAttribute("PlainTextExtension", "characterCellWidth",
DATATYPE_INTEGER, true, null,
- "1", "65535", true, true);
+ "1", "255", true, true);
addAttribute("PlainTextExtension", "characterCellHeight",
DATATYPE_INTEGER, true, null,
- "1", "65535", true, true);
+ "1", "255", true, true);
addAttribute("PlainTextExtension", "textForegroundColor",
DATATYPE_INTEGER, true, null,
"0", "255", true, true);
diff -r eb72d194235c -r 514c68575523 src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java
--- a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -203,15 +203,18 @@
-1, true,
true, 1, 65535);
+ // As per the specification (89a), character cell width
+ // and character cell height occupy one byte each
+ // in the Plain Text Extension block.
characterCellWidth = getIntAttribute(node,
"characterCellWidth",
-1, true,
- true, 1, 65535);
+ true, 1, 255);
characterCellHeight = getIntAttribute(node,
"characterCellHeight",
-1, true,
- true, 1, 65535);
+ true, 1, 255);
textForegroundColor = getIntAttribute(node,
"textForegroundColor",
diff -r eb72d194235c -r 514c68575523 src/java.desktop/share/classes/com/sun/media/sound/Platform.java
--- a/src/java.desktop/share/classes/com/sun/media/sound/Platform.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.desktop/share/classes/com/sun/media/sound/Platform.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -38,23 +38,9 @@
final class Platform {
// native library we need to load
- private static final String libNameMain = "jsound";
- private static final String libNameALSA = "jsoundalsa";
- private static final String libNameDSound = "jsoundds";
-
- // extra libs handling: bit flags for each different library
- public static final int LIB_MAIN = 1;
- public static final int LIB_ALSA = 2;
- public static final int LIB_DSOUND = 4;
+ private static final String libName = "jsound";
- // bit field of the constants above. Willbe set in loadLibraries
- private static int loadedLibs = 0;
-
- // features: the main native library jsound reports which feature is
- // contained in which lib
- public static final int FEATURE_MIDIIO = 1;
- public static final int FEATURE_PORTS = 2;
- public static final int FEATURE_DIRECT_AUDIO = 3;
+ private static boolean isNativeLibLoaded;
// SYSTEM CHARACTERISTICS
// vary according to hardware architecture
@@ -66,7 +52,6 @@
if(Printer.trace)Printer.trace(">> Platform.java: static");
loadLibraries();
- readProperties();
}
/**
@@ -95,72 +80,37 @@
private static void loadLibraries() {
if(Printer.trace)Printer.trace(">>Platform.loadLibraries");
- // load the main library
- AccessController.doPrivileged((PrivilegedAction) () -> {
- System.loadLibrary(libNameMain);
- return null;
- });
- // just for the heck of it...
- loadedLibs |= LIB_MAIN;
-
- // now try to load extra libs. They are defined at compile time in the Makefile
- // with the define EXTRA_SOUND_JNI_LIBS
- String extraLibs = nGetExtraLibraries();
- // the string is the libraries, separated by white space
- StringTokenizer st = new StringTokenizer(extraLibs);
- while (st.hasMoreTokens()) {
- final String lib = st.nextToken();
- try {
- AccessController.doPrivileged((PrivilegedAction) () -> {
- System.loadLibrary(lib);
- return null;
- });
-
- if (lib.equals(libNameALSA)) {
- loadedLibs |= LIB_ALSA;
- if (Printer.debug) Printer.debug("Loaded ALSA lib successfully.");
- } else if (lib.equals(libNameDSound)) {
- loadedLibs |= LIB_DSOUND;
- if (Printer.debug) Printer.debug("Loaded DirectSound lib successfully.");
- } else {
- if (Printer.err) Printer.err("Loaded unknown lib '"+lib+"' successfully.");
- }
- } catch (Throwable t) {
- if (Printer.err) Printer.err("Couldn't load library "+lib+": "+t.toString());
- }
+ // load the native library
+ isNativeLibLoaded = true;
+ try {
+ AccessController.doPrivileged((PrivilegedAction) () -> {
+ System.loadLibrary(libName);
+ return null;
+ });
+ } catch (Throwable t) {
+ if (Printer.err) Printer.err("Couldn't load library "+libName+": "+t.toString());
+ isNativeLibLoaded = false;
+ }
+ if (isNativeLibLoaded) {
+ bigEndian = nIsBigEndian();
}
}
static boolean isMidiIOEnabled() {
- return isFeatureLibLoaded(FEATURE_MIDIIO);
+ if (Printer.debug) Printer.debug("Platform: Checking for MidiIO; library is loaded=" + isNativeLibLoaded);
+ return isNativeLibLoaded;
}
static boolean isPortsEnabled() {
- return isFeatureLibLoaded(FEATURE_PORTS);
+ if (Printer.debug) Printer.debug("Platform: Checking for Ports; library is loaded=" + isNativeLibLoaded);
+ return isNativeLibLoaded;
}
static boolean isDirectAudioEnabled() {
- return isFeatureLibLoaded(FEATURE_DIRECT_AUDIO);
- }
-
- private static boolean isFeatureLibLoaded(int feature) {
- if (Printer.debug) Printer.debug("Platform: Checking for feature "+feature+"...");
- int requiredLib = nGetLibraryForFeature(feature);
- boolean isLoaded = (requiredLib != 0) && ((loadedLibs & requiredLib) == requiredLib);
- if (Printer.debug) Printer.debug(" ...needs library "+requiredLib+". Result is loaded="+isLoaded);
- return isLoaded;
+ if (Printer.debug) Printer.debug("Platform: Checking for DirectAudio; library is loaded=" + isNativeLibLoaded);
+ return isNativeLibLoaded;
}
- // the following native methods are implemented in Platform.c
+ // the following native method is implemented in Platform.c
private static native boolean nIsBigEndian();
- private static native String nGetExtraLibraries();
- private static native int nGetLibraryForFeature(int feature);
-
- /**
- * Read the required system properties.
- */
- private static void readProperties() {
- // $$fb 2002-03-06: implement check for endianness in native. Facilitates porting !
- bigEndian = nIsBigEndian();
- }
}
diff -r eb72d194235c -r 514c68575523 src/java.desktop/share/classes/java/awt/SequencedEvent.java
--- a/src/java.desktop/share/classes/java/awt/SequencedEvent.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.desktop/share/classes/java/awt/SequencedEvent.java Fri Mar 23 18:44:47 2018 +0000
@@ -135,11 +135,7 @@
if (Thread.currentThread() instanceof EventDispatchThread) {
EventDispatchThread edt = (EventDispatchThread)
Thread.currentThread();
- edt.pumpEvents(SentEvent.ID, new Conditional() {
- public boolean evaluate() {
- return !SequencedEvent.this.isFirstOrDisposed();
- }
- });
+ edt.pumpEvents(ID, () -> !SequencedEvent.this.isFirstOrDisposed());
} else {
if (fxAppThreadIsDispatchThread) {
fxCheckSequenceThread.start();
diff -r eb72d194235c -r 514c68575523 src/java.desktop/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html
--- a/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html Fri Mar 23 18:44:47 2018 +0000
@@ -5,7 +5,7 @@
GIF Metadata Format Specification
device paused: %d eof=%d\n",
+ prinfo->pause, prinfo->eof);
+ */
+ return (int) (prinfo->samples * info->frameSize);
+ }
+ ERROR0("DAUDIO: getDevicePosition: ioctl failed!\n");
+ return -1;
+}
+
+int DAUDIO_Flush(void* id, int isSource) {
+ SolPcmInfo* info = (SolPcmInfo*) id;
+ int err = -1;
+ int pos;
+
+ TRACE0("DAUDIO_Flush\n");
+ if (info) {
+ if (isSource) {
+ err = ioctl(info->fd, I_FLUSH, FLUSHW);
+ } else {
+ err = ioctl(info->fd, I_FLUSH, FLUSHR);
+ }
+ if (err >= 0) {
+ /* resets the transferedBytes parameter to
+ * the current samples count of the device
+ */
+ pos = getDevicePosition(info, isSource);
+ if (pos >= 0) {
+ info->transferedBytes = pos;
+ }
+ }
+ }
+ if (err < 0) {
+ ERROR0("ERROR in DAUDIO_Flush\n");
+ }
+ return (err < 0)?FALSE:TRUE;
+}
+
+int DAUDIO_GetAvailable(void* id, int isSource) {
+ SolPcmInfo* info = (SolPcmInfo*) id;
+ int ret = 0;
+ int pos;
+
+ if (info) {
+ /* unfortunately, the STREAMS architecture
+ * seems to not have a method for querying
+ * the available bytes to read/write!
+ * estimate it...
+ */
+ pos = getDevicePosition(info, isSource);
+ if (pos >= 0) {
+ if (isSource) {
+ /* we usually have written more bytes
+ * to the queue than the device position should be
+ */
+ ret = (info->bufferSizeInBytes) - (info->transferedBytes - pos);
+ } else {
+ /* for record, the device stream should
+ * be usually ahead of our read actions
+ */
+ ret = pos - info->transferedBytes;
+ }
+ if (ret > info->bufferSizeInBytes) {
+ ERROR2("DAUDIO_GetAvailable: available=%d, too big at bufferSize=%d!\n",
+ (int) ret, (int) info->bufferSizeInBytes);
+ ERROR2(" devicePos=%d, transferedBytes=%d\n",
+ (int) pos, (int) info->transferedBytes);
+ ret = info->bufferSizeInBytes;
+ }
+ else if (ret < 0) {
+ ERROR1("DAUDIO_GetAvailable: available=%d, in theory not possible!\n",
+ (int) ret);
+ ERROR2(" devicePos=%d, transferedBytes=%d\n",
+ (int) pos, (int) info->transferedBytes);
+ ret = 0;
+ }
+ }
+ }
+
+ TRACE1("DAUDIO_GetAvailable returns %d bytes\n", ret);
+ return ret;
+}
+
+INT64 DAUDIO_GetBytePosition(void* id, int isSource, INT64 javaBytePos) {
+ SolPcmInfo* info = (SolPcmInfo*) id;
+ int ret;
+ int pos;
+ INT64 result = javaBytePos;
+
+ if (info) {
+ pos = getDevicePosition(info, isSource);
+ if (pos >= 0) {
+ result = info->positionOffset + pos;
+ }
+ }
+
+ //printf("getbyteposition: javaBytePos=%d , return=%d\n", (int) javaBytePos, (int) result);
+ return result;
+}
+
+
+void DAUDIO_SetBytePosition(void* id, int isSource, INT64 javaBytePos) {
+ SolPcmInfo* info = (SolPcmInfo*) id;
+ int ret;
+ int pos;
+
+ if (info) {
+ pos = getDevicePosition(info, isSource);
+ if (pos >= 0) {
+ info->positionOffset = javaBytePos - pos;
+ }
+ }
+}
+
+int DAUDIO_RequiresServicing(void* id, int isSource) {
+ // never need servicing on Solaris
+ return FALSE;
+}
+
+void DAUDIO_Service(void* id, int isSource) {
+ // never need servicing on Solaris
+}
+
+
+#endif // USE_DAUDIO
diff -r eb72d194235c -r 514c68575523 src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Ports.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Ports.c Fri Mar 23 18:44:47 2018 +0000
@@ -0,0 +1,600 @@
+/*
+ * Copyright (c) 2002, 2016, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+#define USE_ERROR
+//#define USE_TRACE
+
+#include "Ports.h"
+#include "PLATFORM_API_SolarisOS_Utils.h"
+
+#if USE_PORTS == TRUE
+
+#define MONITOR_GAIN_STRING "Monitor Gain"
+
+#define ALL_TARGET_PORT_COUNT 6
+
+// define the following to not use audio_prinfo_t.mod_ports
+#define SOLARIS7_COMPATIBLE
+
+// Solaris audio defines
+static int targetPorts[ALL_TARGET_PORT_COUNT] = {
+ AUDIO_SPEAKER,
+ AUDIO_HEADPHONE,
+ AUDIO_LINE_OUT,
+ AUDIO_AUX1_OUT,
+ AUDIO_AUX2_OUT,
+ AUDIO_SPDIF_OUT
+};
+
+static char* targetPortNames[ALL_TARGET_PORT_COUNT] = {
+ "Speaker",
+ "Headphone",
+ "Line Out",
+ "AUX1 Out",
+ "AUX2 Out",
+ "SPDIF Out"
+};
+
+// defined in Ports.h
+static int targetPortJavaSoundMapping[ALL_TARGET_PORT_COUNT] = {
+ PORT_DST_SPEAKER,
+ PORT_DST_HEADPHONE,
+ PORT_DST_LINE_OUT,
+ PORT_DST_UNKNOWN,
+ PORT_DST_UNKNOWN,
+ PORT_DST_UNKNOWN,
+};
+
+#define ALL_SOURCE_PORT_COUNT 7
+
+// Solaris audio defines
+static int sourcePorts[ALL_SOURCE_PORT_COUNT] = {
+ AUDIO_MICROPHONE,
+ AUDIO_LINE_IN,
+ AUDIO_CD,
+ AUDIO_AUX1_IN,
+ AUDIO_AUX2_IN,
+ AUDIO_SPDIF_IN,
+ AUDIO_CODEC_LOOPB_IN
+};
+
+static char* sourcePortNames[ALL_SOURCE_PORT_COUNT] = {
+ "Microphone In",
+ "Line In",
+ "Compact Disc In",
+ "AUX1 In",
+ "AUX2 In",
+ "SPDIF In",
+ "Internal Loopback"
+};
+
+// Ports.h defines
+static int sourcePortJavaSoundMapping[ALL_SOURCE_PORT_COUNT] = {
+ PORT_SRC_MICROPHONE,
+ PORT_SRC_LINE_IN,
+ PORT_SRC_COMPACT_DISC,
+ PORT_SRC_UNKNOWN,
+ PORT_SRC_UNKNOWN,
+ PORT_SRC_UNKNOWN,
+ PORT_SRC_UNKNOWN
+};
+
+struct tag_PortControlID;
+
+typedef struct tag_PortInfo {
+ int fd; // file descriptor of the pseudo device
+ audio_info_t audioInfo;
+ // ports
+ int targetPortCount;
+ int sourcePortCount;
+ // indexes to sourcePorts/targetPorts
+ // contains first target ports, then source ports
+ int ports[ALL_TARGET_PORT_COUNT + ALL_SOURCE_PORT_COUNT];
+ // controls
+ int maxControlCount; // upper bound of number of controls
+ int usedControlIDs; // number of items already filled in controlIDs
+ struct tag_PortControlID* controlIDs; // the control IDs themselves
+} PortInfo;
+
+#define PORT_CONTROL_TYPE_PLAY 0x4000000
+#define PORT_CONTROL_TYPE_RECORD 0x8000000
+#define PORT_CONTROL_TYPE_SELECT_PORT 1
+#define PORT_CONTROL_TYPE_GAIN 2
+#define PORT_CONTROL_TYPE_BALANCE 3
+#define PORT_CONTROL_TYPE_MONITOR_GAIN 10
+#define PORT_CONTROL_TYPE_OUTPUT_MUTED 11
+#define PORT_CONTROL_TYPE_PLAYRECORD_MASK PORT_CONTROL_TYPE_PLAY | PORT_CONTROL_TYPE_RECORD
+#define PORT_CONTROL_TYPE_MASK 0xFFFFFF
+
+
+typedef struct tag_PortControlID {
+ PortInfo* portInfo;
+ INT32 controlType; // PORT_CONTROL_TYPE_XX
+ uint_t port;
+} PortControlID;
+
+
+///// implemented functions of Ports.h
+
+INT32 PORT_GetPortMixerCount() {
+ return (INT32) getAudioDeviceCount();
+}
+
+
+INT32 PORT_GetPortMixerDescription(INT32 mixerIndex, PortMixerDescription* description) {
+ AudioDeviceDescription desc;
+
+ if (getAudioDeviceDescriptionByIndex(mixerIndex, &desc, TRUE)) {
+ strncpy(description->name, desc.name, PORT_STRING_LENGTH-1);
+ description->name[PORT_STRING_LENGTH-1] = 0;
+ strncpy(description->vendor, desc.vendor, PORT_STRING_LENGTH-1);
+ description->vendor[PORT_STRING_LENGTH-1] = 0;
+ strncpy(description->version, desc.version, PORT_STRING_LENGTH-1);
+ description->version[PORT_STRING_LENGTH-1] = 0;
+ /*strncpy(description->description, desc.description, PORT_STRING_LENGTH-1);*/
+ strncpy(description->description, "Solaris Ports", PORT_STRING_LENGTH-1);
+ description->description[PORT_STRING_LENGTH-1] = 0;
+ return TRUE;
+ }
+ return FALSE;
+}
+
+
+void* PORT_Open(INT32 mixerIndex) {
+ PortInfo* info = NULL;
+ int fd = -1;
+ AudioDeviceDescription desc;
+ int success = FALSE;
+
+ TRACE0("PORT_Open\n");
+ if (getAudioDeviceDescriptionByIndex(mixerIndex, &desc, FALSE)) {
+ fd = open(desc.pathctl, O_RDWR);
+ }
+ if (fd < 0) {
+ ERROR1("Couldn't open audio device ctl for device %d!\n", mixerIndex);
+ return NULL;
+ }
+
+ info = (PortInfo*) malloc(sizeof(PortInfo));
+ if (info != NULL) {
+ memset(info, 0, sizeof(PortInfo));
+ info->fd = fd;
+ success = TRUE;
+ }
+ if (!success) {
+ if (fd >= 0) {
+ close(fd);
+ }
+ PORT_Close((void*) info);
+ info = NULL;
+ }
+ return info;
+}
+
+void PORT_Close(void* id) {
+ TRACE0("PORT_Close\n");
+ if (id != NULL) {
+ PortInfo* info = (PortInfo*) id;
+ if (info->fd >= 0) {
+ close(info->fd);
+ info->fd = -1;
+ }
+ if (info->controlIDs) {
+ free(info->controlIDs);
+ info->controlIDs = NULL;
+ }
+ free(info);
+ }
+}
+
+
+
+INT32 PORT_GetPortCount(void* id) {
+ int ret = 0;
+ PortInfo* info = (PortInfo*) id;
+ if (info != NULL) {
+ if (!info->targetPortCount && !info->sourcePortCount) {
+ int i;
+ AUDIO_INITINFO(&info->audioInfo);
+ if (ioctl(info->fd, AUDIO_GETINFO, &info->audioInfo) >= 0) {
+ for (i = 0; i < ALL_TARGET_PORT_COUNT; i++) {
+ if (info->audioInfo.play.avail_ports & targetPorts[i]) {
+ info->ports[info->targetPortCount] = i;
+ info->targetPortCount++;
+ }
+#ifdef SOLARIS7_COMPATIBLE
+ TRACE3("Target %d %s: avail=%d\n", i, targetPortNames[i],
+ info->audioInfo.play.avail_ports & targetPorts[i]);
+#else
+ TRACE4("Target %d %s: avail=%d mod=%d\n", i, targetPortNames[i],
+ info->audioInfo.play.avail_ports & targetPorts[i],
+ info->audioInfo.play.mod_ports & targetPorts[i]);
+#endif
+ }
+ for (i = 0; i < ALL_SOURCE_PORT_COUNT; i++) {
+ if (info->audioInfo.record.avail_ports & sourcePorts[i]) {
+ info->ports[info->targetPortCount + info->sourcePortCount] = i;
+ info->sourcePortCount++;
+ }
+#ifdef SOLARIS7_COMPATIBLE
+ TRACE3("Source %d %s: avail=%d\n", i, sourcePortNames[i],
+ info->audioInfo.record.avail_ports & sourcePorts[i]);
+#else
+ TRACE4("Source %d %s: avail=%d mod=%d\n", i, sourcePortNames[i],
+ info->audioInfo.record.avail_ports & sourcePorts[i],
+ info->audioInfo.record.mod_ports & sourcePorts[i]);
+#endif
+ }
+ }
+ }
+ ret = info->targetPortCount + info->sourcePortCount;
+ }
+ return ret;
+}
+
+int isSourcePort(PortInfo* info, INT32 portIndex) {
+ return (portIndex >= info->targetPortCount);
+}
+
+INT32 PORT_GetPortType(void* id, INT32 portIndex) {
+ PortInfo* info = (PortInfo*) id;
+ if ((portIndex >= 0) && (portIndex < PORT_GetPortCount(id))) {
+ if (isSourcePort(info, portIndex)) {
+ return sourcePortJavaSoundMapping[info->ports[portIndex]];
+ } else {
+ return targetPortJavaSoundMapping[info->ports[portIndex]];
+ }
+ }
+ return 0;
+}
+
+// pre-condition: portIndex must have been verified!
+char* getPortName(PortInfo* info, INT32 portIndex) {
+ char* ret = NULL;
+
+ if (isSourcePort(info, portIndex)) {
+ ret = sourcePortNames[info->ports[portIndex]];
+ } else {
+ ret = targetPortNames[info->ports[portIndex]];
+ }
+ return ret;
+}
+
+INT32 PORT_GetPortName(void* id, INT32 portIndex, char* name, INT32 len) {
+ PortInfo* info = (PortInfo*) id;
+ char* n;
+
+ if ((portIndex >= 0) && (portIndex < PORT_GetPortCount(id))) {
+ n = getPortName(info, portIndex);
+ if (n) {
+ strncpy(name, n, len-1);
+ name[len-1] = 0;
+ return TRUE;
+ }
+ }
+ return FALSE;
+}
+
+void createPortControl(PortInfo* info, PortControlCreator* creator, INT32 portIndex,
+ INT32 type, void** controlObjects, int* controlCount) {
+ PortControlID* controlID;
+ void* newControl = NULL;
+ int controlIndex;
+ char* jsType = NULL;
+ int isBoolean = FALSE;
+
+ TRACE0(">createPortControl\n");
+
+ // fill the ControlID structure and add this control
+ if (info->usedControlIDs >= info->maxControlCount) {
+ ERROR1("not enough free controlIDs !! maxControlIDs = %d\n", info->maxControlCount);
+ return;
+ }
+ controlID = &(info->controlIDs[info->usedControlIDs]);
+ controlID->portInfo = info;
+ controlID->controlType = type;
+ controlIndex = info->ports[portIndex];
+ if (isSourcePort(info, portIndex)) {
+ controlID->port = sourcePorts[controlIndex];
+ } else {
+ controlID->port = targetPorts[controlIndex];
+ }
+ switch (type & PORT_CONTROL_TYPE_MASK) {
+ case PORT_CONTROL_TYPE_SELECT_PORT:
+ jsType = CONTROL_TYPE_SELECT; isBoolean = TRUE; break;
+ case PORT_CONTROL_TYPE_GAIN:
+ jsType = CONTROL_TYPE_VOLUME; break;
+ case PORT_CONTROL_TYPE_BALANCE:
+ jsType = CONTROL_TYPE_BALANCE; break;
+ case PORT_CONTROL_TYPE_MONITOR_GAIN:
+ jsType = CONTROL_TYPE_VOLUME; break;
+ case PORT_CONTROL_TYPE_OUTPUT_MUTED:
+ jsType = CONTROL_TYPE_MUTE; isBoolean = TRUE; break;
+ }
+ if (isBoolean) {
+ TRACE0(" PORT_CONTROL_TYPE_BOOLEAN\n");
+ newControl = (creator->newBooleanControl)(creator, controlID, jsType);
+ }
+ else if (jsType == CONTROL_TYPE_BALANCE) {
+ TRACE0(" PORT_CONTROL_TYPE_BALANCE\n");
+ newControl = (creator->newFloatControl)(creator, controlID, jsType,
+ -1.0f, 1.0f, 2.0f / 65.0f, "");
+ } else {
+ TRACE0(" PORT_CONTROL_TYPE_FLOAT\n");
+ newControl = (creator->newFloatControl)(creator, controlID, jsType,
+ 0.0f, 1.0f, 1.0f / 256.0f, "");
+ }
+ if (newControl) {
+ controlObjects[*controlCount] = newControl;
+ (*controlCount)++;
+ info->usedControlIDs++;
+ }
+ TRACE0("addCompoundControl %d controls\n", *controlCount);
+ if (*controlCount) {
+ // create compound control and add it to the vector
+ compControl = (creator->newCompoundControl)(creator, name, controlObjects, *controlCount);
+ if (compControl) {
+ TRACE1(" addCompoundControl: calling addControl %p\n", compControl);
+ (creator->addControl)(creator, compControl);
+ }
+ *controlCount = 0;
+ }
+ TRACE0("addAllControl\n");
+ // go through all controls and add them to the vector
+ for (i = 0; i < *controlCount; i++) {
+ (creator->addControl)(creator, controlObjects[i]);
+ }
+ *controlCount = 0;
+ TRACE0("PORT_GetControls(id=%p, portIndex=%d). controlIDs=%p, maxControlCount=%d\n",
+ id, portIndex, info->controlIDs, info->maxControlCount);
+ if ((portIndex >= 0) && (portIndex < portCount)) {
+ // if the memory isn't reserved for the control structures, allocate it
+ if (!info->controlIDs) {
+ int maxCount = 0;
+ TRACE0("getControl: allocate mem\n");
+ // get a maximum number of controls:
+ // each port has a select, balance, and volume control.
+ maxCount = 3 * portCount;
+ // then there is monitorGain and outputMuted
+ maxCount += (2 * info->targetPortCount);
+ info->maxControlCount = maxCount;
+ info->controlIDs = (PortControlID*) malloc(sizeof(PortControlID) * maxCount);
+ }
+ if (!isSourcePort(info, portIndex)) {
+ type = PORT_CONTROL_TYPE_PLAY;
+ // add master mute control
+ createPortControl(info, creator, portIndex,
+ type | PORT_CONTROL_TYPE_OUTPUT_MUTED,
+ controls, &controlCount);
+ addAllControls(info, creator, controls, &controlCount);
+#ifdef SOLARIS7_COMPATIBLE
+ selectable = info->audioInfo.play.avail_ports & targetPorts[info->ports[portIndex]];
+#else
+ selectable = info->audioInfo.play.mod_ports & targetPorts[info->ports[portIndex]];
+#endif
+ } else {
+ type = PORT_CONTROL_TYPE_RECORD;
+#ifdef SOLARIS7_COMPATIBLE
+ selectable = info->audioInfo.record.avail_ports & sourcePorts[info->ports[portIndex]];
+#else
+ selectable = info->audioInfo.record.mod_ports & sourcePorts[info->ports[portIndex]];
+#endif
+ }
+ // add a mixer strip with volume, ...
+ createPortControl(info, creator, portIndex,
+ type | PORT_CONTROL_TYPE_GAIN,
+ controls, &controlCount);
+ // ... balance, ...
+ createPortControl(info, creator, portIndex,
+ type | PORT_CONTROL_TYPE_BALANCE,
+ controls, &controlCount);
+ // ... and select control (if not always on)...
+ if (selectable) {
+ createPortControl(info, creator, portIndex,
+ type | PORT_CONTROL_TYPE_SELECT_PORT,
+ controls, &controlCount);
+ }
+ // ... packaged in a compound control.
+ addCompoundControl(info, creator, getPortName(info, portIndex), controls, &controlCount);
+
+ if (type == PORT_CONTROL_TYPE_PLAY) {
+ // add a single strip for source ports with monitor gain
+ createPortControl(info, creator, portIndex,
+ type | PORT_CONTROL_TYPE_MONITOR_GAIN,
+ controls, &controlCount);
+ // also in a compound control
+ addCompoundControl(info, creator, MONITOR_GAIN_STRING, controls, &controlCount);
+ }
+ }
+ TRACE0("< PORT_getControls\n");
+}
+
+INT32 PORT_GetIntValue(void* controlIDV) {
+ PortControlID* controlID = (PortControlID*) controlIDV;
+ audio_info_t audioInfo;
+ audio_prinfo_t* prinfo;
+
+ AUDIO_INITINFO(&audioInfo);
+ if (ioctl(controlID->portInfo->fd, AUDIO_GETINFO, &audioInfo) >= 0) {
+ if (controlID->controlType & PORT_CONTROL_TYPE_PLAY) {
+ prinfo = &(audioInfo.play);
+ } else {
+ prinfo = &(audioInfo.record);
+ }
+ switch (controlID->controlType & PORT_CONTROL_TYPE_MASK) {
+ case PORT_CONTROL_TYPE_SELECT_PORT:
+ return (prinfo->port & controlID->port)?TRUE:FALSE;
+ case PORT_CONTROL_TYPE_OUTPUT_MUTED:
+ return (audioInfo.output_muted)?TRUE:FALSE;
+ default:
+ ERROR1("PORT_GetIntValue: Wrong type %d !\n", controlID->controlType & PORT_CONTROL_TYPE_MASK);
+ }
+ }
+ ERROR0("PORT_GetIntValue: Could not ioctl!\n");
+ return 0;
+}
+
+void PORT_SetIntValue(void* controlIDV, INT32 value) {
+ PortControlID* controlID = (PortControlID*) controlIDV;
+ audio_info_t audioInfo;
+ audio_prinfo_t* prinfo;
+ int setPort;
+
+ if (controlID->controlType & PORT_CONTROL_TYPE_PLAY) {
+ prinfo = &(audioInfo.play);
+ } else {
+ prinfo = &(audioInfo.record);
+ }
+ switch (controlID->controlType & PORT_CONTROL_TYPE_MASK) {
+ case PORT_CONTROL_TYPE_SELECT_PORT:
+ // first try to just add this port. if that fails, set ONLY to this port.
+ AUDIO_INITINFO(&audioInfo);
+ if (ioctl(controlID->portInfo->fd, AUDIO_GETINFO, &audioInfo) >= 0) {
+ if (value) {
+ setPort = (prinfo->port | controlID->port);
+ } else {
+ setPort = (prinfo->port - controlID->port);
+ }
+ AUDIO_INITINFO(&audioInfo);
+ prinfo->port = setPort;
+ if (ioctl(controlID->portInfo->fd, AUDIO_SETINFO, &audioInfo) < 0) {
+ // didn't work. Either this line doesn't support to select several
+ // ports at once (e.g. record), or a real error
+ if (value) {
+ // set to ONLY this port (and disable any other currently selected ports)
+ AUDIO_INITINFO(&audioInfo);
+ prinfo->port = controlID->port;
+ if (ioctl(controlID->portInfo->fd, AUDIO_SETINFO, &audioInfo) < 0) {
+ ERROR2("Error setting output select port %d to port %d!\n", controlID->port, controlID->port);
+ }
+ } else {
+ // assume it's an error
+ ERROR2("Error setting output select port %d to port %d!\n", controlID->port, setPort);
+ }
+ }
+ break;
+ case PORT_CONTROL_TYPE_OUTPUT_MUTED:
+ AUDIO_INITINFO(&audioInfo);
+ audioInfo.output_muted = (value?TRUE:FALSE);
+ if (ioctl(controlID->portInfo->fd, AUDIO_SETINFO, &audioInfo) < 0) {
+ ERROR2("Error setting output muted on port %d to %d!\n", controlID->port, value);
+ }
+ break;
+ default:
+ ERROR1("PORT_SetIntValue: Wrong type %d !\n", controlID->controlType & PORT_CONTROL_TYPE_MASK);
+ }
+ }
+}
+
+float PORT_GetFloatValue(void* controlIDV) {
+ PortControlID* controlID = (PortControlID*) controlIDV;
+ audio_info_t audioInfo;
+ audio_prinfo_t* prinfo;
+
+ AUDIO_INITINFO(&audioInfo);
+ if (ioctl(controlID->portInfo->fd, AUDIO_GETINFO, &audioInfo) >= 0) {
+ if (controlID->controlType & PORT_CONTROL_TYPE_PLAY) {
+ prinfo = &(audioInfo.play);
+ } else {
+ prinfo = &(audioInfo.record);
+ }
+ switch (controlID->controlType & PORT_CONTROL_TYPE_MASK) {
+ case PORT_CONTROL_TYPE_GAIN:
+ return ((float) (prinfo->gain - AUDIO_MIN_GAIN))
+ / ((float) (AUDIO_MAX_GAIN - AUDIO_MIN_GAIN));
+ case PORT_CONTROL_TYPE_BALANCE:
+ return ((float) ((prinfo->balance - AUDIO_LEFT_BALANCE - AUDIO_MID_BALANCE) << 1))
+ / ((float) (AUDIO_RIGHT_BALANCE - AUDIO_LEFT_BALANCE));
+ case PORT_CONTROL_TYPE_MONITOR_GAIN:
+ return ((float) (audioInfo.monitor_gain - AUDIO_MIN_GAIN))
+ / ((float) (AUDIO_MAX_GAIN - AUDIO_MIN_GAIN));
+ default:
+ ERROR1("PORT_GetFloatValue: Wrong type %d !\n", controlID->controlType & PORT_CONTROL_TYPE_MASK);
+ }
+ }
+ ERROR0("PORT_GetFloatValue: Could not ioctl!\n");
+ return 0.0f;
+}
+
+void PORT_SetFloatValue(void* controlIDV, float value) {
+ PortControlID* controlID = (PortControlID*) controlIDV;
+ audio_info_t audioInfo;
+ audio_prinfo_t* prinfo;
+
+ AUDIO_INITINFO(&audioInfo);
+
+ if (controlID->controlType & PORT_CONTROL_TYPE_PLAY) {
+ prinfo = &(audioInfo.play);
+ } else {
+ prinfo = &(audioInfo.record);
+ }
+ switch (controlID->controlType & PORT_CONTROL_TYPE_MASK) {
+ case PORT_CONTROL_TYPE_GAIN:
+ prinfo->gain = AUDIO_MIN_GAIN
+ + (int) ((value * ((float) (AUDIO_MAX_GAIN - AUDIO_MIN_GAIN))) + 0.5f);
+ break;
+ case PORT_CONTROL_TYPE_BALANCE:
+ prinfo->balance = AUDIO_LEFT_BALANCE + AUDIO_MID_BALANCE
+ + ((int) (value * ((float) ((AUDIO_RIGHT_BALANCE - AUDIO_LEFT_BALANCE) >> 1))) + 0.5f);
+ break;
+ case PORT_CONTROL_TYPE_MONITOR_GAIN:
+ audioInfo.monitor_gain = AUDIO_MIN_GAIN
+ + (int) ((value * ((float) (AUDIO_MAX_GAIN - AUDIO_MIN_GAIN))) + 0.5f);
+ break;
+ default:
+ ERROR1("PORT_SetFloatValue: Wrong type %d !\n", controlID->controlType & PORT_CONTROL_TYPE_MASK);
+ return;
+ }
+ if (ioctl(controlID->portInfo->fd, AUDIO_SETINFO, &audioInfo) < 0) {
+ ERROR0("PORT_SetFloatValue: Could not ioctl!\n");
+ }
+}
+
+#endif // USE_PORTS
diff -r eb72d194235c -r 514c68575523 src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Utils.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Utils.c Fri Mar 23 18:44:47 2018 +0000
@@ -0,0 +1,193 @@
+/*
+ * Copyright (c) 2002, 2007, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+#define USE_ERROR
+#define USE_TRACE
+
+#include "PLATFORM_API_SolarisOS_Utils.h"
+
+#define MAX_AUDIO_DEVICES 20
+
+// not thread safe...
+static AudioDevicePath globalADPaths[MAX_AUDIO_DEVICES];
+static int globalADCount = -1;
+static int globalADCacheTime = -1;
+/* how many seconds do we cache devices */
+#define AD_CACHE_TIME 30
+
+// return seconds
+long getTimeInSeconds() {
+ struct timeval tv;
+ gettimeofday(&tv, NULL);
+ return tv.tv_sec;
+}
+
+
+int getAudioDeviceCount() {
+ int count = MAX_AUDIO_DEVICES;
+
+ getAudioDevices(globalADPaths, &count);
+ return count;
+}
+
+/* returns TRUE if the path exists at all */
+int addAudioDevice(char* path, AudioDevicePath* adPath, int* count) {
+ int i;
+ int found = 0;
+ int fileExists = 0;
+ // not thread safe...
+ static struct stat statBuf;
+
+ // get stats on the file
+ if (stat(path, &statBuf) == 0) {
+ // file exists.
+ fileExists = 1;
+ // If it is not yet in the adPath array, add it to the array
+ for (i = 0; i < *count; i++) {
+ if (adPath[i].st_ino == statBuf.st_ino
+ && adPath[i].st_dev == statBuf.st_dev) {
+ found = 1;
+ break;
+ }
+ }
+ if (!found) {
+ adPath[*count].st_ino = statBuf.st_ino;
+ adPath[*count].st_dev = statBuf.st_dev;
+ strncpy(adPath[*count].path, path, MAX_NAME_LENGTH);
+ adPath[*count].path[MAX_NAME_LENGTH - 1] = 0;
+ (*count)++;
+ TRACE1("Added audio device %s\n", path);
+ }
+ }
+ return fileExists;
+}
+
+
+void getAudioDevices(AudioDevicePath* adPath, int* count) {
+ int maxCount = *count;
+ char* audiodev;
+ char devsound[15];
+ int i;
+ long timeInSeconds = getTimeInSeconds();
+
+ if (globalADCount < 0
+ || (getTimeInSeconds() - globalADCacheTime) > AD_CACHE_TIME
+ || (adPath != globalADPaths)) {
+ *count = 0;
+ // first device, if set, is AUDIODEV variable
+ audiodev = getenv("AUDIODEV");
+ if (audiodev != NULL && audiodev[0] != 0) {
+ addAudioDevice(audiodev, adPath, count);
+ }
+ // then try /dev/audio
+ addAudioDevice("/dev/audio", adPath, count);
+ // then go through all of the /dev/sound/? devices
+ for (i = 0; i < 100; i++) {
+ sprintf(devsound, "/dev/sound/%d", i);
+ if (!addAudioDevice(devsound, adPath, count)) {
+ break;
+ }
+ }
+ if (adPath == globalADPaths) {
+ /* commit cache */
+ globalADCount = *count;
+ /* set cache time */
+ globalADCacheTime = timeInSeconds;
+ }
+ } else {
+ /* return cache */
+ *count = globalADCount;
+ }
+ // that's it
+}
+
+int getAudioDeviceDescriptionByIndex(int index, AudioDeviceDescription* adDesc, int getNames) {
+ int count = MAX_AUDIO_DEVICES;
+ int ret = 0;
+
+ getAudioDevices(globalADPaths, &count);
+ if (index>=0 && index < count) {
+ ret = getAudioDeviceDescription(globalADPaths[index].path, adDesc, getNames);
+ }
+ return ret;
+}
+
+int getAudioDeviceDescription(char* path, AudioDeviceDescription* adDesc, int getNames) {
+ int fd;
+ int mixerMode;
+ int len;
+ audio_info_t info;
+ audio_device_t deviceInfo;
+
+ strncpy(adDesc->path, path, MAX_NAME_LENGTH);
+ adDesc->path[MAX_NAME_LENGTH] = 0;
+ strcpy(adDesc->pathctl, adDesc->path);
+ strcat(adDesc->pathctl, "ctl");
+ strcpy(adDesc->name, adDesc->path);
+ adDesc->vendor[0] = 0;
+ adDesc->version[0] = 0;
+ adDesc->description[0] = 0;
+ adDesc->maxSimulLines = 1;
+
+ // try to open the pseudo device and get more information
+ fd = open(adDesc->pathctl, O_WRONLY | O_NONBLOCK);
+ if (fd >= 0) {
+ close(fd);
+ if (getNames) {
+ fd = open(adDesc->pathctl, O_RDONLY);
+ if (fd >= 0) {
+ if (ioctl(fd, AUDIO_GETDEV, &deviceInfo) >= 0) {
+ strncpy(adDesc->vendor, deviceInfo.name, MAX_AUDIO_DEV_LEN);
+ adDesc->vendor[MAX_AUDIO_DEV_LEN] = 0;
+ strncpy(adDesc->version, deviceInfo.version, MAX_AUDIO_DEV_LEN);
+ adDesc->version[MAX_AUDIO_DEV_LEN] = 0;
+ /* add config string to the dev name
+ * creates a string like "/dev/audio (onboard1)"
+ */
+ len = strlen(adDesc->name) + 1;
+ if (MAX_NAME_LENGTH - len > 3) {
+ strcat(adDesc->name, " (");
+ strncat(adDesc->name, deviceInfo.config, MAX_NAME_LENGTH - len);
+ strcat(adDesc->name, ")");
+ }
+ adDesc->name[MAX_NAME_LENGTH-1] = 0;
+ }
+ if (ioctl(fd, AUDIO_MIXERCTL_GET_MODE, &mixerMode) >= 0) {
+ if (mixerMode == AM_MIXER_MODE) {
+ TRACE1(" getAudioDeviceDescription: %s is in mixer mode\n", adDesc->path);
+ adDesc->maxSimulLines = -1;
+ }
+ } else {
+ ERROR1("ioctl AUDIO_MIXERCTL_GET_MODE failed on %s!\n", adDesc->path);
+ }
+ close(fd);
+ } else {
+ ERROR1("could not open %s!\n", adDesc->pathctl);
+ }
+ }
+ return 1;
+ }
+ return 0;
+}
diff -r eb72d194235c -r 514c68575523 src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Utils.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.desktop/solaris/native/libjsound/PLATFORM_API_SolarisOS_Utils.h Fri Mar 23 18:44:47 2018 +0000
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2002, 2013, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+#include
+#include
+#include
+#include
+/* does not work on Solaris 2.7 */
+#include
+#include
+#include
+#ifndef __linux__
+#include
+#endif
+#include
+#include
+#include
+
+#ifndef PLATFORM_API_SOLARISOS_UTILS_H_INCLUDED
+#define PLATFORM_API_SOLARISOS_UTILS_H_INCLUDED
+
+/* defines for Solaris 2.7
+ #ifndef AUDIO_AUX1_OUT
+ #define AUDIO_AUX1_OUT (0x08) // output to aux1 out
+ #define AUDIO_AUX2_OUT (0x10) // output to aux2 out
+ #define AUDIO_SPDIF_OUT (0x20) // output to SPDIF port
+ #define AUDIO_AUX1_IN (0x08) // input from aux1 in
+ #define AUDIO_AUX2_IN (0x10) // input from aux2 in
+ #define AUDIO_SPDIF_IN (0x20) // input from SPDIF port
+ #endif
+*/
+
+/* input from Codec inter. loopback */
+#ifndef AUDIO_CODEC_LOOPB_IN
+#define AUDIO_CODEC_LOOPB_IN (0x40)
+#endif
+
+
+#define MAX_NAME_LENGTH 300
+
+typedef struct tag_AudioDevicePath {
+ char path[MAX_NAME_LENGTH];
+ ino_t st_ino; // inode number to detect duplicate devices
+ dev_t st_dev; // device ID to detect duplicate audio devices
+} AudioDevicePath;
+
+typedef struct tag_AudioDeviceDescription {
+ INT32 maxSimulLines;
+ char path[MAX_NAME_LENGTH+1];
+ char pathctl[MAX_NAME_LENGTH+4];
+ char name[MAX_NAME_LENGTH+1];
+ char vendor[MAX_NAME_LENGTH+1];
+ char version[MAX_NAME_LENGTH+1];
+ char description[MAX_NAME_LENGTH+1];
+} AudioDeviceDescription;
+
+int getAudioDeviceCount();
+
+/*
+ * adPath is an array of AudioDevicePath structures
+ * count contains initially the number of elements in adPath
+ * and will be set to the returned number of paths.
+ */
+void getAudioDevices(AudioDevicePath* adPath, int* count);
+
+/*
+ * fills adDesc from the audio device given in path
+ * returns 0 if an error occurred
+ * if getNames is 0, only path and pathctl are filled
+ */
+int getAudioDeviceDescription(char* path, AudioDeviceDescription* adDesc, int getNames);
+int getAudioDeviceDescriptionByIndex(int index, AudioDeviceDescription* adDesc, int getNames);
+
+
+#endif // PLATFORM_API_SOLARISOS_UTILS_H_INCLUDED
diff -r eb72d194235c -r 514c68575523 src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.c
--- a/src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.c Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.c Fri Mar 23 18:44:47 2018 +0000
@@ -45,18 +45,18 @@
static GtkLib gtk_libs[] = {
{
+ GTK_3,
+ JNI_LIB_NAME("gtk-3"),
+ VERSIONED_JNI_LIB_NAME("gtk-3", "0"),
+ >k3_load,
+ >k3_check
+ },
+ {
GTK_2,
JNI_LIB_NAME("gtk-x11-2.0"),
VERSIONED_JNI_LIB_NAME("gtk-x11-2.0", "0"),
>k2_load,
>k2_check
- },
- {
- GTK_3,
- JNI_LIB_NAME("gtk-3"),
- VERSIONED_JNI_LIB_NAME("gtk-3", "0"),
- >k3_load,
- >k3_check
}
};
diff -r eb72d194235c -r 514c68575523 src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c
--- a/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c Fri Mar 23 18:01:52 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,182 +0,0 @@
-/*
- * Copyright (c) 2003, 2012, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-//#define USE_ERROR
-//#define USE_TRACE
-
-#include "PLATFORM_API_BsdOS_ALSA_CommonUtils.h"
-
-static void alsaDebugOutput(const char *file, int line, const char *function, int err, const char *fmt, ...) {
-#ifdef USE_ERROR
- va_list args;
- va_start(args, fmt);
- printf("%s:%d function %s: error %d: %s\n", file, line, function, err, snd_strerror(err));
- if (strlen(fmt) > 0) {
- vprintf(fmt, args);
- }
- va_end(args);
-#endif
-}
-
-static int alsa_inited = 0;
-static int alsa_enumerate_pcm_subdevices = FALSE; // default: no
-static int alsa_enumerate_midi_subdevices = FALSE; // default: no
-
-void initAlsaSupport() {
- char* enumerate;
- if (!alsa_inited) {
- alsa_inited = TRUE;
- snd_lib_error_set_handler(&alsaDebugOutput);
-
- enumerate = getenv(ENV_ENUMERATE_PCM_SUBDEVICES);
- if (enumerate != NULL && strlen(enumerate) > 0
- && (enumerate[0] != 'f') // false
- && (enumerate[0] != 'F') // False
- && (enumerate[0] != 'n') // no
- && (enumerate[0] != 'N')) { // NO
- alsa_enumerate_pcm_subdevices = TRUE;
- }
-#ifdef ALSA_MIDI_ENUMERATE_SUBDEVICES
- alsa_enumerate_midi_subdevices = TRUE;
-#endif
- }
-}
-
-
-/* if true (non-zero), ALSA sub devices should be listed as separate devices
- */
-int needEnumerateSubdevices(int isMidi) {
- initAlsaSupport();
- return isMidi ? alsa_enumerate_midi_subdevices
- : alsa_enumerate_pcm_subdevices;
-}
-
-
-/*
- * deviceID contains packed card, device and subdevice numbers
- * each number takes 10 bits
- * "default" device has id == ALSA_DEFAULT_DEVICE_ID
- */
-UINT32 encodeDeviceID(int card, int device, int subdevice) {
- return (((card & 0x3FF) << 20) | ((device & 0x3FF) << 10)
- | (subdevice & 0x3FF)) + 1;
-}
-
-
-void decodeDeviceID(UINT32 deviceID, int* card, int* device, int* subdevice,
- int isMidi) {
- deviceID--;
- *card = (deviceID >> 20) & 0x3FF;
- *device = (deviceID >> 10) & 0x3FF;
- if (needEnumerateSubdevices(isMidi)) {
- *subdevice = deviceID & 0x3FF;
- } else {
- *subdevice = -1; // ALSA will choose any subdevices
- }
-}
-
-
-void getDeviceString(char* buffer, int card, int device, int subdevice,
- int usePlugHw, int isMidi) {
- if (needEnumerateSubdevices(isMidi)) {
- sprintf(buffer, "%s:%d,%d,%d",
- usePlugHw ? ALSA_PLUGHARDWARE : ALSA_HARDWARE,
- card, device, subdevice);
- } else {
- sprintf(buffer, "%s:%d,%d",
- usePlugHw ? ALSA_PLUGHARDWARE : ALSA_HARDWARE,
- card, device);
- }
-}
-
-
-void getDeviceStringFromDeviceID(char* buffer, UINT32 deviceID,
- int usePlugHw, int isMidi) {
- int card, device, subdevice;
-
- if (deviceID == ALSA_DEFAULT_DEVICE_ID) {
- strcpy(buffer, ALSA_DEFAULT_DEVICE_NAME);
- } else {
- decodeDeviceID(deviceID, &card, &device, &subdevice, isMidi);
- getDeviceString(buffer, card, device, subdevice, usePlugHw, isMidi);
- }
-}
-
-
-static int hasGottenALSAVersion = FALSE;
-#define ALSAVersionString_LENGTH 200
-static char ALSAVersionString[ALSAVersionString_LENGTH];
-
-void getALSAVersion(char* buffer, int len) {
- if (!hasGottenALSAVersion) {
- // get alsa version from proc interface
- FILE* file;
- int curr, len, totalLen, inVersionString;
- file = fopen(ALSA_VERSION_PROC_FILE, "r");
- ALSAVersionString[0] = 0;
- if (file) {
- if (NULL != fgets(ALSAVersionString, ALSAVersionString_LENGTH, file)) {
- // parse for version number
- totalLen = strlen(ALSAVersionString);
- inVersionString = FALSE;
- len = 0;
- curr = 0;
- while (curr < totalLen) {
- if (!inVersionString) {
- // is this char the beginning of a version string ?
- if (ALSAVersionString[curr] >= '0'
- && ALSAVersionString[curr] <= '9') {
- inVersionString = TRUE;
- }
- }
- if (inVersionString) {
- // the version string ends with white space
- if (ALSAVersionString[curr] <= 32) {
- break;
- }
- if (curr != len) {
- // copy this char to the beginning of the string
- ALSAVersionString[len] = ALSAVersionString[curr];
- }
- len++;
- }
- curr++;
- }
- // remove trailing dots
- while ((len > 0) && (ALSAVersionString[len - 1] == '.')) {
- len--;
- }
- // null terminate
- ALSAVersionString[len] = 0;
- }
- fclose(file);
- hasGottenALSAVersion = TRUE;
- }
- }
- strncpy(buffer, ALSAVersionString, len);
-}
-
-
-/* end */
diff -r eb72d194235c -r 514c68575523 src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h
--- a/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h Fri Mar 23 18:01:52 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2003, 2012, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#include
-#include "Utilities.h"
-
-#ifndef PLATFORM_API_BSDOS_ALSA_COMMONUTILS_H_INCLUDED
-#define PLATFORM_API_BSDOS_ALSA_COMMONUTILS_H_INCLUDED
-
-#define ALSA_VERSION_PROC_FILE "/proc/asound/version"
-#define ALSA_HARDWARE "hw"
-#define ALSA_HARDWARE_CARD ALSA_HARDWARE":%d"
-#define ALSA_HARDWARE_DEVICE ALSA_HARDWARE_CARD",%d"
-#define ALSA_HARDWARE_SUBDEVICE ALSA_HARDWARE_DEVICE",%d"
-
-#define ALSA_PLUGHARDWARE "plughw"
-#define ALSA_DEFAULT_DEVICE_NAME "default"
-
-#define ALSA_DEFAULT_DEVICE_ID (0)
-
-#define ALSA_PCM (0)
-#define ALSA_RAWMIDI (1)
-
-// for use in info objects
-#define ALSA_VENDOR "ALSA (http://www.alsa-project.org)"
-
-// Environment variable for inclusion of subdevices in device listing.
-// If this variable is unset or "no", then subdevices are ignored, and
-// it's ALSA's choice which one to use (enables hardware mixing)
-#define ENV_ENUMERATE_PCM_SUBDEVICES "ALSA_ENUMERATE_PCM_SUBDEVICES"
-
-// if defined, subdevices are listed.
-//#undef ALSA_MIDI_ENUMERATE_SUBDEVICES
-#define ALSA_MIDI_ENUMERATE_SUBDEVICES
-
-// must be called before any ALSA calls
-void initAlsaSupport();
-
-/* if true (non-zero), ALSA sub devices should be listed as separate devices
- */
-int needEnumerateSubdevices(int isMidi);
-
-
-/*
- * deviceID contains packed card, device and subdevice numbers
- * each number takes 10 bits
- * "default" device has id == ALSA_DEFAULT_DEVICE_ID
- */
-UINT32 encodeDeviceID(int card, int device, int subdevice);
-
-void decodeDeviceID(UINT32 deviceID, int* card, int* device, int* subdevice,
- int isMidi);
-
-void getDeviceStringFromDeviceID(char* buffer, UINT32 deviceID,
- int usePlugHw, int isMidi);
-
-void getALSAVersion(char* buffer, int len);
-
-
-#endif // PLATFORM_API_BSDOS_ALSA_COMMONUTILS_H_INCLUDED
diff -r eb72d194235c -r 514c68575523 src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiIn.c
--- a/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiIn.c Fri Mar 23 18:01:52 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,354 +0,0 @@
-/*
- * Copyright (c) 2003, 2012, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#define USE_ERROR
-#define USE_TRACE
-
-#if USE_PLATFORM_MIDI_IN == TRUE
-
-
-#include
-#include "PlatformMidi.h"
-#include "PLATFORM_API_BsdOS_ALSA_MidiUtils.h"
-#if defined(i586)
-#include
-#endif
-
-/*
- * Helper methods
- */
-
-static inline UINT32 packMessage(int status, int data1, int data2) {
- return ((status & 0xFF) | ((data1 & 0xFF) << 8) | ((data2 & 0xFF) << 16));
-}
-
-
-static void setShortMessage(MidiMessage* message,
- int status, int data1, int data2) {
- message->type = SHORT_MESSAGE;
- message->data.s.packedMsg = packMessage(status, data1, data2);
-}
-
-
-static void setRealtimeMessage(MidiMessage* message, int status) {
- setShortMessage(message, status, 0, 0);
-}
-
-
-static void set14bitMessage(MidiMessage* message, int status, int value) {
- TRACE3("14bit value: %d, lsb: %d, msb: %d\n", value, value & 0x7F, (value >> 7) & 0x7F);
- value &= 0x3FFF;
- TRACE3("14bit value (2): %d, lsb: %d, msb: %d\n", value, value & 0x7F, (value >> 7) & 0x7F);
- setShortMessage(message, status,
- value & 0x7F,
- (value >> 7) & 0x7F);
-}
-
-
-/*
- * implementation of the platform-dependent
- * MIDI in functions declared in PlatformMidi.h
- */
-
-char* MIDI_IN_GetErrorStr(INT32 err) {
- return (char*) getErrorStr(err);
-}
-
-INT32 MIDI_IN_GetNumDevices() {
-/* Workaround for 6842956: 32bit app on 64bit bsd
- * gets assertion failure trying to open midiIn ports.
- * Untill the issue is fixed in ALSA
- * (https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4807)
- * report no midi in devices in the configuration.
- */
-#if defined(i586)
- static int jre32onbsd64 = -1;
- if (jre32onbsd64 < 0) {
- jre32onbsd64 = 0;
- /* The workaround may be disabled setting "JAVASOUND_ENABLE_MIDIIN"
- * environment variable.
- */
- if (getenv("JAVASOUND_ENABLE_MIDIIN") == NULL) {
- struct utsname u;
- jre32onbsd64 = 0;
- if (uname(&u) == 0) {
- if (strstr(u.machine, "64") != NULL) {
- TRACE0("jre32 on bsd64 detected - report no midiIn devices\n");
- jre32onbsd64 = 1;
- }
- }
- }
- }
- if (jre32onbsd64) {
- return 0;
- }
-#endif
-
- TRACE0("MIDI_IN_GetNumDevices()\n");
-
- return getMidiDeviceCount(SND_RAWMIDI_STREAM_INPUT);
-}
-
-
-INT32 MIDI_IN_GetDeviceName(INT32 deviceIndex, char *name, UINT32 nameLength) {
- int ret = getMidiDeviceName(SND_RAWMIDI_STREAM_INPUT, deviceIndex,
- name, nameLength);
- return ret;
-}
-
-
-INT32 MIDI_IN_GetDeviceVendor(INT32 deviceIndex, char *name, UINT32 nameLength) {
- int ret = getMidiDeviceVendor(deviceIndex, name, nameLength);
- return ret;
-}
-
-
-INT32 MIDI_IN_GetDeviceDescription(INT32 deviceIndex, char *name, UINT32 nameLength) {
- int ret = getMidiDeviceDescription(SND_RAWMIDI_STREAM_INPUT, deviceIndex,
- name, nameLength);
- return ret;
-}
-
-
-INT32 MIDI_IN_GetDeviceVersion(INT32 deviceIndex, char *name, UINT32 nameLength) {
- int ret = getMidiDeviceVersion(deviceIndex, name, nameLength);
- return ret;
-}
-
-/*************************************************************************/
-
-INT32 MIDI_IN_OpenDevice(INT32 deviceIndex, MidiDeviceHandle** handle) {
- INT32 ret;
- TRACE0("> MIDI_IN_OpenDevice\n");
- ret = openMidiDevice(SND_RAWMIDI_STREAM_INPUT, deviceIndex, handle);
- TRACE1("< MIDI_IN_OpenDevice: returning %d\n", (int) ret);
- return ret;
-}
-
-
-INT32 MIDI_IN_CloseDevice(MidiDeviceHandle* handle) {
- INT32 ret;
- TRACE0("> MIDI_IN_CloseDevice\n");
- ret = closeMidiDevice(handle);
- TRACE1("< MIDI_IN_CloseDevice: returning %d\n", (int) ret);
- return ret;
-}
-
-
-INT32 MIDI_IN_StartDevice(MidiDeviceHandle* handle) {
- TRACE0("MIDI_IN_StartDevice\n");
- return MIDI_SUCCESS;
-}
-
-
-INT32 MIDI_IN_StopDevice(MidiDeviceHandle* handle) {
- TRACE0("MIDI_IN_StopDevice\n");
- return MIDI_SUCCESS;
-}
-
-
-INT64 MIDI_IN_GetTimeStamp(MidiDeviceHandle* handle) {
- return getMidiTimestamp(handle);
-}
-
-
-/* read the next message from the queue */
-MidiMessage* MIDI_IN_GetMessage(MidiDeviceHandle* handle) {
- snd_seq_event_t alsa_message;
- MidiMessage* jdk_message;
- int err;
- char buffer[1];
- int status;
-
- TRACE0("> MIDI_IN_GetMessage\n");
- if (!handle) {
- ERROR0("< ERROR: MIDI_IN_GetMessage(): handle is NULL\n");
- return NULL;
- }
- if (!handle->deviceHandle) {
- ERROR0("< ERROR: MIDI_IN_GetMessage(): native handle is NULL\n");
- return NULL;
- }
- if (!handle->platformData) {
- ERROR0("< ERROR: MIDI_IN_GetMessage(): platformData is NULL\n");
- return NULL;
- }
-
- /* For MIDI In, the device is left in non blocking mode. So if there is
- no data from the device, snd_rawmidi_read() returns with -11 (EAGAIN).
- This results in jumping back to the Java layer. */
- while (TRUE) {
- TRACE0("before snd_rawmidi_read()\n");
- err = snd_rawmidi_read((snd_rawmidi_t*) handle->deviceHandle, buffer, 1);
- TRACE0("after snd_rawmidi_read()\n");
- if (err != 1) {
- ERROR2("< ERROR: MIDI_IN_GetMessage(): snd_rawmidi_read() returned %d : %s\n", err, snd_strerror(err));
- return NULL;
- }
- // printf("received byte: %d\n", buffer[0]);
- err = snd_midi_event_encode_byte((snd_midi_event_t*) handle->platformData,
- (int) buffer[0],
- &alsa_message);
- if (err == 1) {
- break;
- } else if (err < 0) {
- ERROR1("< ERROR: MIDI_IN_GetMessage(): snd_midi_event_encode_byte() returned %d\n", err);
- return NULL;
- }
- }
- jdk_message = (MidiMessage*) calloc(sizeof(MidiMessage), 1);
- if (!jdk_message) {
- ERROR0("< ERROR: MIDI_IN_GetMessage(): out of memory\n");
- return NULL;
- }
- // TODO: tra
- switch (alsa_message.type) {
- case SND_SEQ_EVENT_NOTEON:
- case SND_SEQ_EVENT_NOTEOFF:
- case SND_SEQ_EVENT_KEYPRESS:
- status = (alsa_message.type == SND_SEQ_EVENT_KEYPRESS) ? 0xA0 :
- (alsa_message.type == SND_SEQ_EVENT_NOTEON) ? 0x90 : 0x80;
- status |= alsa_message.data.note.channel;
- setShortMessage(jdk_message, status,
- alsa_message.data.note.note,
- alsa_message.data.note.velocity);
- break;
-
- case SND_SEQ_EVENT_CONTROLLER:
- status = 0xB0 | alsa_message.data.control.channel;
- setShortMessage(jdk_message, status,
- alsa_message.data.control.param,
- alsa_message.data.control.value);
- break;
-
- case SND_SEQ_EVENT_PGMCHANGE:
- case SND_SEQ_EVENT_CHANPRESS:
- status = (alsa_message.type == SND_SEQ_EVENT_PGMCHANGE) ? 0xC0 : 0xD0;
- status |= alsa_message.data.control.channel;
- setShortMessage(jdk_message, status,
- alsa_message.data.control.value, 0);
- break;
-
- case SND_SEQ_EVENT_PITCHBEND:
- status = 0xE0 | alsa_message.data.control.channel;
- // $$mp 2003-09-23:
- // possible hack to work around a bug in ALSA. Necessary for
- // ALSA 0.9.2. May be fixed in newer versions of ALSA.
- // alsa_message.data.control.value ^= 0x2000;
- // TRACE1("pitchbend value: %d\n", alsa_message.data.control.value);
- set14bitMessage(jdk_message, status,
- alsa_message.data.control.value);
- break;
-
- /* System exclusive messages */
-
- case SND_SEQ_EVENT_SYSEX:
- jdk_message->type = LONG_MESSAGE;
- jdk_message->data.l.size = alsa_message.data.ext.len;
- jdk_message->data.l.data = malloc(alsa_message.data.ext.len);
- if (jdk_message->data.l.data == NULL) {
- ERROR0("< ERROR: MIDI_IN_GetMessage(): out of memory\n");
- free(jdk_message);
- jdk_message = NULL;
- } else {
- memcpy(jdk_message->data.l.data, alsa_message.data.ext.ptr, alsa_message.data.ext.len);
- }
- break;
-
- /* System common messages */
-
- case SND_SEQ_EVENT_QFRAME:
- setShortMessage(jdk_message, 0xF1,
- alsa_message.data.control.value & 0x7F, 0);
- break;
-
- case SND_SEQ_EVENT_SONGPOS:
- set14bitMessage(jdk_message, 0xF2,
- alsa_message.data.control.value);
- break;
-
- case SND_SEQ_EVENT_SONGSEL:
- setShortMessage(jdk_message, 0xF3,
- alsa_message.data.control.value & 0x7F, 0);
- break;
-
- case SND_SEQ_EVENT_TUNE_REQUEST:
- setRealtimeMessage(jdk_message, 0xF6);
- break;
-
- /* System realtime messages */
-
- case SND_SEQ_EVENT_CLOCK:
- setRealtimeMessage(jdk_message, 0xF8);
- break;
-
- case SND_SEQ_EVENT_START:
- setRealtimeMessage(jdk_message, 0xFA);
- break;
-
- case SND_SEQ_EVENT_CONTINUE:
- setRealtimeMessage(jdk_message, 0xFB);
- break;
-
- case SND_SEQ_EVENT_STOP:
- setRealtimeMessage(jdk_message, 0xFC);
- break;
-
- case SND_SEQ_EVENT_SENSING:
- setRealtimeMessage(jdk_message, 0xFE);
- break;
-
- case SND_SEQ_EVENT_RESET:
- setRealtimeMessage(jdk_message, 0xFF);
- break;
-
- default:
- ERROR0("< ERROR: MIDI_IN_GetMessage(): unhandled ALSA MIDI message type\n");
- free(jdk_message);
- jdk_message = NULL;
-
- }
-
- // set timestamp
- if (jdk_message != NULL) {
- jdk_message->timestamp = getMidiTimestamp(handle);
- }
- TRACE1("< MIDI_IN_GetMessage: returning %p\n", jdk_message);
- return jdk_message;
-}
-
-
-void MIDI_IN_ReleaseMessage(MidiDeviceHandle* handle, MidiMessage* msg) {
- if (!msg) {
- ERROR0("< ERROR: MIDI_IN_ReleaseMessage(): message is NULL\n");
- return;
- }
- if (msg->type == LONG_MESSAGE && msg->data.l.data) {
- free(msg->data.l.data);
- }
- free(msg);
-}
-
-#endif /* USE_PLATFORM_MIDI_IN */
diff -r eb72d194235c -r 514c68575523 src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiOut.c
--- a/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiOut.c Fri Mar 23 18:01:52 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,179 +0,0 @@
-/*
- * Copyright (c) 2003, 2012, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#define USE_ERROR
-#define USE_TRACE
-
-#if USE_PLATFORM_MIDI_OUT == TRUE
-
-#include
-#include "PlatformMidi.h"
-#include "PLATFORM_API_BsdOS_ALSA_MidiUtils.h"
-
-
-
-static int CHANNEL_MESSAGE_LENGTH[] = {
- -1, -1, -1, -1, -1, -1, -1, -1, 3, 3, 3, 3, 2, 2, 3 };
-/* 8x 9x Ax Bx Cx Dx Ex */
-
-static int SYSTEM_MESSAGE_LENGTH[] = {
- -1, 2, 3, 2, -1, -1, 1, 1, 1, -1, 1, 1, 1, -1, 1, 1 };
-/* F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE FF */
-
-
-// the returned length includes the status byte.
-// for illegal messages, -1 is returned.
-static int getShortMessageLength(int status) {
- int dataLength = 0;
- if (status < 0xF0) { // channel voice message
- dataLength = CHANNEL_MESSAGE_LENGTH[(status >> 4) & 0xF];
- } else {
- dataLength = SYSTEM_MESSAGE_LENGTH[status & 0xF];
- }
- return dataLength;
-}
-
-
-/*
- * implementation of the platform-dependent
- * MIDI out functions declared in PlatformMidi.h
- */
-char* MIDI_OUT_GetErrorStr(INT32 err) {
- return (char*) getErrorStr(err);
-}
-
-
-INT32 MIDI_OUT_GetNumDevices() {
- TRACE0("MIDI_OUT_GetNumDevices()\n");
- return getMidiDeviceCount(SND_RAWMIDI_STREAM_OUTPUT);
-}
-
-
-INT32 MIDI_OUT_GetDeviceName(INT32 deviceIndex, char *name, UINT32 nameLength) {
- TRACE0("MIDI_OUT_GetDeviceName()\n");
- return getMidiDeviceName(SND_RAWMIDI_STREAM_OUTPUT, deviceIndex,
- name, nameLength);
-}
-
-
-INT32 MIDI_OUT_GetDeviceVendor(INT32 deviceIndex, char *name, UINT32 nameLength) {
- TRACE0("MIDI_OUT_GetDeviceVendor()\n");
- return getMidiDeviceVendor(deviceIndex, name, nameLength);
-}
-
-
-INT32 MIDI_OUT_GetDeviceDescription(INT32 deviceIndex, char *name, UINT32 nameLength) {
- TRACE0("MIDI_OUT_GetDeviceDescription()\n");
- return getMidiDeviceDescription(SND_RAWMIDI_STREAM_OUTPUT, deviceIndex,
- name, nameLength);
-}
-
-
-INT32 MIDI_OUT_GetDeviceVersion(INT32 deviceIndex, char *name, UINT32 nameLength) {
- TRACE0("MIDI_OUT_GetDeviceVersion()\n");
- return getMidiDeviceVersion(deviceIndex, name, nameLength);
-}
-
-
-/* *************************** MidiOutDevice implementation *************** */
-
-INT32 MIDI_OUT_OpenDevice(INT32 deviceIndex, MidiDeviceHandle** handle) {
- TRACE1("MIDI_OUT_OpenDevice(): deviceIndex: %d\n", (int) deviceIndex);
- return openMidiDevice(SND_RAWMIDI_STREAM_OUTPUT, deviceIndex, handle);
-}
-
-
-INT32 MIDI_OUT_CloseDevice(MidiDeviceHandle* handle) {
- TRACE0("MIDI_OUT_CloseDevice()\n");
- return closeMidiDevice(handle);
-}
-
-
-INT64 MIDI_OUT_GetTimeStamp(MidiDeviceHandle* handle) {
- return getMidiTimestamp(handle);
-}
-
-
-INT32 MIDI_OUT_SendShortMessage(MidiDeviceHandle* handle, UINT32 packedMsg,
- UINT32 timestamp) {
- int err;
- int status;
- int data1;
- int data2;
- char buffer[3];
-
- TRACE2("> MIDI_OUT_SendShortMessage() %x, time: %u\n", packedMsg, (unsigned int) timestamp);
- if (!handle) {
- ERROR0("< ERROR: MIDI_OUT_SendShortMessage(): handle is NULL\n");
- return MIDI_INVALID_HANDLE;
- }
- if (!handle->deviceHandle) {
- ERROR0("< ERROR: MIDI_OUT_SendLongMessage(): native handle is NULL\n");
- return MIDI_INVALID_HANDLE;
- }
- status = (packedMsg & 0xFF);
- buffer[0] = (char) status;
- buffer[1] = (char) ((packedMsg >> 8) & 0xFF);
- buffer[2] = (char) ((packedMsg >> 16) & 0xFF);
- TRACE4("status: %d, data1: %d, data2: %d, length: %d\n", (int) buffer[0], (int) buffer[1], (int) buffer[2], getShortMessageLength(status));
- err = snd_rawmidi_write((snd_rawmidi_t*) handle->deviceHandle, buffer, getShortMessageLength(status));
- if (err < 0) {
- ERROR1(" ERROR: MIDI_OUT_SendShortMessage(): snd_rawmidi_write() returned %d\n", err);
- }
-
- TRACE0("< MIDI_OUT_SendShortMessage()\n");
- return err;
-}
-
-
-INT32 MIDI_OUT_SendLongMessage(MidiDeviceHandle* handle, UBYTE* data,
- UINT32 size, UINT32 timestamp) {
- int err;
-
- TRACE2("> MIDI_OUT_SendLongMessage() size %u, time: %u\n", (unsigned int) size, (unsigned int) timestamp);
- if (!handle) {
- ERROR0("< ERROR: MIDI_OUT_SendLongMessage(): handle is NULL\n");
- return MIDI_INVALID_HANDLE;
- }
- if (!handle->deviceHandle) {
- ERROR0("< ERROR: MIDI_OUT_SendLongMessage(): native handle is NULL\n");
- return MIDI_INVALID_HANDLE;
- }
- if (!data) {
- ERROR0("< ERROR: MIDI_OUT_SendLongMessage(): data is NULL\n");
- return MIDI_INVALID_HANDLE;
- }
- err = snd_rawmidi_write((snd_rawmidi_t*) handle->deviceHandle,
- data, size);
- if (err < 0) {
- ERROR1(" ERROR: MIDI_OUT_SendLongMessage(): snd_rawmidi_write() returned %d\n", err);
- }
-
- TRACE0("< MIDI_OUT_SendLongMessage()\n");
- return err;
-}
-
-
-#endif /* USE_PLATFORM_MIDI_OUT */
diff -r eb72d194235c -r 514c68575523 src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c
--- a/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c Fri Mar 23 18:01:52 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,481 +0,0 @@
-/*
- * Copyright (c) 2003, 2014, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#define USE_ERROR
-#define USE_TRACE
-
-#include "PLATFORM_API_BsdOS_ALSA_MidiUtils.h"
-#include "PLATFORM_API_BsdOS_ALSA_CommonUtils.h"
-#include
-#include
-
-static INT64 getTimeInMicroseconds() {
- struct timeval tv;
-
- gettimeofday(&tv, NULL);
- return (tv.tv_sec * 1000000UL) + tv.tv_usec;
-}
-
-
-const char* getErrorStr(INT32 err) {
- return snd_strerror((int) err);
-}
-
-
-
-// callback for iteration through devices
-// returns TRUE if iteration should continue
-typedef int (*DeviceIteratorPtr)(UINT32 deviceID,
- snd_rawmidi_info_t* rawmidi_info,
- snd_ctl_card_info_t* cardinfo,
- void *userData);
-
-// for each ALSA device, call iterator. userData is passed to the iterator
-// returns total number of iterations
-static int iterateRawmidiDevices(snd_rawmidi_stream_t direction,
- DeviceIteratorPtr iterator,
- void* userData) {
- int count = 0;
- int subdeviceCount;
- int card, dev, subDev;
- char devname[16];
- int err;
- snd_ctl_t *handle;
- snd_rawmidi_t *rawmidi;
- snd_rawmidi_info_t *rawmidi_info;
- snd_ctl_card_info_t *card_info, *defcardinfo = NULL;
- UINT32 deviceID;
- int doContinue = TRUE;
-
- snd_rawmidi_info_malloc(&rawmidi_info);
- snd_ctl_card_info_malloc(&card_info);
-
- // 1st try "default" device
- if (direction == SND_RAWMIDI_STREAM_INPUT) {
- err = snd_rawmidi_open(&rawmidi, NULL, ALSA_DEFAULT_DEVICE_NAME,
- SND_RAWMIDI_NONBLOCK);
- } else if (direction == SND_RAWMIDI_STREAM_OUTPUT) {
- err = snd_rawmidi_open(NULL, &rawmidi, ALSA_DEFAULT_DEVICE_NAME,
- SND_RAWMIDI_NONBLOCK);
- } else {
- ERROR0("ERROR: iterateRawmidiDevices(): direction is neither"
- " SND_RAWMIDI_STREAM_INPUT nor SND_RAWMIDI_STREAM_OUTPUT\n");
- err = MIDI_INVALID_ARGUMENT;
- }
- if (err < 0) {
- ERROR1("ERROR: snd_rawmidi_open (\"default\"): %s\n",
- snd_strerror(err));
- } else {
- err = snd_rawmidi_info(rawmidi, rawmidi_info);
-
- snd_rawmidi_close(rawmidi);
- if (err < 0) {
- ERROR1("ERROR: snd_rawmidi_info (\"default\"): %s\n",
- snd_strerror(err));
- } else {
- // try to get card info
- card = snd_rawmidi_info_get_card(rawmidi_info);
- if (card >= 0) {
- sprintf(devname, ALSA_HARDWARE_CARD, card);
- if (snd_ctl_open(&handle, devname, SND_CTL_NONBLOCK) >= 0) {
- if (snd_ctl_card_info(handle, card_info) >= 0) {
- defcardinfo = card_info;
- }
- snd_ctl_close(handle);
- }
- }
- // call calback function for the device
- if (iterator != NULL) {
- doContinue = (*iterator)(ALSA_DEFAULT_DEVICE_ID, rawmidi_info,
- defcardinfo, userData);
- }
- count++;
- }
- }
-
- // iterate cards
- card = -1;
- TRACE0("testing for cards...\n");
- if (snd_card_next(&card) >= 0) {
- TRACE1("Found card %d\n", card);
- while (doContinue && (card >= 0)) {
- sprintf(devname, ALSA_HARDWARE_CARD, card);
- TRACE1("Opening control for alsa rawmidi device \"%s\"...\n", devname);
- err = snd_ctl_open(&handle, devname, SND_CTL_NONBLOCK);
- if (err < 0) {
- ERROR2("ERROR: snd_ctl_open, card=%d: %s\n", card, snd_strerror(err));
- } else {
- TRACE0("snd_ctl_open() SUCCESS\n");
- err = snd_ctl_card_info(handle, card_info);
- if (err < 0) {
- ERROR2("ERROR: snd_ctl_card_info, card=%d: %s\n", card, snd_strerror(err));
- } else {
- TRACE0("snd_ctl_card_info() SUCCESS\n");
- dev = -1;
- while (doContinue) {
- if (snd_ctl_rawmidi_next_device(handle, &dev) < 0) {
- ERROR0("snd_ctl_rawmidi_next_device\n");
- }
- TRACE0("snd_ctl_rawmidi_next_device() SUCCESS\n");
- if (dev < 0) {
- break;
- }
- snd_rawmidi_info_set_device(rawmidi_info, dev);
- snd_rawmidi_info_set_subdevice(rawmidi_info, 0);
- snd_rawmidi_info_set_stream(rawmidi_info, direction);
- err = snd_ctl_rawmidi_info(handle, rawmidi_info);
- TRACE0("after snd_ctl_rawmidi_info()\n");
- if (err < 0) {
- if (err != -ENOENT) {
- ERROR2("ERROR: snd_ctl_rawmidi_info, card=%d: %s", card, snd_strerror(err));
- }
- } else {
- TRACE0("snd_ctl_rawmidi_info() SUCCESS\n");
- subdeviceCount = needEnumerateSubdevices(ALSA_RAWMIDI)
- ? snd_rawmidi_info_get_subdevices_count(rawmidi_info)
- : 1;
- if (iterator!=NULL) {
- for (subDev = 0; subDev < subdeviceCount; subDev++) {
- TRACE3(" Iterating %d,%d,%d\n", card, dev, subDev);
- deviceID = encodeDeviceID(card, dev, subDev);
- doContinue = (*iterator)(deviceID, rawmidi_info,
- card_info, userData);
- count++;
- TRACE0("returned from iterator\n");
- if (!doContinue) {
- break;
- }
- }
- } else {
- count += subdeviceCount;
- }
- }
- } // of while(doContinue)
- }
- snd_ctl_close(handle);
- }
- if (snd_card_next(&card) < 0) {
- break;
- }
- }
- } else {
- ERROR0("No cards found!\n");
- }
- snd_ctl_card_info_free(card_info);
- snd_rawmidi_info_free(rawmidi_info);
- return count;
-}
-
-
-
-int getMidiDeviceCount(snd_rawmidi_stream_t direction) {
- int deviceCount;
- TRACE0("> getMidiDeviceCount()\n");
- initAlsaSupport();
- deviceCount = iterateRawmidiDevices(direction, NULL, NULL);
- TRACE0("< getMidiDeviceCount()\n");
- return deviceCount;
-}
-
-
-
-/*
- userData is assumed to be a pointer to ALSA_MIDIDeviceDescription.
- ALSA_MIDIDeviceDescription->index has to be set to the index of the device
- we want to get information of before this method is called the first time via
- iterateRawmidiDevices(). On each call of this method,
- ALSA_MIDIDeviceDescription->index is decremented. If it is equal to zero,
- we have reached the desired device, so action is taken.
- So after successful completion of iterateRawmidiDevices(),
- ALSA_MIDIDeviceDescription->index is zero. If it isn't, this is an
- indication of an error.
-*/
-static int deviceInfoIterator(UINT32 deviceID, snd_rawmidi_info_t *rawmidi_info,
- snd_ctl_card_info_t *cardinfo, void *userData) {
- char buffer[300];
- ALSA_MIDIDeviceDescription* desc = (ALSA_MIDIDeviceDescription*)userData;
-#ifdef ALSA_MIDI_USE_PLUGHW
- int usePlugHw = 1;
-#else
- int usePlugHw = 0;
-#endif
-
- TRACE0("deviceInfoIterator\n");
- initAlsaSupport();
- if (desc->index == 0) {
- // we found the device with correct index
- desc->deviceID = deviceID;
-
- buffer[0]=' '; buffer[1]='[';
- // buffer[300] is enough to store the actual device string w/o overrun
- getDeviceStringFromDeviceID(&buffer[2], deviceID, usePlugHw, ALSA_RAWMIDI);
- strncat(buffer, "]", sizeof(buffer) - strlen(buffer) - 1);
- strncpy(desc->name,
- (cardinfo != NULL)
- ? snd_ctl_card_info_get_id(cardinfo)
- : snd_rawmidi_info_get_id(rawmidi_info),
- desc->strLen - strlen(buffer));
- strncat(desc->name, buffer, desc->strLen - strlen(desc->name));
- desc->description[0] = 0;
- if (cardinfo != NULL) {
- strncpy(desc->description, snd_ctl_card_info_get_name(cardinfo),
- desc->strLen);
- strncat(desc->description, ", ",
- desc->strLen - strlen(desc->description));
- }
- strncat(desc->description, snd_rawmidi_info_get_id(rawmidi_info),
- desc->strLen - strlen(desc->description));
- strncat(desc->description, ", ", desc->strLen - strlen(desc->description));
- strncat(desc->description, snd_rawmidi_info_get_name(rawmidi_info),
- desc->strLen - strlen(desc->description));
- TRACE2("Returning %s, %s\n", desc->name, desc->description);
- return FALSE; // do not continue iteration
- }
- desc->index--;
- return TRUE;
-}
-
-
-static int getMIDIDeviceDescriptionByIndex(snd_rawmidi_stream_t direction,
- ALSA_MIDIDeviceDescription* desc) {
- initAlsaSupport();
- TRACE1(" getMIDIDeviceDescriptionByIndex (index = %d)\n", desc->index);
- iterateRawmidiDevices(direction, &deviceInfoIterator, desc);
- return (desc->index == 0) ? MIDI_SUCCESS : MIDI_INVALID_DEVICEID;
-}
-
-
-
-int initMIDIDeviceDescription(ALSA_MIDIDeviceDescription* desc, int index) {
- int ret = MIDI_SUCCESS;
- desc->index = index;
- desc->strLen = 200;
- desc->name = (char*) calloc(desc->strLen + 1, 1);
- desc->description = (char*) calloc(desc->strLen + 1, 1);
- if (! desc->name ||
- ! desc->description) {
- ret = MIDI_OUT_OF_MEMORY;
- }
- return ret;
-}
-
-
-void freeMIDIDeviceDescription(ALSA_MIDIDeviceDescription* desc) {
- if (desc->name) {
- free(desc->name);
- }
- if (desc->description) {
- free(desc->description);
- }
-}
-
-
-int getMidiDeviceName(snd_rawmidi_stream_t direction, int index, char *name,
- UINT32 nameLength) {
- ALSA_MIDIDeviceDescription desc;
- int ret;
-
- TRACE1("getMidiDeviceName: nameLength: %d\n", (int) nameLength);
- ret = initMIDIDeviceDescription(&desc, index);
- if (ret == MIDI_SUCCESS) {
- TRACE0("getMidiDeviceName: initMIDIDeviceDescription() SUCCESS\n");
- ret = getMIDIDeviceDescriptionByIndex(direction, &desc);
- if (ret == MIDI_SUCCESS) {
- TRACE1("getMidiDeviceName: desc.name: %s\n", desc.name);
- strncpy(name, desc.name, nameLength - 1);
- name[nameLength - 1] = 0;
- }
- }
- freeMIDIDeviceDescription(&desc);
- return ret;
-}
-
-
-int getMidiDeviceVendor(int index, char *name, UINT32 nameLength) {
- strncpy(name, ALSA_VENDOR, nameLength - 1);
- name[nameLength - 1] = 0;
- return MIDI_SUCCESS;
-}
-
-
-int getMidiDeviceDescription(snd_rawmidi_stream_t direction,
- int index, char *name, UINT32 nameLength) {
- ALSA_MIDIDeviceDescription desc;
- int ret;
-
- ret = initMIDIDeviceDescription(&desc, index);
- if (ret == MIDI_SUCCESS) {
- ret = getMIDIDeviceDescriptionByIndex(direction, &desc);
- if (ret == MIDI_SUCCESS) {
- strncpy(name, desc.description, nameLength - 1);
- name[nameLength - 1] = 0;
- }
- }
- freeMIDIDeviceDescription(&desc);
- return ret;
-}
-
-
-int getMidiDeviceVersion(int index, char *name, UINT32 nameLength) {
- getALSAVersion(name, nameLength);
- return MIDI_SUCCESS;
-}
-
-
-static int getMidiDeviceID(snd_rawmidi_stream_t direction, int index,
- UINT32* deviceID) {
- ALSA_MIDIDeviceDescription desc;
- int ret;
-
- ret = initMIDIDeviceDescription(&desc, index);
- if (ret == MIDI_SUCCESS) {
- ret = getMIDIDeviceDescriptionByIndex(direction, &desc);
- if (ret == MIDI_SUCCESS) {
- // TRACE1("getMidiDeviceName: desc.name: %s\n", desc.name);
- *deviceID = desc.deviceID;
- }
- }
- freeMIDIDeviceDescription(&desc);
- return ret;
-}
-
-
-/*
- direction has to be either SND_RAWMIDI_STREAM_INPUT or
- SND_RAWMIDI_STREAM_OUTPUT.
- Returns 0 on success. Otherwise, MIDI_OUT_OF_MEMORY, MIDI_INVALID_ARGUMENT
- or a negative ALSA error code is returned.
-*/
-INT32 openMidiDevice(snd_rawmidi_stream_t direction, INT32 deviceIndex,
- MidiDeviceHandle** handle) {
- snd_rawmidi_t* native_handle;
- snd_midi_event_t* event_parser = NULL;
- int err;
- UINT32 deviceID = 0;
- char devicename[100];
-#ifdef ALSA_MIDI_USE_PLUGHW
- int usePlugHw = 1;
-#else
- int usePlugHw = 0;
-#endif
-
- TRACE0("> openMidiDevice()\n");
-
- (*handle) = (MidiDeviceHandle*) calloc(sizeof(MidiDeviceHandle), 1);
- if (!(*handle)) {
- ERROR0("ERROR: openDevice: out of memory\n");
- return MIDI_OUT_OF_MEMORY;
- }
-
- // TODO: iterate to get dev ID from index
- err = getMidiDeviceID(direction, deviceIndex, &deviceID);
- TRACE1(" openMidiDevice(): deviceID: %d\n", (int) deviceID);
- getDeviceStringFromDeviceID(devicename, deviceID,
- usePlugHw, ALSA_RAWMIDI);
- TRACE1(" openMidiDevice(): deviceString: %s\n", devicename);
-
- // finally open the device
- if (direction == SND_RAWMIDI_STREAM_INPUT) {
- err = snd_rawmidi_open(&native_handle, NULL, devicename,
- SND_RAWMIDI_NONBLOCK);
- } else if (direction == SND_RAWMIDI_STREAM_OUTPUT) {
- err = snd_rawmidi_open(NULL, &native_handle, devicename,
- SND_RAWMIDI_NONBLOCK);
- } else {
- ERROR0(" ERROR: openMidiDevice(): direction is neither SND_RAWMIDI_STREAM_INPUT nor SND_RAWMIDI_STREAM_OUTPUT\n");
- err = MIDI_INVALID_ARGUMENT;
- }
- if (err < 0) {
- ERROR1("< ERROR: openMidiDevice(): snd_rawmidi_open() returned %d\n", err);
- free(*handle);
- (*handle) = NULL;
- return err;
- }
- /* We opened with non-blocking behaviour to not get hung if the device
- is used by a different process. Writing, however, should
- be blocking. So we change it here. */
- if (direction == SND_RAWMIDI_STREAM_OUTPUT) {
- err = snd_rawmidi_nonblock(native_handle, 0);
- if (err < 0) {
- ERROR1(" ERROR: openMidiDevice(): snd_rawmidi_nonblock() returned %d\n", err);
- snd_rawmidi_close(native_handle);
- free(*handle);
- (*handle) = NULL;
- return err;
- }
- }
- if (direction == SND_RAWMIDI_STREAM_INPUT) {
- err = snd_midi_event_new(EVENT_PARSER_BUFSIZE, &event_parser);
- if (err < 0) {
- ERROR1(" ERROR: openMidiDevice(): snd_midi_event_new() returned %d\n", err);
- snd_rawmidi_close(native_handle);
- free(*handle);
- (*handle) = NULL;
- return err;
- }
- }
-
- (*handle)->deviceHandle = (void*) native_handle;
- (*handle)->startTime = getTimeInMicroseconds();
- (*handle)->platformData = event_parser;
- TRACE0("< openMidiDevice(): succeeded\n");
- return err;
-}
-
-
-
-INT32 closeMidiDevice(MidiDeviceHandle* handle) {
- int err;
-
- TRACE0("> closeMidiDevice()\n");
- if (!handle) {
- ERROR0("< ERROR: closeMidiDevice(): handle is NULL\n");
- return MIDI_INVALID_HANDLE;
- }
- if (!handle->deviceHandle) {
- ERROR0("< ERROR: closeMidiDevice(): native handle is NULL\n");
- return MIDI_INVALID_HANDLE;
- }
- err = snd_rawmidi_close((snd_rawmidi_t*) handle->deviceHandle);
- TRACE1(" snd_rawmidi_close() returns %d\n", err);
- if (handle->platformData) {
- snd_midi_event_free((snd_midi_event_t*) handle->platformData);
- }
- free(handle);
- TRACE0("< closeMidiDevice: succeeded\n");
- return err;
-}
-
-
-INT64 getMidiTimestamp(MidiDeviceHandle* handle) {
- if (!handle) {
- ERROR0("< ERROR: closeMidiDevice(): handle is NULL\n");
- return MIDI_INVALID_HANDLE;
- }
- return getTimeInMicroseconds() - handle->startTime;
-}
-
-
-/* end */
diff -r eb72d194235c -r 514c68575523 src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h
--- a/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h Fri Mar 23 18:01:52 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2003, 2012, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#include
-#include "Utilities.h"
-#include "PlatformMidi.h"
-
-
-#ifndef PLATFORM_API_BSDOS_ALSA_MIDIUTILS_H_INCLUDED
-#define PLATFORM_API_BSDOS_ALSA_MIDIUTILS_H_INCLUDED
-
-#define EVENT_PARSER_BUFSIZE (2048)
-
-// if this is defined, use plughw: devices
-//#define ALSA_MIDI_USE_PLUGHW
-#undef ALSA_MIDI_USE_PLUGHW
-
-typedef struct tag_ALSA_MIDIDeviceDescription {
- int index; // in
- int strLen; // in
- INT32 deviceID; // out
- char* name; // out
- char* description; // out
-} ALSA_MIDIDeviceDescription;
-
-
-const char* getErrorStr(INT32 err);
-
-/* Returns the number of devices. */
-/* direction is either SND_RAWMIDI_STREAM_OUTPUT or
- SND_RAWMIDI_STREAM_INPUT. */
-int getMidiDeviceCount(snd_rawmidi_stream_t direction);
-
-/* Returns MIDI_SUCCESS or MIDI_INVALID_DEVICEID */
-/* direction is either SND_RAWMIDI_STREAM_OUTPUT or
- SND_RAWMIDI_STREAM_INPUT. */
-int getMidiDeviceName(snd_rawmidi_stream_t direction, int index,
- char *name, UINT32 nameLength);
-
-/* Returns MIDI_SUCCESS or MIDI_INVALID_DEVICEID */
-int getMidiDeviceVendor(int index, char *name, UINT32 nameLength);
-
-/* Returns MIDI_SUCCESS or MIDI_INVALID_DEVICEID */
-/* direction is either SND_RAWMIDI_STREAM_OUTPUT or
- SND_RAWMIDI_STREAM_INPUT. */
-int getMidiDeviceDescription(snd_rawmidi_stream_t direction, int index,
- char *name, UINT32 nameLength);
-
-/* Returns MIDI_SUCCESS or MIDI_INVALID_DEVICEID */
-int getMidiDeviceVersion(int index, char *name, UINT32 nameLength);
-
-// returns 0 on success, otherwise MIDI_OUT_OF_MEMORY or ALSA error code
-/* direction is either SND_RAWMIDI_STREAM_OUTPUT or
- SND_RAWMIDI_STREAM_INPUT. */
-INT32 openMidiDevice(snd_rawmidi_stream_t direction, INT32 deviceIndex,
- MidiDeviceHandle** handle);
-
-// returns 0 on success, otherwise a (negative) ALSA error code
-INT32 closeMidiDevice(MidiDeviceHandle* handle);
-
-INT64 getMidiTimestamp(MidiDeviceHandle* handle);
-
-#endif // PLATFORM_API_BSDOS_ALSA_MIDIUTILS_H_INCLUDED
diff -r eb72d194235c -r 514c68575523 src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCM.c
--- a/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCM.c Fri Mar 23 18:01:52 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,941 +0,0 @@
-/*
- * Copyright (c) 2002, 2012, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#define USE_ERROR
-#define USE_TRACE
-
-#include "PLATFORM_API_BsdOS_ALSA_PCMUtils.h"
-#include "PLATFORM_API_BsdOS_ALSA_CommonUtils.h"
-#include "DirectAudio.h"
-
-#if USE_DAUDIO == TRUE
-
-// GetPosition method 1: based on how many bytes are passed to the kernel driver
-// + does not need much processor resources
-// - not very exact, "jumps"
-// GetPosition method 2: ask kernel about actual position of playback.
-// - very exact
-// - switch to kernel layer for each call
-// GetPosition method 3: use snd_pcm_avail() call - not yet in official ALSA
-// quick tests on a Pentium 200MMX showed max. 1.5% processor usage
-// for playing back a CD-quality file and printing 20x per second a line
-// on the console with the current time. So I guess performance is not such a
-// factor here.
-//#define GET_POSITION_METHOD1
-#define GET_POSITION_METHOD2
-
-
-// The default time for a period in microseconds.
-// For very small buffers, only 2 periods are used.
-#define DEFAULT_PERIOD_TIME 20000 /* 20ms */
-
-///// implemented functions of DirectAudio.h
-
-INT32 DAUDIO_GetDirectAudioDeviceCount() {
- return (INT32) getAudioDeviceCount();
-}
-
-
-INT32 DAUDIO_GetDirectAudioDeviceDescription(INT32 mixerIndex, DirectAudioDeviceDescription* description) {
- ALSA_AudioDeviceDescription adesc;
-
- adesc.index = (int) mixerIndex;
- adesc.strLen = DAUDIO_STRING_LENGTH;
-
- adesc.maxSimultaneousLines = (int*) (&(description->maxSimulLines));
- adesc.deviceID = &(description->deviceID);
- adesc.name = description->name;
- adesc.vendor = description->vendor;
- adesc.description = description->description;
- adesc.version = description->version;
-
- return getAudioDeviceDescriptionByIndex(&adesc);
-}
-
-#define MAX_BIT_INDEX 6
-// returns
-// 6: for anything above 24-bit
-// 5: for 4 bytes sample size, 24-bit
-// 4: for 3 bytes sample size, 24-bit
-// 3: for 3 bytes sample size, 20-bit
-// 2: for 2 bytes sample size, 16-bit
-// 1: for 1 byte sample size, 8-bit
-// 0: for anything else
-int getBitIndex(int sampleSizeInBytes, int significantBits) {
- if (significantBits > 24) return 6;
- if (sampleSizeInBytes == 4 && significantBits == 24) return 5;
- if (sampleSizeInBytes == 3) {
- if (significantBits == 24) return 4;
- if (significantBits == 20) return 3;
- }
- if (sampleSizeInBytes == 2 && significantBits == 16) return 2;
- if (sampleSizeInBytes == 1 && significantBits == 8) return 1;
- return 0;
-}
-
-int getSampleSizeInBytes(int bitIndex, int sampleSizeInBytes) {
- switch(bitIndex) {
- case 1: return 1;
- case 2: return 2;
- case 3: /* fall through */
- case 4: return 3;
- case 5: return 4;
- }
- return sampleSizeInBytes;
-}
-
-int getSignificantBits(int bitIndex, int significantBits) {
- switch(bitIndex) {
- case 1: return 8;
- case 2: return 16;
- case 3: return 20;
- case 4: /* fall through */
- case 5: return 24;
- }
- return significantBits;
-}
-
-void DAUDIO_GetFormats(INT32 mixerIndex, INT32 deviceID, int isSource, void* creator) {
- snd_pcm_t* handle;
- snd_pcm_format_mask_t* formatMask;
- snd_pcm_format_t format;
- snd_pcm_hw_params_t* hwParams;
- int handledBits[MAX_BIT_INDEX+1];
-
- int ret;
- int sampleSizeInBytes, significantBits, isSigned, isBigEndian, enc;
- int origSampleSizeInBytes, origSignificantBits;
- unsigned int channels, minChannels, maxChannels;
- int rate, bitIndex;
-
- for (bitIndex = 0; bitIndex <= MAX_BIT_INDEX; bitIndex++) handledBits[bitIndex] = FALSE;
- if (openPCMfromDeviceID(deviceID, &handle, isSource, TRUE /*query hardware*/) < 0) {
- return;
- }
- ret = snd_pcm_format_mask_malloc(&formatMask);
- if (ret != 0) {
- ERROR1("snd_pcm_format_mask_malloc returned error %d\n", ret);
- } else {
- ret = snd_pcm_hw_params_malloc(&hwParams);
- if (ret != 0) {
- ERROR1("snd_pcm_hw_params_malloc returned error %d\n", ret);
- } else {
- ret = snd_pcm_hw_params_any(handle, hwParams);
- /* snd_pcm_hw_params_any can return a positive value on success too */
- if (ret < 0) {
- ERROR1("snd_pcm_hw_params_any returned error %d\n", ret);
- } else {
- /* for the logic following this code, set ret to 0 to indicate success */
- ret = 0;
- }
- }
- snd_pcm_hw_params_get_format_mask(hwParams, formatMask);
- if (ret == 0) {
- ret = snd_pcm_hw_params_get_channels_min(hwParams, &minChannels);
- if (ret != 0) {
- ERROR1("snd_pcm_hw_params_get_channels_min returned error %d\n", ret);
- }
- }
- if (ret == 0) {
- ret = snd_pcm_hw_params_get_channels_max(hwParams, &maxChannels);
- if (ret != 0) {
- ERROR1("snd_pcm_hw_params_get_channels_max returned error %d\n", ret);
- }
- }
-
- // since we queried the hw: device, for many soundcards, it will only
- // report the maximum number of channels (which is the only way to talk
- // to the hw: device). Since we will, however, open the plughw: device
- // when opening the Source/TargetDataLine, we can safely assume that
- // also the channels 1..maxChannels are available.
-#ifdef ALSA_PCM_USE_PLUGHW
- minChannels = 1;
-#endif
- if (ret == 0) {
- // plughw: supports any sample rate
- rate = -1;
- for (format = 0; format <= SND_PCM_FORMAT_LAST; format++) {
- if (snd_pcm_format_mask_test(formatMask, format)) {
- // format exists
- if (getFormatFromAlsaFormat(format, &origSampleSizeInBytes,
- &origSignificantBits,
- &isSigned, &isBigEndian, &enc)) {
- // now if we use plughw:, we can use any bit size below the
- // natively supported ones. Some ALSA drivers only support the maximum
- // bit size, so we add any sample rates below the reported one.
- // E.g. this iteration reports support for 16-bit.
- // getBitIndex will return 2, so it will add entries for
- // 16-bit (bitIndex=2) and in the next do-while loop iteration,
- // it will decrease bitIndex and will therefore add 8-bit support.
- bitIndex = getBitIndex(origSampleSizeInBytes, origSignificantBits);
- do {
- if (bitIndex == 0
- || bitIndex == MAX_BIT_INDEX
- || !handledBits[bitIndex]) {
- handledBits[bitIndex] = TRUE;
- sampleSizeInBytes = getSampleSizeInBytes(bitIndex, origSampleSizeInBytes);
- significantBits = getSignificantBits(bitIndex, origSignificantBits);
- if (maxChannels - minChannels > MAXIMUM_LISTED_CHANNELS) {
- // avoid too many channels explicitly listed
- // just add -1, min, and max
- DAUDIO_AddAudioFormat(creator, significantBits,
- -1, -1, rate,
- enc, isSigned, isBigEndian);
- DAUDIO_AddAudioFormat(creator, significantBits,
- sampleSizeInBytes * minChannels,
- minChannels, rate,
- enc, isSigned, isBigEndian);
- DAUDIO_AddAudioFormat(creator, significantBits,
- sampleSizeInBytes * maxChannels,
- maxChannels, rate,
- enc, isSigned, isBigEndian);
- } else {
- for (channels = minChannels; channels <= maxChannels; channels++) {
- DAUDIO_AddAudioFormat(creator, significantBits,
- sampleSizeInBytes * channels,
- channels, rate,
- enc, isSigned, isBigEndian);
- }
- }
- }
-#ifndef ALSA_PCM_USE_PLUGHW
- // without plugin, do not add fake formats
- break;
-#endif
- } while (--bitIndex > 0);
- } else {
- TRACE1("could not get format from alsa for format %d\n", format);
- }
- } else {
- //TRACE1("Format %d not supported\n", format);
- }
- } // for loop
- snd_pcm_hw_params_free(hwParams);
- }
- snd_pcm_format_mask_free(formatMask);
- }
- snd_pcm_close(handle);
-}
-
-/** Workaround for cr 7033899, 7030629:
- * dmix plugin doesn't like flush (snd_pcm_drop) when the buffer is empty
- * (just opened, underruned or already flushed).
- * Sometimes it causes PCM falls to -EBADFD error,
- * sometimes causes bufferSize change.
- * To prevent unnecessary flushes AlsaPcmInfo::isRunning & isFlushed are used.
- */
-/* ******* ALSA PCM INFO ******************** */
-typedef struct tag_AlsaPcmInfo {
- snd_pcm_t* handle;
- snd_pcm_hw_params_t* hwParams;
- snd_pcm_sw_params_t* swParams;
- int bufferSizeInBytes;
- int frameSize; // storage size in Bytes
- unsigned int periods;
- snd_pcm_uframes_t periodSize;
- short int isRunning; // see comment above
- short int isFlushed; // see comment above
-#ifdef GET_POSITION_METHOD2
- // to be used exclusively by getBytePosition!
- snd_pcm_status_t* positionStatus;
-#endif
-} AlsaPcmInfo;
-
-
-int setStartThresholdNoCommit(AlsaPcmInfo* info, int useThreshold) {
- int ret;
- int threshold;
-
- if (useThreshold) {
- // start device whenever anything is written to the buffer
- threshold = 1;
- } else {
- // never start the device automatically
- threshold = 2000000000; /* near UINT_MAX */
- }
- ret = snd_pcm_sw_params_set_start_threshold(info->handle, info->swParams, threshold);
- if (ret < 0) {
- ERROR1("Unable to set start threshold mode: %s\n", snd_strerror(ret));
- return FALSE;
- }
- return TRUE;
-}
-
-int setStartThreshold(AlsaPcmInfo* info, int useThreshold) {
- int ret = 0;
-
- if (!setStartThresholdNoCommit(info, useThreshold)) {
- ret = -1;
- }
- if (ret == 0) {
- // commit it
- ret = snd_pcm_sw_params(info->handle, info->swParams);
- if (ret < 0) {
- ERROR1("Unable to set sw params: %s\n", snd_strerror(ret));
- }
- }
- return (ret == 0)?TRUE:FALSE;
-}
-
-
-// returns TRUE if successful
-int setHWParams(AlsaPcmInfo* info,
- float sampleRate,
- int channels,
- int bufferSizeInFrames,
- snd_pcm_format_t format) {
- unsigned int rrate, periodTime, periods;
- int ret, dir;
- snd_pcm_uframes_t alsaBufferSizeInFrames = (snd_pcm_uframes_t) bufferSizeInFrames;
-
- /* choose all parameters */
- ret = snd_pcm_hw_params_any(info->handle, info->hwParams);
- if (ret < 0) {
- ERROR1("Broken configuration: no configurations available: %s\n", snd_strerror(ret));
- return FALSE;
- }
- /* set the interleaved read/write format */
- ret = snd_pcm_hw_params_set_access(info->handle, info->hwParams, SND_PCM_ACCESS_RW_INTERLEAVED);
- if (ret < 0) {
- ERROR1("SND_PCM_ACCESS_RW_INTERLEAVED access type not available: %s\n", snd_strerror(ret));
- return FALSE;
- }
- /* set the sample format */
- ret = snd_pcm_hw_params_set_format(info->handle, info->hwParams, format);
- if (ret < 0) {
- ERROR1("Sample format not available: %s\n", snd_strerror(ret));
- return FALSE;
- }
- /* set the count of channels */
- ret = snd_pcm_hw_params_set_channels(info->handle, info->hwParams, channels);
- if (ret < 0) {
- ERROR2("Channels count (%d) not available: %s\n", channels, snd_strerror(ret));
- return FALSE;
- }
- /* set the stream rate */
- rrate = (int) (sampleRate + 0.5f);
- dir = 0;
- ret = snd_pcm_hw_params_set_rate_near(info->handle, info->hwParams, &rrate, &dir);
- if (ret < 0) {
- ERROR2("Rate %dHz not available for playback: %s\n", (int) (sampleRate+0.5f), snd_strerror(ret));
- return FALSE;
- }
- if ((rrate-sampleRate > 2) || (rrate-sampleRate < - 2)) {
- ERROR2("Rate doesn't match (requested %2.2fHz, got %dHz)\n", sampleRate, rrate);
- return FALSE;
- }
- /* set the buffer time */
- ret = snd_pcm_hw_params_set_buffer_size_near(info->handle, info->hwParams, &alsaBufferSizeInFrames);
- if (ret < 0) {
- ERROR2("Unable to set buffer size to %d frames: %s\n",
- (int) alsaBufferSizeInFrames, snd_strerror(ret));
- return FALSE;
- }
- bufferSizeInFrames = (int) alsaBufferSizeInFrames;
- /* set the period time */
- if (bufferSizeInFrames > 1024) {
- dir = 0;
- periodTime = DEFAULT_PERIOD_TIME;
- ret = snd_pcm_hw_params_set_period_time_near(info->handle, info->hwParams, &periodTime, &dir);
- if (ret < 0) {
- ERROR2("Unable to set period time to %d: %s\n", DEFAULT_PERIOD_TIME, snd_strerror(ret));
- return FALSE;
- }
- } else {
- /* set the period count for very small buffer sizes to 2 */
- dir = 0;
- periods = 2;
- ret = snd_pcm_hw_params_set_periods_near(info->handle, info->hwParams, &periods, &dir);
- if (ret < 0) {
- ERROR2("Unable to set period count to %d: %s\n", /*periods*/ 2, snd_strerror(ret));
- return FALSE;
- }
- }
- /* write the parameters to device */
- ret = snd_pcm_hw_params(info->handle, info->hwParams);
- if (ret < 0) {
- ERROR1("Unable to set hw params: %s\n", snd_strerror(ret));
- return FALSE;
- }
- return TRUE;
-}
-
-// returns 1 if successful
-int setSWParams(AlsaPcmInfo* info) {
- int ret;
-
- /* get the current swparams */
- ret = snd_pcm_sw_params_current(info->handle, info->swParams);
- if (ret < 0) {
- ERROR1("Unable to determine current swparams: %s\n", snd_strerror(ret));
- return FALSE;
- }
- /* never start the transfer automatically */
- if (!setStartThresholdNoCommit(info, FALSE /* don't use threshold */)) {
- return FALSE;
- }
-
- /* allow the transfer when at least period_size samples can be processed */
- ret = snd_pcm_sw_params_set_avail_min(info->handle, info->swParams, info->periodSize);
- if (ret < 0) {
- ERROR1("Unable to set avail min for playback: %s\n", snd_strerror(ret));
- return FALSE;
- }
- /* write the parameters to the playback device */
- ret = snd_pcm_sw_params(info->handle, info->swParams);
- if (ret < 0) {
- ERROR1("Unable to set sw params: %s\n", snd_strerror(ret));
- return FALSE;
- }
- return TRUE;
-}
-
-static snd_output_t* ALSA_OUTPUT = NULL;
-
-void* DAUDIO_Open(INT32 mixerIndex, INT32 deviceID, int isSource,
- int encoding, float sampleRate, int sampleSizeInBits,
- int frameSize, int channels,
- int isSigned, int isBigEndian, int bufferSizeInBytes) {
- snd_pcm_format_mask_t* formatMask;
- snd_pcm_format_t format;
- int dir;
- int ret = 0;
- AlsaPcmInfo* info = NULL;
- /* snd_pcm_uframes_t is 64 bit on 64-bit systems */
- snd_pcm_uframes_t alsaBufferSizeInFrames = 0;
-
-
- TRACE0("> DAUDIO_Open\n");
-#ifdef USE_TRACE
- // for using ALSA debug dump methods
- if (ALSA_OUTPUT == NULL) {
- snd_output_stdio_attach(&ALSA_OUTPUT, stdout, 0);
- }
-#endif
- if (channels <= 0) {
- ERROR1("ERROR: Invalid number of channels=%d!\n", channels);
- return NULL;
- }
- info = (AlsaPcmInfo*) malloc(sizeof(AlsaPcmInfo));
- if (!info) {
- ERROR0("Out of memory\n");
- return NULL;
- }
- memset(info, 0, sizeof(AlsaPcmInfo));
- // initial values are: stopped, flushed
- info->isRunning = 0;
- info->isFlushed = 1;
-
- ret = openPCMfromDeviceID(deviceID, &(info->handle), isSource, FALSE /* do open device*/);
- if (ret == 0) {
- // set to blocking mode
- snd_pcm_nonblock(info->handle, 0);
- ret = snd_pcm_hw_params_malloc(&(info->hwParams));
- if (ret != 0) {
- ERROR1(" snd_pcm_hw_params_malloc returned error %d\n", ret);
- } else {
- ret = -1;
- if (getAlsaFormatFromFormat(&format, frameSize / channels, sampleSizeInBits,
- isSigned, isBigEndian, encoding)) {
- if (setHWParams(info,
- sampleRate,
- channels,
- bufferSizeInBytes / frameSize,
- format)) {
- info->frameSize = frameSize;
- ret = snd_pcm_hw_params_get_period_size(info->hwParams, &info->periodSize, &dir);
- if (ret < 0) {
- ERROR1("ERROR: snd_pcm_hw_params_get_period: %s\n", snd_strerror(ret));
- }
- snd_pcm_hw_params_get_periods(info->hwParams, &(info->periods), &dir);
- snd_pcm_hw_params_get_buffer_size(info->hwParams, &alsaBufferSizeInFrames);
- info->bufferSizeInBytes = (int) alsaBufferSizeInFrames * frameSize;
- TRACE3(" DAUDIO_Open: period size = %d frames, periods = %d. Buffer size: %d bytes.\n",
- (int) info->periodSize, info->periods, info->bufferSizeInBytes);
- }
- }
- }
- if (ret == 0) {
- // set software parameters
- ret = snd_pcm_sw_params_malloc(&(info->swParams));
- if (ret != 0) {
- ERROR1("snd_pcm_hw_params_malloc returned error %d\n", ret);
- } else {
- if (!setSWParams(info)) {
- ret = -1;
- }
- }
- }
- if (ret == 0) {
- // prepare device
- ret = snd_pcm_prepare(info->handle);
- if (ret < 0) {
- ERROR1("ERROR: snd_pcm_prepare: %s\n", snd_strerror(ret));
- }
- }
-
-#ifdef GET_POSITION_METHOD2
- if (ret == 0) {
- ret = snd_pcm_status_malloc(&(info->positionStatus));
- if (ret != 0) {
- ERROR1("ERROR in snd_pcm_status_malloc: %s\n", snd_strerror(ret));
- }
- }
-#endif
- }
- if (ret != 0) {
- DAUDIO_Close((void*) info, isSource);
- info = NULL;
- } else {
- // set to non-blocking mode
- snd_pcm_nonblock(info->handle, 1);
- TRACE1("< DAUDIO_Open: Opened device successfully. Handle=%p\n",
- (void*) info->handle);
- }
- return (void*) info;
-}
-
-#ifdef USE_TRACE
-void printState(snd_pcm_state_t state) {
- if (state == SND_PCM_STATE_OPEN) {
- TRACE0("State: SND_PCM_STATE_OPEN\n");
- }
- else if (state == SND_PCM_STATE_SETUP) {
- TRACE0("State: SND_PCM_STATE_SETUP\n");
- }
- else if (state == SND_PCM_STATE_PREPARED) {
- TRACE0("State: SND_PCM_STATE_PREPARED\n");
- }
- else if (state == SND_PCM_STATE_RUNNING) {
- TRACE0("State: SND_PCM_STATE_RUNNING\n");
- }
- else if (state == SND_PCM_STATE_XRUN) {
- TRACE0("State: SND_PCM_STATE_XRUN\n");
- }
- else if (state == SND_PCM_STATE_DRAINING) {
- TRACE0("State: SND_PCM_STATE_DRAINING\n");
- }
- else if (state == SND_PCM_STATE_PAUSED) {
- TRACE0("State: SND_PCM_STATE_PAUSED\n");
- }
- else if (state == SND_PCM_STATE_SUSPENDED) {
- TRACE0("State: SND_PCM_STATE_SUSPENDED\n");
- }
-}
-#endif
-
-int DAUDIO_Start(void* id, int isSource) {
- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
- int ret;
- snd_pcm_state_t state;
-
- TRACE0("> DAUDIO_Start\n");
- // set to blocking mode
- snd_pcm_nonblock(info->handle, 0);
- // set start mode so that it always starts as soon as data is there
- setStartThreshold(info, TRUE /* use threshold */);
- state = snd_pcm_state(info->handle);
- if (state == SND_PCM_STATE_PAUSED) {
- // in case it was stopped previously
- TRACE0(" Un-pausing...\n");
- ret = snd_pcm_pause(info->handle, FALSE);
- if (ret != 0) {
- ERROR2(" NOTE: error in snd_pcm_pause:%d: %s\n", ret, snd_strerror(ret));
- }
- }
- if (state == SND_PCM_STATE_SUSPENDED) {
- TRACE0(" Resuming...\n");
- ret = snd_pcm_resume(info->handle);
- if (ret < 0) {
- if ((ret != -EAGAIN) && (ret != -ENOSYS)) {
- ERROR2(" ERROR: error in snd_pcm_resume:%d: %s\n", ret, snd_strerror(ret));
- }
- }
- }
- if (state == SND_PCM_STATE_SETUP) {
- TRACE0("need to call prepare again...\n");
- // prepare device
- ret = snd_pcm_prepare(info->handle);
- if (ret < 0) {
- ERROR1("ERROR: snd_pcm_prepare: %s\n", snd_strerror(ret));
- }
- }
- // in case there is still data in the buffers
- ret = snd_pcm_start(info->handle);
- if (ret != 0) {
- if (ret != -EPIPE) {
- ERROR2(" NOTE: error in snd_pcm_start: %d: %s\n", ret, snd_strerror(ret));
- }
- }
- // set to non-blocking mode
- ret = snd_pcm_nonblock(info->handle, 1);
- if (ret != 0) {
- ERROR1(" ERROR in snd_pcm_nonblock: %s\n", snd_strerror(ret));
- }
- state = snd_pcm_state(info->handle);
-#ifdef USE_TRACE
- printState(state);
-#endif
- ret = (state == SND_PCM_STATE_PREPARED)
- || (state == SND_PCM_STATE_RUNNING)
- || (state == SND_PCM_STATE_XRUN)
- || (state == SND_PCM_STATE_SUSPENDED);
- if (ret) {
- info->isRunning = 1;
- // source line should keep isFlushed value until Write() is called;
- // for target data line reset it right now.
- if (!isSource) {
- info->isFlushed = 0;
- }
- }
- TRACE1("< DAUDIO_Start %s\n", ret?"success":"error");
- return ret?TRUE:FALSE;
-}
-
-int DAUDIO_Stop(void* id, int isSource) {
- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
- int ret;
-
- TRACE0("> DAUDIO_Stop\n");
- // set to blocking mode
- snd_pcm_nonblock(info->handle, 0);
- setStartThreshold(info, FALSE /* don't use threshold */); // device will not start after buffer xrun
- ret = snd_pcm_pause(info->handle, 1);
- // set to non-blocking mode
- snd_pcm_nonblock(info->handle, 1);
- if (ret != 0) {
- ERROR1("ERROR in snd_pcm_pause: %s\n", snd_strerror(ret));
- return FALSE;
- }
- info->isRunning = 0;
- TRACE0("< DAUDIO_Stop success\n");
- return TRUE;
-}
-
-void DAUDIO_Close(void* id, int isSource) {
- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
-
- TRACE0("DAUDIO_Close\n");
- if (info != NULL) {
- if (info->handle != NULL) {
- snd_pcm_close(info->handle);
- }
- if (info->hwParams) {
- snd_pcm_hw_params_free(info->hwParams);
- }
- if (info->swParams) {
- snd_pcm_sw_params_free(info->swParams);
- }
-#ifdef GET_POSITION_METHOD2
- if (info->positionStatus) {
- snd_pcm_status_free(info->positionStatus);
- }
-#endif
- free(info);
- }
-}
-
-/*
- * Underrun and suspend recovery
- * returns
- * 0: exit native and return 0
- * 1: try again to write/read
- * -1: error - exit native with return value -1
- */
-int xrun_recovery(AlsaPcmInfo* info, int err) {
- int ret;
-
- if (err == -EPIPE) { /* underrun / overflow */
- TRACE0("xrun_recovery: underrun/overflow.\n");
- ret = snd_pcm_prepare(info->handle);
- if (ret < 0) {
- ERROR1("Can't recover from underrun/overflow, prepare failed: %s\n", snd_strerror(ret));
- return -1;
- }
- return 1;
- } else if (err == -ESTRPIPE) {
- TRACE0("xrun_recovery: suspended.\n");
- ret = snd_pcm_resume(info->handle);
- if (ret < 0) {
- if (ret == -EAGAIN) {
- return 0; /* wait until the suspend flag is released */
- }
- return -1;
- }
- ret = snd_pcm_prepare(info->handle);
- if (ret < 0) {
- ERROR1("Can't recover from underrun/overflow, prepare failed: %s\n", snd_strerror(ret));
- return -1;
- }
- return 1;
- } else if (err == -EAGAIN) {
- TRACE0("xrun_recovery: EAGAIN try again flag.\n");
- return 0;
- }
-
- TRACE2("xrun_recovery: unexpected error %d: %s\n", err, snd_strerror(err));
- return -1;
-}
-
-// returns -1 on error
-int DAUDIO_Write(void* id, char* data, int byteSize) {
- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
- int ret, count;
- snd_pcm_sframes_t frameSize, writtenFrames;
-
- TRACE1("> DAUDIO_Write %d bytes\n", byteSize);
-
- /* sanity */
- if (byteSize <= 0 || info->frameSize <= 0) {
- ERROR2(" DAUDIO_Write: byteSize=%d, frameSize=%d!\n",
- (int) byteSize, (int) info->frameSize);
- TRACE0("< DAUDIO_Write returning -1\n");
- return -1;
- }
-
- count = 2; // maximum number of trials to recover from underrun
- //frameSize = snd_pcm_bytes_to_frames(info->handle, byteSize);
- frameSize = (snd_pcm_sframes_t) (byteSize / info->frameSize);
- do {
- writtenFrames = snd_pcm_writei(info->handle, (const void*) data, (snd_pcm_uframes_t) frameSize);
-
- if (writtenFrames < 0) {
- ret = xrun_recovery(info, (int) writtenFrames);
- if (ret <= 0) {
- TRACE1("DAUDIO_Write: xrun recovery returned %d -> return.\n", ret);
- return ret;
- }
- if (count-- <= 0) {
- ERROR0("DAUDIO_Write: too many attempts to recover from xrun/suspend\n");
- return -1;
- }
- } else {
- break;
- }
- } while (TRUE);
- //ret = snd_pcm_frames_to_bytes(info->handle, writtenFrames);
-
- if (writtenFrames > 0) {
- // reset "flushed" flag
- info->isFlushed = 0;
- }
-
- ret = (int) (writtenFrames * info->frameSize);
- TRACE1("< DAUDIO_Write: returning %d bytes.\n", ret);
- return ret;
-}
-
-// returns -1 on error
-int DAUDIO_Read(void* id, char* data, int byteSize) {
- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
- int ret, count;
- snd_pcm_sframes_t frameSize, readFrames;
-
- TRACE1("> DAUDIO_Read %d bytes\n", byteSize);
- /*TRACE3(" info=%p, data=%p, byteSize=%d\n",
- (void*) info, (void*) data, (int) byteSize);
- TRACE2(" info->frameSize=%d, info->handle=%p\n",
- (int) info->frameSize, (void*) info->handle);
- */
- /* sanity */
- if (byteSize <= 0 || info->frameSize <= 0) {
- ERROR2(" DAUDIO_Read: byteSize=%d, frameSize=%d!\n",
- (int) byteSize, (int) info->frameSize);
- TRACE0("< DAUDIO_Read returning -1\n");
- return -1;
- }
- if (!info->isRunning && info->isFlushed) {
- // PCM has nothing to read
- return 0;
- }
-
- count = 2; // maximum number of trials to recover from error
- //frameSize = snd_pcm_bytes_to_frames(info->handle, byteSize);
- frameSize = (snd_pcm_sframes_t) (byteSize / info->frameSize);
- do {
- readFrames = snd_pcm_readi(info->handle, (void*) data, (snd_pcm_uframes_t) frameSize);
- if (readFrames < 0) {
- ret = xrun_recovery(info, (int) readFrames);
- if (ret <= 0) {
- TRACE1("DAUDIO_Read: xrun recovery returned %d -> return.\n", ret);
- return ret;
- }
- if (count-- <= 0) {
- ERROR0("DAUDIO_Read: too many attempts to recover from xrun/suspend\n");
- return -1;
- }
- } else {
- break;
- }
- } while (TRUE);
- //ret = snd_pcm_frames_to_bytes(info->handle, readFrames);
- ret = (int) (readFrames * info->frameSize);
- TRACE1("< DAUDIO_Read: returning %d bytes.\n", ret);
- return ret;
-}
-
-
-int DAUDIO_GetBufferSize(void* id, int isSource) {
- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
-
- return info->bufferSizeInBytes;
-}
-
-int DAUDIO_StillDraining(void* id, int isSource) {
- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
- snd_pcm_state_t state;
-
- state = snd_pcm_state(info->handle);
- //printState(state);
- //TRACE1("Still draining: %s\n", (state != SND_PCM_STATE_XRUN)?"TRUE":"FALSE");
- return (state == SND_PCM_STATE_RUNNING)?TRUE:FALSE;
-}
-
-
-int DAUDIO_Flush(void* id, int isSource) {
- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
- int ret;
-
- TRACE0("DAUDIO_Flush\n");
-
- if (info->isFlushed) {
- // nothing to drop
- return 1;
- }
-
- ret = snd_pcm_drop(info->handle);
- if (ret != 0) {
- ERROR1("ERROR in snd_pcm_drop: %s\n", snd_strerror(ret));
- return FALSE;
- }
-
- info->isFlushed = 1;
- if (info->isRunning) {
- ret = DAUDIO_Start(id, isSource);
- }
- return ret;
-}
-
-int DAUDIO_GetAvailable(void* id, int isSource) {
- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
- snd_pcm_sframes_t availableInFrames;
- snd_pcm_state_t state;
- int ret;
-
- state = snd_pcm_state(info->handle);
- if (info->isFlushed || state == SND_PCM_STATE_XRUN) {
- // if in xrun state then we have the entire buffer available,
- // not 0 as alsa reports
- ret = info->bufferSizeInBytes;
- } else {
- availableInFrames = snd_pcm_avail_update(info->handle);
- if (availableInFrames < 0) {
- ret = 0;
- } else {
- //ret = snd_pcm_frames_to_bytes(info->handle, availableInFrames);
- ret = (int) (availableInFrames * info->frameSize);
- }
- }
- TRACE1("DAUDIO_GetAvailable returns %d bytes\n", ret);
- return ret;
-}
-
-INT64 estimatePositionFromAvail(AlsaPcmInfo* info, int isSource, INT64 javaBytePos, int availInBytes) {
- // estimate the current position with the buffer size and
- // the available bytes to read or write in the buffer.
- // not an elegant solution - bytePos will stop on xruns,
- // and in race conditions it may jump backwards
- // Advantage is that it is indeed based on the samples that go through
- // the system (rather than time-based methods)
- if (isSource) {
- // javaBytePos is the position that is reached when the current
- // buffer is played completely
- return (INT64) (javaBytePos - info->bufferSizeInBytes + availInBytes);
- } else {
- // javaBytePos is the position that was when the current buffer was empty
- return (INT64) (javaBytePos + availInBytes);
- }
-}
-
-INT64 DAUDIO_GetBytePosition(void* id, int isSource, INT64 javaBytePos) {
- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
- int ret;
- INT64 result = javaBytePos;
- snd_pcm_state_t state;
- state = snd_pcm_state(info->handle);
-
- if (!info->isFlushed && state != SND_PCM_STATE_XRUN) {
-#ifdef GET_POSITION_METHOD2
- snd_timestamp_t* ts;
- snd_pcm_uframes_t framesAvail;
-
- // note: slight race condition if this is called simultaneously from 2 threads
- ret = snd_pcm_status(info->handle, info->positionStatus);
- if (ret != 0) {
- ERROR1("ERROR in snd_pcm_status: %s\n", snd_strerror(ret));
- result = javaBytePos;
- } else {
- // calculate from time value, or from available bytes
- framesAvail = snd_pcm_status_get_avail(info->positionStatus);
- result = estimatePositionFromAvail(info, isSource, javaBytePos, framesAvail * info->frameSize);
- }
-#endif
-#ifdef GET_POSITION_METHOD3
- snd_pcm_uframes_t framesAvail;
- ret = snd_pcm_avail(info->handle, &framesAvail);
- if (ret != 0) {
- ERROR1("ERROR in snd_pcm_avail: %s\n", snd_strerror(ret));
- result = javaBytePos;
- } else {
- result = estimatePositionFromAvail(info, isSource, javaBytePos, framesAvail * info->frameSize);
- }
-#endif
-#ifdef GET_POSITION_METHOD1
- result = estimatePositionFromAvail(info, isSource, javaBytePos, DAUDIO_GetAvailable(id, isSource));
-#endif
- }
- //printf("getbyteposition: javaBytePos=%d , return=%d\n", (int) javaBytePos, (int) result);
- return result;
-}
-
-
-
-void DAUDIO_SetBytePosition(void* id, int isSource, INT64 javaBytePos) {
- /* save to ignore, since GetBytePosition
- * takes the javaBytePos param into account
- */
-}
-
-int DAUDIO_RequiresServicing(void* id, int isSource) {
- // never need servicing on Bsd
- return FALSE;
-}
-
-void DAUDIO_Service(void* id, int isSource) {
- // never need servicing on Bsd
-}
-
-
-#endif // USE_DAUDIO
diff -r eb72d194235c -r 514c68575523 src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c
--- a/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c Fri Mar 23 18:01:52 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,292 +0,0 @@
-/*
- * Copyright (c) 2003, 2014, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-//#define USE_ERROR
-//#define USE_TRACE
-
-#include "PLATFORM_API_BsdOS_ALSA_PCMUtils.h"
-#include "PLATFORM_API_BsdOS_ALSA_CommonUtils.h"
-
-
-
-// callback for iteration through devices
-// returns TRUE if iteration should continue
-// NOTE: cardinfo may be NULL (for "default" device)
-typedef int (*DeviceIteratorPtr)(UINT32 deviceID, snd_pcm_info_t* pcminfo,
- snd_ctl_card_info_t* cardinfo, void *userData);
-
-// for each ALSA device, call iterator. userData is passed to the iterator
-// returns total number of iterations
-int iteratePCMDevices(DeviceIteratorPtr iterator, void* userData) {
- int count = 0;
- int subdeviceCount;
- int card, dev, subDev;
- char devname[16];
- int err;
- snd_ctl_t *handle;
- snd_pcm_t *pcm;
- snd_pcm_info_t* pcminfo;
- snd_ctl_card_info_t *cardinfo, *defcardinfo = NULL;
- UINT32 deviceID;
- int doContinue = TRUE;
-
- snd_pcm_info_malloc(&pcminfo);
- snd_ctl_card_info_malloc(&cardinfo);
-
- // 1st try "default" device
- err = snd_pcm_open(&pcm, ALSA_DEFAULT_DEVICE_NAME,
- SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK);
- if (err < 0) {
- // try with the other direction
- err = snd_pcm_open(&pcm, ALSA_DEFAULT_DEVICE_NAME,
- SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK);
- }
- if (err < 0) {
- ERROR1("ERROR: snd_pcm_open (\"default\"): %s\n", snd_strerror(err));
- } else {
- err = snd_pcm_info(pcm, pcminfo);
- snd_pcm_close(pcm);
- if (err < 0) {
- ERROR1("ERROR: snd_pcm_info (\"default\"): %s\n",
- snd_strerror(err));
- } else {
- // try to get card info
- card = snd_pcm_info_get_card(pcminfo);
- if (card >= 0) {
- sprintf(devname, ALSA_HARDWARE_CARD, card);
- if (snd_ctl_open(&handle, devname, SND_CTL_NONBLOCK) >= 0) {
- if (snd_ctl_card_info(handle, cardinfo) >= 0) {
- defcardinfo = cardinfo;
- }
- snd_ctl_close(handle);
- }
- }
- // call callback function for the device
- if (iterator != NULL) {
- doContinue = (*iterator)(ALSA_DEFAULT_DEVICE_ID, pcminfo,
- defcardinfo, userData);
- }
- count++;
- }
- }
-
- // iterate cards
- card = -1;
- while (doContinue) {
- if (snd_card_next(&card) < 0) {
- break;
- }
- if (card < 0) {
- break;
- }
- sprintf(devname, ALSA_HARDWARE_CARD, card);
- TRACE1("Opening alsa device \"%s\"...\n", devname);
- err = snd_ctl_open(&handle, devname, SND_CTL_NONBLOCK);
- if (err < 0) {
- ERROR2("ERROR: snd_ctl_open, card=%d: %s\n",
- card, snd_strerror(err));
- } else {
- err = snd_ctl_card_info(handle, cardinfo);
- if (err < 0) {
- ERROR2("ERROR: snd_ctl_card_info, card=%d: %s\n",
- card, snd_strerror(err));
- } else {
- dev = -1;
- while (doContinue) {
- if (snd_ctl_pcm_next_device(handle, &dev) < 0) {
- ERROR0("snd_ctl_pcm_next_device\n");
- }
- if (dev < 0) {
- break;
- }
- snd_pcm_info_set_device(pcminfo, dev);
- snd_pcm_info_set_subdevice(pcminfo, 0);
- snd_pcm_info_set_stream(pcminfo, SND_PCM_STREAM_PLAYBACK);
- err = snd_ctl_pcm_info(handle, pcminfo);
- if (err == -ENOENT) {
- // try with the other direction
- snd_pcm_info_set_stream(pcminfo, SND_PCM_STREAM_CAPTURE);
- err = snd_ctl_pcm_info(handle, pcminfo);
- }
- if (err < 0) {
- if (err != -ENOENT) {
- ERROR2("ERROR: snd_ctl_pcm_info, card=%d: %s",
- card, snd_strerror(err));
- }
- } else {
- subdeviceCount = needEnumerateSubdevices(ALSA_PCM) ?
- snd_pcm_info_get_subdevices_count(pcminfo) : 1;
- if (iterator!=NULL) {
- for (subDev = 0; subDev < subdeviceCount; subDev++) {
- deviceID = encodeDeviceID(card, dev, subDev);
- doContinue = (*iterator)(deviceID, pcminfo,
- cardinfo, userData);
- count++;
- if (!doContinue) {
- break;
- }
- }
- } else {
- count += subdeviceCount;
- }
- }
- } // of while(doContinue)
- }
- snd_ctl_close(handle);
- }
- }
- snd_ctl_card_info_free(cardinfo);
- snd_pcm_info_free(pcminfo);
- return count;
-}
-
-int getAudioDeviceCount() {
- initAlsaSupport();
- return iteratePCMDevices(NULL, NULL);
-}
-
-int deviceInfoIterator(UINT32 deviceID, snd_pcm_info_t* pcminfo,
- snd_ctl_card_info_t* cardinfo, void* userData) {
- char buffer[300];
- ALSA_AudioDeviceDescription* desc = (ALSA_AudioDeviceDescription*)userData;
-#ifdef ALSA_PCM_USE_PLUGHW
- int usePlugHw = 1;
-#else
- int usePlugHw = 0;
-#endif
-
- initAlsaSupport();
- if (desc->index == 0) {
- // we found the device with correct index
- *(desc->maxSimultaneousLines) = needEnumerateSubdevices(ALSA_PCM) ?
- 1 : snd_pcm_info_get_subdevices_count(pcminfo);
- *desc->deviceID = deviceID;
- buffer[0]=' '; buffer[1]='[';
- // buffer[300] is enough to store the actual device string w/o overrun
- getDeviceStringFromDeviceID(&buffer[2], deviceID, usePlugHw, ALSA_PCM);
- strncat(buffer, "]", sizeof(buffer) - strlen(buffer) - 1);
- strncpy(desc->name,
- (cardinfo != NULL)
- ? snd_ctl_card_info_get_id(cardinfo)
- : snd_pcm_info_get_id(pcminfo),
- desc->strLen - strlen(buffer));
- strncat(desc->name, buffer, desc->strLen - strlen(desc->name));
- strncpy(desc->vendor, "ALSA (http://www.alsa-project.org)", desc->strLen);
- strncpy(desc->description,
- (cardinfo != NULL)
- ? snd_ctl_card_info_get_name(cardinfo)
- : snd_pcm_info_get_name(pcminfo),
- desc->strLen);
- strncat(desc->description, ", ", desc->strLen - strlen(desc->description));
- strncat(desc->description, snd_pcm_info_get_id(pcminfo), desc->strLen - strlen(desc->description));
- strncat(desc->description, ", ", desc->strLen - strlen(desc->description));
- strncat(desc->description, snd_pcm_info_get_name(pcminfo), desc->strLen - strlen(desc->description));
- getALSAVersion(desc->version, desc->strLen);
- TRACE4("Returning %s, %s, %s, %s\n", desc->name, desc->vendor, desc->description, desc->version);
- return FALSE; // do not continue iteration
- }
- desc->index--;
- return TRUE;
-}
-
-// returns 0 if successful
-int openPCMfromDeviceID(int deviceID, snd_pcm_t** handle, int isSource, int hardware) {
- char buffer[200];
- int ret;
-
- initAlsaSupport();
- getDeviceStringFromDeviceID(buffer, deviceID, !hardware, ALSA_PCM);
-
- TRACE1("Opening ALSA device %s\n", buffer);
- ret = snd_pcm_open(handle, buffer,
- isSource?SND_PCM_STREAM_PLAYBACK:SND_PCM_STREAM_CAPTURE,
- SND_PCM_NONBLOCK);
- if (ret != 0) {
- ERROR1("snd_pcm_open returned error code %d \n", ret);
- *handle = NULL;
- }
- return ret;
-}
-
-
-int getAudioDeviceDescriptionByIndex(ALSA_AudioDeviceDescription* desc) {
- initAlsaSupport();
- TRACE1(" getAudioDeviceDescriptionByIndex(mixerIndex = %d\n", desc->index);
- iteratePCMDevices(&deviceInfoIterator, desc);
- return (desc->index == 0)?TRUE:FALSE;
-}
-
-// returns 1 if successful
-// enc: 0 for PCM, 1 for ULAW, 2 for ALAW (see DirectAudio.h)
-int getFormatFromAlsaFormat(snd_pcm_format_t alsaFormat,
- int* sampleSizeInBytes, int* significantBits,
- int* isSigned, int* isBigEndian, int* enc) {
-
- *sampleSizeInBytes = (snd_pcm_format_physical_width(alsaFormat) + 7) / 8;
- *significantBits = snd_pcm_format_width(alsaFormat);
-
- // defaults
- *enc = 0; // PCM
- *isSigned = (snd_pcm_format_signed(alsaFormat) > 0);
- *isBigEndian = (snd_pcm_format_big_endian(alsaFormat) > 0);
-
- // non-PCM formats
- if (alsaFormat == SND_PCM_FORMAT_MU_LAW) { // Mu-Law
- *sampleSizeInBytes = 8; *enc = 1; *significantBits = *sampleSizeInBytes;
- }
- else if (alsaFormat == SND_PCM_FORMAT_A_LAW) { // A-Law
- *sampleSizeInBytes = 8; *enc = 2; *significantBits = *sampleSizeInBytes;
- }
- else if (snd_pcm_format_linear(alsaFormat) < 1) {
- return 0;
- }
- return (*sampleSizeInBytes > 0);
-}
-
-// returns 1 if successful
-int getAlsaFormatFromFormat(snd_pcm_format_t* alsaFormat,
- int sampleSizeInBytes, int significantBits,
- int isSigned, int isBigEndian, int enc) {
- *alsaFormat = SND_PCM_FORMAT_UNKNOWN;
-
- if (enc == 0) {
- *alsaFormat = snd_pcm_build_linear_format(significantBits,
- sampleSizeInBytes * 8,
- isSigned?0:1,
- isBigEndian?1:0);
- }
- else if ((sampleSizeInBytes == 1) && (significantBits == 8)) {
- if (enc == 1) { // ULAW
- *alsaFormat = SND_PCM_FORMAT_MU_LAW;
- }
- else if (enc == 2) { // ALAW
- *alsaFormat = SND_PCM_FORMAT_A_LAW;
- }
- }
- return (*alsaFormat == SND_PCM_FORMAT_UNKNOWN)?0:1;
-}
-
-
-/* end */
diff -r eb72d194235c -r 514c68575523 src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h
--- a/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h Fri Mar 23 18:01:52 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2003, 2012, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-// define this with a later version of ALSA than 0.9.0rc3
-// (starting from 1.0.0 it became default behaviour)
-#define ALSA_PCM_NEW_HW_PARAMS_API
-#include
-#include "Utilities.h"
-
-#ifndef PLATFORM_API_BSDOS_ALSA_PCMUTILS_H_INCLUDED
-#define PLATFORM_API_BSDOS_ALSA_PCMUTILS_H_INCLUDED
-
-// if this is defined, use plughw: devices
-#define ALSA_PCM_USE_PLUGHW
-//#undef ALSA_PCM_USE_PLUGHW
-
-
-// maximum number of channels that is listed in the formats. If more, than
-// just -1 for channel count is used.
-#define MAXIMUM_LISTED_CHANNELS 32
-
-typedef struct tag_ALSA_AudioDeviceDescription {
- int index; // in
- int strLen; // in
- INT32* deviceID; // out
- int* maxSimultaneousLines; // out
- char* name; // out
- char* vendor; // out
- char* description; // out
- char* version; // out
-} ALSA_AudioDeviceDescription;
-
-
-
-int getAudioDeviceCount();
-int getAudioDeviceDescriptionByIndex(ALSA_AudioDeviceDescription* desc);
-
-// returns ALSA error code, or 0 if successful
-int openPCMfromDeviceID(int deviceID, snd_pcm_t** handle, int isSource, int hardware);
-
-// returns 1 if successful
-// enc: 0 for PCM, 1 for ULAW, 2 for ALAW (see DirectAudio.h)
-int getFormatFromAlsaFormat(snd_pcm_format_t alsaFormat,
- int* sampleSizeInBytes, int* significantBits,
- int* isSigned, int* isBigEndian, int* enc);
-
-int getAlsaFormatFromFormat(snd_pcm_format_t* alsaFormat,
- int sampleSizeInBytes, int significantBits,
- int isSigned, int isBigEndian, int enc);
-
-#endif // PLATFORM_API_BSDOS_ALSA_PCMUTILS_H_INCLUDED
diff -r eb72d194235c -r 514c68575523 src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_Ports.c
--- a/src/java.desktop/unix/native/libjsound/PLATFORM_API_BsdOS_ALSA_Ports.c Fri Mar 23 18:01:52 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,724 +0,0 @@
-/*
- * Copyright (c) 2003, 2016, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#define USE_ERROR
-//#define USE_TRACE
-
-#include "Ports.h"
-#include "PLATFORM_API_BsdOS_ALSA_CommonUtils.h"
-#include
-
-#if USE_PORTS == TRUE
-
-#define MAX_ELEMS (300)
-#define MAX_CONTROLS (MAX_ELEMS * 4)
-
-#define CHANNELS_MONO (SND_MIXER_SCHN_LAST + 1)
-#define CHANNELS_STEREO (SND_MIXER_SCHN_LAST + 2)
-
-typedef struct {
- snd_mixer_elem_t* elem;
- INT32 portType; /* one of PORT_XXX_xx */
- char* controlType; /* one of CONTROL_TYPE_xx */
- /* Values: either SND_MIXER_SCHN_FRONT_xx, CHANNELS_MONO or CHANNELS_STEREO.
- For SND_MIXER_SCHN_FRONT_xx, exactly this channel is set/retrieved directly.
- For CHANNELS_MONO, ALSA channel SND_MIXER_SCHN_MONO is set/retrieved directly.
- For CHANNELS_STEREO, ALSA channels SND_MIXER_SCHN_FRONT_LEFT and SND_MIXER_SCHN_FRONT_RIGHT
- are set after a calculation that takes balance into account. Retrieved? Average of both
- channels? (Using a cached value is not a good idea since the value in the HW may have been
- altered.) */
- INT32 channel;
-} PortControl;
-
-
-typedef struct tag_PortMixer {
- snd_mixer_t* mixer_handle;
- /* Number of array elements used in elems and types. */
- int numElems;
- snd_mixer_elem_t** elems;
- /* Array of port types (PORT_SRC_UNKNOWN etc.). Indices are the same as in elems. */
- INT32* types;
- /* Number of array elements used in controls. */
- int numControls;
- PortControl* controls;
-} PortMixer;
-
-
-///// implemented functions of Ports.h
-
-INT32 PORT_GetPortMixerCount() {
- INT32 mixerCount;
- int card;
- char devname[16];
- int err;
- snd_ctl_t *handle;
- snd_ctl_card_info_t* info;
-
- TRACE0("> PORT_GetPortMixerCount\n");
-
- initAlsaSupport();
-
- snd_ctl_card_info_malloc(&info);
- card = -1;
- mixerCount = 0;
- if (snd_card_next(&card) >= 0) {
- while (card >= 0) {
- sprintf(devname, ALSA_HARDWARE_CARD, card);
- TRACE1("PORT_GetPortMixerCount: Opening alsa device \"%s\"...\n", devname);
- err = snd_ctl_open(&handle, devname, 0);
- if (err < 0) {
- ERROR2("ERROR: snd_ctl_open, card=%d: %s\n", card, snd_strerror(err));
- } else {
- mixerCount++;
- snd_ctl_close(handle);
- }
- if (snd_card_next(&card) < 0) {
- break;
- }
- }
- }
- snd_ctl_card_info_free(info);
- TRACE0("< PORT_GetPortMixerCount\n");
- return mixerCount;
-}
-
-
-INT32 PORT_GetPortMixerDescription(INT32 mixerIndex, PortMixerDescription* description) {
- snd_ctl_t* handle;
- snd_ctl_card_info_t* card_info;
- char devname[16];
- int err;
- char buffer[100];
-
- TRACE0("> PORT_GetPortMixerDescription\n");
- snd_ctl_card_info_malloc(&card_info);
-
- sprintf(devname, ALSA_HARDWARE_CARD, (int) mixerIndex);
- TRACE1("Opening alsa device \"%s\"...\n", devname);
- err = snd_ctl_open(&handle, devname, 0);
- if (err < 0) {
- ERROR2("ERROR: snd_ctl_open, card=%d: %s\n", (int) mixerIndex, snd_strerror(err));
- return FALSE;
- }
- err = snd_ctl_card_info(handle, card_info);
- if (err < 0) {
- ERROR2("ERROR: snd_ctl_card_info, card=%d: %s\n", (int) mixerIndex, snd_strerror(err));
- }
- strncpy(description->name, snd_ctl_card_info_get_id(card_info), PORT_STRING_LENGTH - 1);
- sprintf(buffer, " [%s]", devname);
- strncat(description->name, buffer, PORT_STRING_LENGTH - 1 - strlen(description->name));
- strncpy(description->vendor, "ALSA (http://www.alsa-project.org)", PORT_STRING_LENGTH - 1);
- strncpy(description->description, snd_ctl_card_info_get_name(card_info), PORT_STRING_LENGTH - 1);
- strncat(description->description, ", ", PORT_STRING_LENGTH - 1 - strlen(description->description));
- strncat(description->description, snd_ctl_card_info_get_mixername(card_info), PORT_STRING_LENGTH - 1 - strlen(description->description));
- getALSAVersion(description->version, PORT_STRING_LENGTH - 1);
-
- snd_ctl_close(handle);
- snd_ctl_card_info_free(card_info);
- TRACE0("< PORT_GetPortMixerDescription\n");
- return TRUE;
-}
-
-
-void* PORT_Open(INT32 mixerIndex) {
- char devname[16];
- snd_mixer_t* mixer_handle;
- int err;
- PortMixer* handle;
-
- TRACE0("> PORT_Open\n");
- sprintf(devname, ALSA_HARDWARE_CARD, (int) mixerIndex);
- if ((err = snd_mixer_open(&mixer_handle, 0)) < 0) {
- ERROR2("Mixer %s open error: %s", devname, snd_strerror(err));
- return NULL;
- }
- if ((err = snd_mixer_attach(mixer_handle, devname)) < 0) {
- ERROR2("Mixer attach %s error: %s", devname, snd_strerror(err));
- snd_mixer_close(mixer_handle);
- return NULL;
- }
- if ((err = snd_mixer_selem_register(mixer_handle, NULL, NULL)) < 0) {
- ERROR1("Mixer register error: %s", snd_strerror(err));
- snd_mixer_close(mixer_handle);
- return NULL;
- }
- err = snd_mixer_load(mixer_handle);
- if (err < 0) {
- ERROR2("Mixer %s load error: %s", devname, snd_strerror(err));
- snd_mixer_close(mixer_handle);
- return NULL;
- }
- handle = (PortMixer*) calloc(1, sizeof(PortMixer));
- if (handle == NULL) {
- ERROR0("malloc() failed.");
- snd_mixer_close(mixer_handle);
- return NULL;
- }
- handle->numElems = 0;
- handle->elems = (snd_mixer_elem_t**) calloc(MAX_ELEMS, sizeof(snd_mixer_elem_t*));
- if (handle->elems == NULL) {
- ERROR0("malloc() failed.");
- snd_mixer_close(mixer_handle);
- free(handle);
- return NULL;
- }
- handle->types = (INT32*) calloc(MAX_ELEMS, sizeof(INT32));
- if (handle->types == NULL) {
- ERROR0("malloc() failed.");
- snd_mixer_close(mixer_handle);
- free(handle->elems);
- free(handle);
- return NULL;
- }
- handle->controls = (PortControl*) calloc(MAX_CONTROLS, sizeof(PortControl));
- if (handle->controls == NULL) {
- ERROR0("malloc() failed.");
- snd_mixer_close(mixer_handle);
- free(handle->elems);
- free(handle->types);
- free(handle);
- return NULL;
- }
- handle->mixer_handle = mixer_handle;
- // necessary to initialize data structures
- PORT_GetPortCount(handle);
- TRACE0("< PORT_Open\n");
- return handle;
-}
-
-
-void PORT_Close(void* id) {
- TRACE0("> PORT_Close\n");
- if (id != NULL) {
- PortMixer* handle = (PortMixer*) id;
- if (handle->mixer_handle != NULL) {
- snd_mixer_close(handle->mixer_handle);
- }
- if (handle->elems != NULL) {
- free(handle->elems);
- }
- if (handle->types != NULL) {
- free(handle->types);
- }
- if (handle->controls != NULL) {
- free(handle->controls);
- }
- free(handle);
- }
- TRACE0("< PORT_Close\n");
-}
-
-
-
-INT32 PORT_GetPortCount(void* id) {
- PortMixer* portMixer;
- snd_mixer_elem_t *elem;
-
- TRACE0("> PORT_GetPortCount\n");
- if (id == NULL) {
- // $$mp: Should become a descriptive error code (invalid handle).
- return -1;
- }
- portMixer = (PortMixer*) id;
- if (portMixer->numElems == 0) {
- for (elem = snd_mixer_first_elem(portMixer->mixer_handle); elem; elem = snd_mixer_elem_next(elem)) {
- if (!snd_mixer_selem_is_active(elem))
- continue;
- TRACE2("Simple mixer control '%s',%i\n",
- snd_mixer_selem_get_name(elem),
- snd_mixer_selem_get_index(elem));
- if (snd_mixer_selem_has_playback_volume(elem)) {
- portMixer->elems[portMixer->numElems] = elem;
- portMixer->types[portMixer->numElems] = PORT_DST_UNKNOWN;
- portMixer->numElems++;
- }
- // to prevent buffer overflow
- if (portMixer->numElems >= MAX_ELEMS) {
- break;
- }
- /* If an element has both playback an capture volume, it is put into the arrays
- twice. */
- if (snd_mixer_selem_has_capture_volume(elem)) {
- portMixer->elems[portMixer->numElems] = elem;
- portMixer->types[portMixer->numElems] = PORT_SRC_UNKNOWN;
- portMixer->numElems++;
- }
- // to prevent buffer overflow
- if (portMixer->numElems >= MAX_ELEMS) {
- break;
- }
- }
- }
- TRACE0("< PORT_GetPortCount\n");
- return portMixer->numElems;
-}
-
-
-INT32 PORT_GetPortType(void* id, INT32 portIndex) {
- PortMixer* portMixer;
- INT32 type;
- TRACE0("> PORT_GetPortType\n");
- if (id == NULL) {
- // $$mp: Should become a descriptive error code (invalid handle).
- return -1;
- }
- portMixer = (PortMixer*) id;
- if (portIndex < 0 || portIndex >= portMixer->numElems) {
- // $$mp: Should become a descriptive error code (index out of bounds).
- return -1;
- }
- type = portMixer->types[portIndex];
- TRACE0("< PORT_GetPortType\n");
- return type;
-}
-
-
-INT32 PORT_GetPortName(void* id, INT32 portIndex, char* name, INT32 len) {
- PortMixer* portMixer;
- const char* nam;
-
- TRACE0("> PORT_GetPortName\n");
- if (id == NULL) {
- // $$mp: Should become a descriptive error code (invalid handle).
- return -1;
- }
- portMixer = (PortMixer*) id;
- if (portIndex < 0 || portIndex >= portMixer->numElems) {
- // $$mp: Should become a descriptive error code (index out of bounds).
- return -1;
- }
- nam = snd_mixer_selem_get_name(portMixer->elems[portIndex]);
- strncpy(name, nam, len - 1);
- name[len - 1] = 0;
- TRACE0("< PORT_GetPortName\n");
- return TRUE;
-}
-
-
-static int isPlaybackFunction(INT32 portType) {
- return (portType & PORT_DST_MASK);
-}
-
-
-/* Sets portControl to a pointer to the next free array element in the PortControl (pointer)
- array of the passed portMixer. Returns TRUE if successful. May return FALSE if there is no
- free slot. In this case, portControl is not altered */
-static int getControlSlot(PortMixer* portMixer, PortControl** portControl) {
- if (portMixer->numControls >= MAX_CONTROLS) {
- return FALSE;
- } else {
- *portControl = &(portMixer->controls[portMixer->numControls]);
- portMixer->numControls++;
- return TRUE;
- }
-}
-
-
-/* Protect against illegal min-max values, preventing divisions by zero.
- */
-inline static long getRange(long min, long max) {
- if (max > min) {
- return max - min;
- } else {
- return 1;
- }
-}
-
-
-/* Idea: we may specify that if unit is an empty string, the values are linear and if unit is "dB",
- the values are logarithmic.
-*/
-static void* createVolumeControl(PortControlCreator* creator,
- PortControl* portControl,
- snd_mixer_elem_t* elem, int isPlayback) {
- void* control;
- float precision;
- long min, max;
-
- if (isPlayback) {
- snd_mixer_selem_get_playback_volume_range(elem, &min, &max);
- } else {
- snd_mixer_selem_get_capture_volume_range(elem, &min, &max);
- }
- /* $$mp: The volume values retrieved with the ALSA API are strongly supposed to be logarithmic.
- So the following calculation is wrong. However, there is no correct calculation, since
- for equal-distant logarithmic steps, the precision expressed in linear varies over the
- scale. */
- precision = 1.0F / getRange(min, max);
- control = (creator->newFloatControl)(creator, portControl, CONTROL_TYPE_VOLUME, 0.0F, +1.0F, precision, "");
- return control;
-}
-
-
-void PORT_GetControls(void* id, INT32 portIndex, PortControlCreator* creator) {
- PortMixer* portMixer;
- snd_mixer_elem_t* elem;
- void* control;
- PortControl* portControl;
- void* controls[10];
- int numControls;
- char* portName;
- int isPlayback = 0;
- int isMono;
- int isStereo;
- char* type;
- snd_mixer_selem_channel_id_t channel;
- memset(controls, 0, sizeof(controls));
-
- TRACE0("> PORT_GetControls\n");
- if (id == NULL) {
- ERROR0("Invalid handle!");
- // $$mp: an error code should be returned.
- return;
- }
- portMixer = (PortMixer*) id;
- if (portIndex < 0 || portIndex >= portMixer->numElems) {
- ERROR0("Port index out of range!");
- // $$mp: an error code should be returned.
- return;
- }
- numControls = 0;
- elem = portMixer->elems[portIndex];
- if (snd_mixer_selem_has_playback_volume(elem) || snd_mixer_selem_has_capture_volume(elem)) {
- /* Since we've split/duplicated elements with both playback and capture on the recovery
- of elements, we now can assume that we handle only to deal with either playback or
- capture. */
- isPlayback = isPlaybackFunction(portMixer->types[portIndex]);
- isMono = (isPlayback && snd_mixer_selem_is_playback_mono(elem)) ||
- (!isPlayback && snd_mixer_selem_is_capture_mono(elem));
- isStereo = (isPlayback &&
- snd_mixer_selem_has_playback_channel(elem, SND_MIXER_SCHN_FRONT_LEFT) &&
- snd_mixer_selem_has_playback_channel(elem, SND_MIXER_SCHN_FRONT_RIGHT)) ||
- (!isPlayback &&
- snd_mixer_selem_has_capture_channel(elem, SND_MIXER_SCHN_FRONT_LEFT) &&
- snd_mixer_selem_has_capture_channel(elem, SND_MIXER_SCHN_FRONT_RIGHT));
- // single volume control
- if (isMono || isStereo) {
- if (getControlSlot(portMixer, &portControl)) {
- portControl->elem = elem;
- portControl->portType = portMixer->types[portIndex];
- portControl->controlType = CONTROL_TYPE_VOLUME;
- if (isMono) {
- portControl->channel = CHANNELS_MONO;
- } else {
- portControl->channel = CHANNELS_STEREO;
- }
- control = createVolumeControl(creator, portControl, elem, isPlayback);
- if (control != NULL) {
- controls[numControls++] = control;
- }
- }
- } else { // more than two channels, each channels has its own control.
- for (channel = SND_MIXER_SCHN_FRONT_LEFT; channel <= SND_MIXER_SCHN_LAST; channel++) {
- if (isPlayback && snd_mixer_selem_has_playback_channel(elem, channel) ||
- !isPlayback && snd_mixer_selem_has_capture_channel(elem, channel)) {
- if (getControlSlot(portMixer, &portControl)) {
- portControl->elem = elem;
- portControl->portType = portMixer->types[portIndex];
- portControl->controlType = CONTROL_TYPE_VOLUME;
- portControl->channel = channel;
- control = createVolumeControl(creator, portControl, elem, isPlayback);
- // We wrap in a compound control to provide the channel name.
- if (control != NULL) {
- /* $$mp 2003-09-14: The following cast shouln't be necessary. Instead, the
- declaration of PORT_NewCompoundControlPtr in Ports.h should be changed
- to take a const char* parameter. */
- control = (creator->newCompoundControl)(creator, (char*) snd_mixer_selem_channel_name(channel), &control, 1);
- }
- if (control != NULL) {
- controls[numControls++] = control;
- }
- }
- }
- }
- }
- // BALANCE control
- if (isStereo) {
- if (getControlSlot(portMixer, &portControl)) {
- portControl->elem = elem;
- portControl->portType = portMixer->types[portIndex];
- portControl->controlType = CONTROL_TYPE_BALANCE;
- portControl->channel = CHANNELS_STEREO;
- /* $$mp: The value for precision is chosen more or less arbitrarily. */
- control = (creator->newFloatControl)(creator, portControl, CONTROL_TYPE_BALANCE, -1.0F, 1.0F, 0.01F, "");
- if (control != NULL) {
- controls[numControls++] = control;
- }
- }
- }
- }
- if (snd_mixer_selem_has_playback_switch(elem) || snd_mixer_selem_has_capture_switch(elem)) {
- if (getControlSlot(portMixer, &portControl)) {
- type = isPlayback ? CONTROL_TYPE_MUTE : CONTROL_TYPE_SELECT;
- portControl->elem = elem;
- portControl->portType = portMixer->types[portIndex];
- portControl->controlType = type;
- control = (creator->newBooleanControl)(creator, portControl, type);
- if (control != NULL) {
- controls[numControls++] = control;
- }
- }
- }
- /* $$mp 2003-09-14: The following cast shouln't be necessary. Instead, the
- declaration of PORT_NewCompoundControlPtr in Ports.h should be changed
- to take a const char* parameter. */
- portName = (char*) snd_mixer_selem_get_name(elem);
- control = (creator->newCompoundControl)(creator, portName, controls, numControls);
- if (control != NULL) {
- (creator->addControl)(creator, control);
- }
- TRACE0("< PORT_GetControls\n");
-}
-
-
-INT32 PORT_GetIntValue(void* controlIDV) {
- PortControl* portControl = (PortControl*) controlIDV;
- int value = 0;
- snd_mixer_selem_channel_id_t channel;
-
- if (portControl != NULL) {
- switch (portControl->channel) {
- case CHANNELS_MONO:
- channel = SND_MIXER_SCHN_MONO;
- break;
-
- case CHANNELS_STEREO:
- channel = SND_MIXER_SCHN_FRONT_LEFT;
- break;
-
- default:
- channel = portControl->channel;
- }
- if (portControl->controlType == CONTROL_TYPE_MUTE ||
- portControl->controlType == CONTROL_TYPE_SELECT) {
- if (isPlaybackFunction(portControl->portType)) {
- snd_mixer_selem_get_playback_switch(portControl->elem, channel, &value);
- } else {
- snd_mixer_selem_get_capture_switch(portControl->elem, channel, &value);
- }
- if (portControl->controlType == CONTROL_TYPE_MUTE) {
- value = ! value;
- }
- } else {
- ERROR1("PORT_GetIntValue(): inappropriate control type: %s\n",
- portControl->controlType);
- }
- }
- return (INT32) value;
-}
-
-
-void PORT_SetIntValue(void* controlIDV, INT32 value) {
- PortControl* portControl = (PortControl*) controlIDV;
- snd_mixer_selem_channel_id_t channel;
-
- if (portControl != NULL) {
- if (portControl->controlType == CONTROL_TYPE_MUTE) {
- value = ! value;
- }
- if (portControl->controlType == CONTROL_TYPE_MUTE ||
- portControl->controlType == CONTROL_TYPE_SELECT) {
- if (isPlaybackFunction(portControl->portType)) {
- snd_mixer_selem_set_playback_switch_all(portControl->elem, value);
- } else {
- snd_mixer_selem_set_capture_switch_all(portControl->elem, value);
- }
- } else {
- ERROR1("PORT_SetIntValue(): inappropriate control type: %s\n",
- portControl->controlType);
- }
- }
-}
-
-
-static float scaleVolumeValueToNormalized(long value, long min, long max) {
- return (float) (value - min) / getRange(min, max);
-}
-
-
-static long scaleVolumeValueToHardware(float value, long min, long max) {
- return (long)(value * getRange(min, max) + min);
-}
-
-
-float getRealVolume(PortControl* portControl,
- snd_mixer_selem_channel_id_t channel) {
- float fValue;
- long lValue = 0;
- long min = 0;
- long max = 0;
-
- if (isPlaybackFunction(portControl->portType)) {
- snd_mixer_selem_get_playback_volume_range(portControl->elem,
- &min, &max);
- snd_mixer_selem_get_playback_volume(portControl->elem,
- channel, &lValue);
- } else {
- snd_mixer_selem_get_capture_volume_range(portControl->elem,
- &min, &max);
- snd_mixer_selem_get_capture_volume(portControl->elem,
- channel, &lValue);
- }
- fValue = scaleVolumeValueToNormalized(lValue, min, max);
- return fValue;
-}
-
-
-void setRealVolume(PortControl* portControl,
- snd_mixer_selem_channel_id_t channel, float value) {
- long lValue = 0;
- long min = 0;
- long max = 0;
-
- if (isPlaybackFunction(portControl->portType)) {
- snd_mixer_selem_get_playback_volume_range(portControl->elem,
- &min, &max);
- lValue = scaleVolumeValueToHardware(value, min, max);
- snd_mixer_selem_set_playback_volume(portControl->elem,
- channel, lValue);
- } else {
- snd_mixer_selem_get_capture_volume_range(portControl->elem,
- &min, &max);
- lValue = scaleVolumeValueToHardware(value, min, max);
- snd_mixer_selem_set_capture_volume(portControl->elem,
- channel, lValue);
- }
-}
-
-
-static float getFakeBalance(PortControl* portControl) {
- float volL, volR;
-
- // pan is the ratio of left and right
- volL = getRealVolume(portControl, SND_MIXER_SCHN_FRONT_LEFT);
- volR = getRealVolume(portControl, SND_MIXER_SCHN_FRONT_RIGHT);
- if (volL > volR) {
- return -1.0f + (volR / volL);
- }
- else if (volR > volL) {
- return 1.0f - (volL / volR);
- }
- return 0.0f;
-}
-
-
-static float getFakeVolume(PortControl* portControl) {
- float valueL;
- float valueR;
- float value;
-
- valueL = getRealVolume(portControl, SND_MIXER_SCHN_FRONT_LEFT);
- valueR = getRealVolume(portControl, SND_MIXER_SCHN_FRONT_RIGHT);
- // volume is the greater value of both
- value = valueL > valueR ? valueL : valueR ;
- return value;
-}
-
-
-/*
- * sets the unsigned values for left and right volume according to
- * the given volume (0...1) and balance (-1..0..+1)
- */
-static void setFakeVolume(PortControl* portControl, float vol, float bal) {
- float volumeLeft;
- float volumeRight;
-
- if (bal < 0.0f) {
- volumeLeft = vol;
- volumeRight = vol * (bal + 1.0f);
- } else {
- volumeLeft = vol * (1.0f - bal);
- volumeRight = vol;
- }
- setRealVolume(portControl, SND_MIXER_SCHN_FRONT_LEFT, volumeLeft);
- setRealVolume(portControl, SND_MIXER_SCHN_FRONT_RIGHT, volumeRight);
-}
-
-
-float PORT_GetFloatValue(void* controlIDV) {
- PortControl* portControl = (PortControl*) controlIDV;
- float value = 0.0F;
-
- if (portControl != NULL) {
- if (portControl->controlType == CONTROL_TYPE_VOLUME) {
- switch (portControl->channel) {
- case CHANNELS_MONO:
- value = getRealVolume(portControl, SND_MIXER_SCHN_MONO);
- break;
-
- case CHANNELS_STEREO:
- value = getFakeVolume(portControl);
- break;
-
- default:
- value = getRealVolume(portControl, portControl->channel);
- }
- } else if (portControl->controlType == CONTROL_TYPE_BALANCE) {
- if (portControl->channel == CHANNELS_STEREO) {
- value = getFakeBalance(portControl);
- } else {
- ERROR0("PORT_GetFloatValue(): Balance only allowed for stereo channels!\n");
- }
- } else {
- ERROR1("PORT_GetFloatValue(): inappropriate control type: %s!\n",
- portControl->controlType);
- }
- }
- return value;
-}
-
-
-void PORT_SetFloatValue(void* controlIDV, float value) {
- PortControl* portControl = (PortControl*) controlIDV;
-
- if (portControl != NULL) {
- if (portControl->controlType == CONTROL_TYPE_VOLUME) {
- switch (portControl->channel) {
- case CHANNELS_MONO:
- setRealVolume(portControl, SND_MIXER_SCHN_MONO, value);
- break;
-
- case CHANNELS_STEREO:
- setFakeVolume(portControl, value, getFakeBalance(portControl));
- break;
-
- default:
- setRealVolume(portControl, portControl->channel, value);
- }
- } else if (portControl->controlType == CONTROL_TYPE_BALANCE) {
- if (portControl->channel == CHANNELS_STEREO) {
- setFakeVolume(portControl, getFakeVolume(portControl), value);
- } else {
- ERROR0("PORT_SetFloatValue(): Balance only allowed for stereo channels!\n");
- }
- } else {
- ERROR1("PORT_SetFloatValue(): inappropriate control type: %s!\n",
- portControl->controlType);
- }
- }
-}
-
-
-#endif // USE_PORTS
diff -r eb72d194235c -r 514c68575523 src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c
--- a/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.c Fri Mar 23 18:01:52 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,187 +0,0 @@
-/*
- * Copyright (c) 2003, 2015, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-//#define USE_ERROR
-//#define USE_TRACE
-
-#include "PLATFORM_API_LinuxOS_ALSA_CommonUtils.h"
-
-static void alsaDebugOutput(const char *file, int line, const char *function, int err, const char *fmt, ...) {
-#ifdef USE_ERROR
- va_list args;
- va_start(args, fmt);
- printf("%s:%d function %s: error %d: %s\n", file, line, function, err, snd_strerror(err));
- if (strlen(fmt) > 0) {
- vprintf(fmt, args);
- }
- va_end(args);
-#endif
-}
-
-static int alsa_inited = 0;
-static int alsa_enumerate_pcm_subdevices = FALSE; // default: no
-static int alsa_enumerate_midi_subdevices = FALSE; // default: no
-
-/*
- * Declare library specific JNI_Onload entry if static build
- */
-DEF_STATIC_JNI_OnLoad
-
-void initAlsaSupport() {
- char* enumerate;
- if (!alsa_inited) {
- alsa_inited = TRUE;
- snd_lib_error_set_handler(&alsaDebugOutput);
-
- enumerate = getenv(ENV_ENUMERATE_PCM_SUBDEVICES);
- if (enumerate != NULL && strlen(enumerate) > 0
- && (enumerate[0] != 'f') // false
- && (enumerate[0] != 'F') // False
- && (enumerate[0] != 'n') // no
- && (enumerate[0] != 'N')) { // NO
- alsa_enumerate_pcm_subdevices = TRUE;
- }
-#ifdef ALSA_MIDI_ENUMERATE_SUBDEVICES
- alsa_enumerate_midi_subdevices = TRUE;
-#endif
- }
-}
-
-
-/* if true (non-zero), ALSA sub devices should be listed as separate devices
- */
-int needEnumerateSubdevices(int isMidi) {
- initAlsaSupport();
- return isMidi ? alsa_enumerate_midi_subdevices
- : alsa_enumerate_pcm_subdevices;
-}
-
-
-/*
- * deviceID contains packed card, device and subdevice numbers
- * each number takes 10 bits
- * "default" device has id == ALSA_DEFAULT_DEVICE_ID
- */
-UINT32 encodeDeviceID(int card, int device, int subdevice) {
- return (((card & 0x3FF) << 20) | ((device & 0x3FF) << 10)
- | (subdevice & 0x3FF)) + 1;
-}
-
-
-void decodeDeviceID(UINT32 deviceID, int* card, int* device, int* subdevice,
- int isMidi) {
- deviceID--;
- *card = (deviceID >> 20) & 0x3FF;
- *device = (deviceID >> 10) & 0x3FF;
- if (needEnumerateSubdevices(isMidi)) {
- *subdevice = deviceID & 0x3FF;
- } else {
- *subdevice = -1; // ALSA will choose any subdevices
- }
-}
-
-
-void getDeviceString(char* buffer, int card, int device, int subdevice,
- int usePlugHw, int isMidi) {
- if (needEnumerateSubdevices(isMidi)) {
- sprintf(buffer, "%s:%d,%d,%d",
- usePlugHw ? ALSA_PLUGHARDWARE : ALSA_HARDWARE,
- card, device, subdevice);
- } else {
- sprintf(buffer, "%s:%d,%d",
- usePlugHw ? ALSA_PLUGHARDWARE : ALSA_HARDWARE,
- card, device);
- }
-}
-
-
-void getDeviceStringFromDeviceID(char* buffer, UINT32 deviceID,
- int usePlugHw, int isMidi) {
- int card, device, subdevice;
-
- if (deviceID == ALSA_DEFAULT_DEVICE_ID) {
- strcpy(buffer, ALSA_DEFAULT_DEVICE_NAME);
- } else {
- decodeDeviceID(deviceID, &card, &device, &subdevice, isMidi);
- getDeviceString(buffer, card, device, subdevice, usePlugHw, isMidi);
- }
-}
-
-
-static int hasGottenALSAVersion = FALSE;
-#define ALSAVersionString_LENGTH 200
-static char ALSAVersionString[ALSAVersionString_LENGTH];
-
-void getALSAVersion(char* buffer, int len) {
- if (!hasGottenALSAVersion) {
- // get alsa version from proc interface
- FILE* file;
- int curr, len, totalLen, inVersionString;
- file = fopen(ALSA_VERSION_PROC_FILE, "r");
- ALSAVersionString[0] = 0;
- if (file) {
- if (NULL != fgets(ALSAVersionString, ALSAVersionString_LENGTH, file)) {
- // parse for version number
- totalLen = strlen(ALSAVersionString);
- inVersionString = FALSE;
- len = 0;
- curr = 0;
- while (curr < totalLen) {
- if (!inVersionString) {
- // is this char the beginning of a version string ?
- if (ALSAVersionString[curr] >= '0'
- && ALSAVersionString[curr] <= '9') {
- inVersionString = TRUE;
- }
- }
- if (inVersionString) {
- // the version string ends with white space
- if (ALSAVersionString[curr] <= 32) {
- break;
- }
- if (curr != len) {
- // copy this char to the beginning of the string
- ALSAVersionString[len] = ALSAVersionString[curr];
- }
- len++;
- }
- curr++;
- }
- // remove trailing dots
- while ((len > 0) && (ALSAVersionString[len - 1] == '.')) {
- len--;
- }
- // null terminate
- ALSAVersionString[len] = 0;
- }
- fclose(file);
- hasGottenALSAVersion = TRUE;
- }
- }
- strncpy(buffer, ALSAVersionString, len);
-}
-
-
-/* end */
diff -r eb72d194235c -r 514c68575523 src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.h
--- a/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.h Fri Mar 23 18:01:52 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2003, 2007, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#include
-#include "Utilities.h"
-
-#ifndef PLATFORM_API_LINUXOS_ALSA_COMMONUTILS_H_INCLUDED
-#define PLATFORM_API_LINUXOS_ALSA_COMMONUTILS_H_INCLUDED
-
-#define ALSA_VERSION_PROC_FILE "/proc/asound/version"
-#define ALSA_HARDWARE "hw"
-#define ALSA_HARDWARE_CARD ALSA_HARDWARE":%d"
-#define ALSA_HARDWARE_DEVICE ALSA_HARDWARE_CARD",%d"
-#define ALSA_HARDWARE_SUBDEVICE ALSA_HARDWARE_DEVICE",%d"
-
-#define ALSA_PLUGHARDWARE "plughw"
-#define ALSA_DEFAULT_DEVICE_NAME "default"
-
-#define ALSA_DEFAULT_DEVICE_ID (0)
-
-#define ALSA_PCM (0)
-#define ALSA_RAWMIDI (1)
-
-// for use in info objects
-#define ALSA_VENDOR "ALSA (http://www.alsa-project.org)"
-
-// Environment variable for inclusion of subdevices in device listing.
-// If this variable is unset or "no", then subdevices are ignored, and
-// it's ALSA's choice which one to use (enables hardware mixing)
-#define ENV_ENUMERATE_PCM_SUBDEVICES "ALSA_ENUMERATE_PCM_SUBDEVICES"
-
-// if defined, subdevices are listed.
-//#undef ALSA_MIDI_ENUMERATE_SUBDEVICES
-#define ALSA_MIDI_ENUMERATE_SUBDEVICES
-
-// must be called before any ALSA calls
-void initAlsaSupport();
-
-/* if true (non-zero), ALSA sub devices should be listed as separate devices
- */
-int needEnumerateSubdevices(int isMidi);
-
-
-/*
- * deviceID contains packed card, device and subdevice numbers
- * each number takes 10 bits
- * "default" device has id == ALSA_DEFAULT_DEVICE_ID
- */
-UINT32 encodeDeviceID(int card, int device, int subdevice);
-
-void decodeDeviceID(UINT32 deviceID, int* card, int* device, int* subdevice,
- int isMidi);
-
-void getDeviceStringFromDeviceID(char* buffer, UINT32 deviceID,
- int usePlugHw, int isMidi);
-
-void getALSAVersion(char* buffer, int len);
-
-
-#endif // PLATFORM_API_LINUXOS_ALSA_COMMONUTILS_H_INCLUDED
diff -r eb72d194235c -r 514c68575523 src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c
--- a/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c Fri Mar 23 18:01:52 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,354 +0,0 @@
-/*
- * Copyright (c) 2003, 2010, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#define USE_ERROR
-#define USE_TRACE
-
-#if USE_PLATFORM_MIDI_IN == TRUE
-
-
-#include
-#include "PlatformMidi.h"
-#include "PLATFORM_API_LinuxOS_ALSA_MidiUtils.h"
-#if defined(i586)
-#include
-#endif
-
-/*
- * Helper methods
- */
-
-static inline UINT32 packMessage(int status, int data1, int data2) {
- return ((status & 0xFF) | ((data1 & 0xFF) << 8) | ((data2 & 0xFF) << 16));
-}
-
-
-static void setShortMessage(MidiMessage* message,
- int status, int data1, int data2) {
- message->type = SHORT_MESSAGE;
- message->data.s.packedMsg = packMessage(status, data1, data2);
-}
-
-
-static void setRealtimeMessage(MidiMessage* message, int status) {
- setShortMessage(message, status, 0, 0);
-}
-
-
-static void set14bitMessage(MidiMessage* message, int status, int value) {
- TRACE3("14bit value: %d, lsb: %d, msb: %d\n", value, value & 0x7F, (value >> 7) & 0x7F);
- value &= 0x3FFF;
- TRACE3("14bit value (2): %d, lsb: %d, msb: %d\n", value, value & 0x7F, (value >> 7) & 0x7F);
- setShortMessage(message, status,
- value & 0x7F,
- (value >> 7) & 0x7F);
-}
-
-
-/*
- * implementation of the platform-dependent
- * MIDI in functions declared in PlatformMidi.h
- */
-
-char* MIDI_IN_GetErrorStr(INT32 err) {
- return (char*) getErrorStr(err);
-}
-
-INT32 MIDI_IN_GetNumDevices() {
-/* Workaround for 6842956: 32bit app on 64bit linux
- * gets assertion failure trying to open midiIn ports.
- * Untill the issue is fixed in ALSA
- * (https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4807)
- * report no midi in devices in the configuration.
- */
-#if defined(i586)
- static int jre32onlinux64 = -1;
- if (jre32onlinux64 < 0) {
- jre32onlinux64 = 0;
- /* The workaround may be disabled setting "JAVASOUND_ENABLE_MIDIIN"
- * environment variable.
- */
- if (getenv("JAVASOUND_ENABLE_MIDIIN") == NULL) {
- struct utsname u;
- jre32onlinux64 = 0;
- if (uname(&u) == 0) {
- if (strstr(u.machine, "64") != NULL) {
- TRACE0("jre32 on linux64 detected - report no midiIn devices\n");
- jre32onlinux64 = 1;
- }
- }
- }
- }
- if (jre32onlinux64) {
- return 0;
- }
-#endif
-
- TRACE0("MIDI_IN_GetNumDevices()\n");
-
- return getMidiDeviceCount(SND_RAWMIDI_STREAM_INPUT);
-}
-
-
-INT32 MIDI_IN_GetDeviceName(INT32 deviceIndex, char *name, UINT32 nameLength) {
- int ret = getMidiDeviceName(SND_RAWMIDI_STREAM_INPUT, deviceIndex,
- name, nameLength);
- return ret;
-}
-
-
-INT32 MIDI_IN_GetDeviceVendor(INT32 deviceIndex, char *name, UINT32 nameLength) {
- int ret = getMidiDeviceVendor(deviceIndex, name, nameLength);
- return ret;
-}
-
-
-INT32 MIDI_IN_GetDeviceDescription(INT32 deviceIndex, char *name, UINT32 nameLength) {
- int ret = getMidiDeviceDescription(SND_RAWMIDI_STREAM_INPUT, deviceIndex,
- name, nameLength);
- return ret;
-}
-
-
-INT32 MIDI_IN_GetDeviceVersion(INT32 deviceIndex, char *name, UINT32 nameLength) {
- int ret = getMidiDeviceVersion(deviceIndex, name, nameLength);
- return ret;
-}
-
-/*************************************************************************/
-
-INT32 MIDI_IN_OpenDevice(INT32 deviceIndex, MidiDeviceHandle** handle) {
- INT32 ret;
- TRACE0("> MIDI_IN_OpenDevice\n");
- ret = openMidiDevice(SND_RAWMIDI_STREAM_INPUT, deviceIndex, handle);
- TRACE1("< MIDI_IN_OpenDevice: returning %d\n", (int) ret);
- return ret;
-}
-
-
-INT32 MIDI_IN_CloseDevice(MidiDeviceHandle* handle) {
- INT32 ret;
- TRACE0("> MIDI_IN_CloseDevice\n");
- ret = closeMidiDevice(handle);
- TRACE1("< MIDI_IN_CloseDevice: returning %d\n", (int) ret);
- return ret;
-}
-
-
-INT32 MIDI_IN_StartDevice(MidiDeviceHandle* handle) {
- TRACE0("MIDI_IN_StartDevice\n");
- return MIDI_SUCCESS;
-}
-
-
-INT32 MIDI_IN_StopDevice(MidiDeviceHandle* handle) {
- TRACE0("MIDI_IN_StopDevice\n");
- return MIDI_SUCCESS;
-}
-
-
-INT64 MIDI_IN_GetTimeStamp(MidiDeviceHandle* handle) {
- return getMidiTimestamp(handle);
-}
-
-
-/* read the next message from the queue */
-MidiMessage* MIDI_IN_GetMessage(MidiDeviceHandle* handle) {
- snd_seq_event_t alsa_message;
- MidiMessage* jdk_message;
- int err;
- char buffer[1];
- int status;
-
- TRACE0("> MIDI_IN_GetMessage\n");
- if (!handle) {
- ERROR0("< ERROR: MIDI_IN_GetMessage(): handle is NULL\n");
- return NULL;
- }
- if (!handle->deviceHandle) {
- ERROR0("< ERROR: MIDI_IN_GetMessage(): native handle is NULL\n");
- return NULL;
- }
- if (!handle->platformData) {
- ERROR0("< ERROR: MIDI_IN_GetMessage(): platformData is NULL\n");
- return NULL;
- }
-
- /* For MIDI In, the device is left in non blocking mode. So if there is
- no data from the device, snd_rawmidi_read() returns with -11 (EAGAIN).
- This results in jumping back to the Java layer. */
- while (TRUE) {
- TRACE0("before snd_rawmidi_read()\n");
- err = snd_rawmidi_read((snd_rawmidi_t*) handle->deviceHandle, buffer, 1);
- TRACE0("after snd_rawmidi_read()\n");
- if (err != 1) {
- ERROR2("< ERROR: MIDI_IN_GetMessage(): snd_rawmidi_read() returned %d : %s\n", err, snd_strerror(err));
- return NULL;
- }
- // printf("received byte: %d\n", buffer[0]);
- err = snd_midi_event_encode_byte((snd_midi_event_t*) handle->platformData,
- (int) buffer[0],
- &alsa_message);
- if (err == 1) {
- break;
- } else if (err < 0) {
- ERROR1("< ERROR: MIDI_IN_GetMessage(): snd_midi_event_encode_byte() returned %d\n", err);
- return NULL;
- }
- }
- jdk_message = (MidiMessage*) calloc(sizeof(MidiMessage), 1);
- if (!jdk_message) {
- ERROR0("< ERROR: MIDI_IN_GetMessage(): out of memory\n");
- return NULL;
- }
- // TODO: tra
- switch (alsa_message.type) {
- case SND_SEQ_EVENT_NOTEON:
- case SND_SEQ_EVENT_NOTEOFF:
- case SND_SEQ_EVENT_KEYPRESS:
- status = (alsa_message.type == SND_SEQ_EVENT_KEYPRESS) ? 0xA0 :
- (alsa_message.type == SND_SEQ_EVENT_NOTEON) ? 0x90 : 0x80;
- status |= alsa_message.data.note.channel;
- setShortMessage(jdk_message, status,
- alsa_message.data.note.note,
- alsa_message.data.note.velocity);
- break;
-
- case SND_SEQ_EVENT_CONTROLLER:
- status = 0xB0 | alsa_message.data.control.channel;
- setShortMessage(jdk_message, status,
- alsa_message.data.control.param,
- alsa_message.data.control.value);
- break;
-
- case SND_SEQ_EVENT_PGMCHANGE:
- case SND_SEQ_EVENT_CHANPRESS:
- status = (alsa_message.type == SND_SEQ_EVENT_PGMCHANGE) ? 0xC0 : 0xD0;
- status |= alsa_message.data.control.channel;
- setShortMessage(jdk_message, status,
- alsa_message.data.control.value, 0);
- break;
-
- case SND_SEQ_EVENT_PITCHBEND:
- status = 0xE0 | alsa_message.data.control.channel;
- // $$mp 2003-09-23:
- // possible hack to work around a bug in ALSA. Necessary for
- // ALSA 0.9.2. May be fixed in newer versions of ALSA.
- // alsa_message.data.control.value ^= 0x2000;
- // TRACE1("pitchbend value: %d\n", alsa_message.data.control.value);
- set14bitMessage(jdk_message, status,
- alsa_message.data.control.value);
- break;
-
- /* System exclusive messages */
-
- case SND_SEQ_EVENT_SYSEX:
- jdk_message->type = LONG_MESSAGE;
- jdk_message->data.l.size = alsa_message.data.ext.len;
- jdk_message->data.l.data = malloc(alsa_message.data.ext.len);
- if (jdk_message->data.l.data == NULL) {
- ERROR0("< ERROR: MIDI_IN_GetMessage(): out of memory\n");
- free(jdk_message);
- jdk_message = NULL;
- } else {
- memcpy(jdk_message->data.l.data, alsa_message.data.ext.ptr, alsa_message.data.ext.len);
- }
- break;
-
- /* System common messages */
-
- case SND_SEQ_EVENT_QFRAME:
- setShortMessage(jdk_message, 0xF1,
- alsa_message.data.control.value & 0x7F, 0);
- break;
-
- case SND_SEQ_EVENT_SONGPOS:
- set14bitMessage(jdk_message, 0xF2,
- alsa_message.data.control.value);
- break;
-
- case SND_SEQ_EVENT_SONGSEL:
- setShortMessage(jdk_message, 0xF3,
- alsa_message.data.control.value & 0x7F, 0);
- break;
-
- case SND_SEQ_EVENT_TUNE_REQUEST:
- setRealtimeMessage(jdk_message, 0xF6);
- break;
-
- /* System realtime messages */
-
- case SND_SEQ_EVENT_CLOCK:
- setRealtimeMessage(jdk_message, 0xF8);
- break;
-
- case SND_SEQ_EVENT_START:
- setRealtimeMessage(jdk_message, 0xFA);
- break;
-
- case SND_SEQ_EVENT_CONTINUE:
- setRealtimeMessage(jdk_message, 0xFB);
- break;
-
- case SND_SEQ_EVENT_STOP:
- setRealtimeMessage(jdk_message, 0xFC);
- break;
-
- case SND_SEQ_EVENT_SENSING:
- setRealtimeMessage(jdk_message, 0xFE);
- break;
-
- case SND_SEQ_EVENT_RESET:
- setRealtimeMessage(jdk_message, 0xFF);
- break;
-
- default:
- ERROR0("< ERROR: MIDI_IN_GetMessage(): unhandled ALSA MIDI message type\n");
- free(jdk_message);
- jdk_message = NULL;
-
- }
-
- // set timestamp
- if (jdk_message != NULL) {
- jdk_message->timestamp = getMidiTimestamp(handle);
- }
- TRACE1("< MIDI_IN_GetMessage: returning %p\n", jdk_message);
- return jdk_message;
-}
-
-
-void MIDI_IN_ReleaseMessage(MidiDeviceHandle* handle, MidiMessage* msg) {
- if (!msg) {
- ERROR0("< ERROR: MIDI_IN_ReleaseMessage(): message is NULL\n");
- return;
- }
- if (msg->type == LONG_MESSAGE && msg->data.l.data) {
- free(msg->data.l.data);
- }
- free(msg);
-}
-
-#endif /* USE_PLATFORM_MIDI_IN */
diff -r eb72d194235c -r 514c68575523 src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiOut.c
--- a/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiOut.c Fri Mar 23 18:01:52 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,179 +0,0 @@
-/*
- * Copyright (c) 2003, 2007, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#define USE_ERROR
-#define USE_TRACE
-
-#if USE_PLATFORM_MIDI_OUT == TRUE
-
-#include
-#include "PlatformMidi.h"
-#include "PLATFORM_API_LinuxOS_ALSA_MidiUtils.h"
-
-
-
-static int CHANNEL_MESSAGE_LENGTH[] = {
- -1, -1, -1, -1, -1, -1, -1, -1, 3, 3, 3, 3, 2, 2, 3 };
-/* 8x 9x Ax Bx Cx Dx Ex */
-
-static int SYSTEM_MESSAGE_LENGTH[] = {
- -1, 2, 3, 2, -1, -1, 1, 1, 1, -1, 1, 1, 1, -1, 1, 1 };
-/* F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE FF */
-
-
-// the returned length includes the status byte.
-// for illegal messages, -1 is returned.
-static int getShortMessageLength(int status) {
- int dataLength = 0;
- if (status < 0xF0) { // channel voice message
- dataLength = CHANNEL_MESSAGE_LENGTH[(status >> 4) & 0xF];
- } else {
- dataLength = SYSTEM_MESSAGE_LENGTH[status & 0xF];
- }
- return dataLength;
-}
-
-
-/*
- * implementation of the platform-dependent
- * MIDI out functions declared in PlatformMidi.h
- */
-char* MIDI_OUT_GetErrorStr(INT32 err) {
- return (char*) getErrorStr(err);
-}
-
-
-INT32 MIDI_OUT_GetNumDevices() {
- TRACE0("MIDI_OUT_GetNumDevices()\n");
- return getMidiDeviceCount(SND_RAWMIDI_STREAM_OUTPUT);
-}
-
-
-INT32 MIDI_OUT_GetDeviceName(INT32 deviceIndex, char *name, UINT32 nameLength) {
- TRACE0("MIDI_OUT_GetDeviceName()\n");
- return getMidiDeviceName(SND_RAWMIDI_STREAM_OUTPUT, deviceIndex,
- name, nameLength);
-}
-
-
-INT32 MIDI_OUT_GetDeviceVendor(INT32 deviceIndex, char *name, UINT32 nameLength) {
- TRACE0("MIDI_OUT_GetDeviceVendor()\n");
- return getMidiDeviceVendor(deviceIndex, name, nameLength);
-}
-
-
-INT32 MIDI_OUT_GetDeviceDescription(INT32 deviceIndex, char *name, UINT32 nameLength) {
- TRACE0("MIDI_OUT_GetDeviceDescription()\n");
- return getMidiDeviceDescription(SND_RAWMIDI_STREAM_OUTPUT, deviceIndex,
- name, nameLength);
-}
-
-
-INT32 MIDI_OUT_GetDeviceVersion(INT32 deviceIndex, char *name, UINT32 nameLength) {
- TRACE0("MIDI_OUT_GetDeviceVersion()\n");
- return getMidiDeviceVersion(deviceIndex, name, nameLength);
-}
-
-
-/* *************************** MidiOutDevice implementation *************** */
-
-INT32 MIDI_OUT_OpenDevice(INT32 deviceIndex, MidiDeviceHandle** handle) {
- TRACE1("MIDI_OUT_OpenDevice(): deviceIndex: %d\n", (int) deviceIndex);
- return openMidiDevice(SND_RAWMIDI_STREAM_OUTPUT, deviceIndex, handle);
-}
-
-
-INT32 MIDI_OUT_CloseDevice(MidiDeviceHandle* handle) {
- TRACE0("MIDI_OUT_CloseDevice()\n");
- return closeMidiDevice(handle);
-}
-
-
-INT64 MIDI_OUT_GetTimeStamp(MidiDeviceHandle* handle) {
- return getMidiTimestamp(handle);
-}
-
-
-INT32 MIDI_OUT_SendShortMessage(MidiDeviceHandle* handle, UINT32 packedMsg,
- UINT32 timestamp) {
- int err;
- int status;
- int data1;
- int data2;
- char buffer[3];
-
- TRACE2("> MIDI_OUT_SendShortMessage() %x, time: %u\n", packedMsg, (unsigned int) timestamp);
- if (!handle) {
- ERROR0("< ERROR: MIDI_OUT_SendShortMessage(): handle is NULL\n");
- return MIDI_INVALID_HANDLE;
- }
- if (!handle->deviceHandle) {
- ERROR0("< ERROR: MIDI_OUT_SendLongMessage(): native handle is NULL\n");
- return MIDI_INVALID_HANDLE;
- }
- status = (packedMsg & 0xFF);
- buffer[0] = (char) status;
- buffer[1] = (char) ((packedMsg >> 8) & 0xFF);
- buffer[2] = (char) ((packedMsg >> 16) & 0xFF);
- TRACE4("status: %d, data1: %d, data2: %d, length: %d\n", (int) buffer[0], (int) buffer[1], (int) buffer[2], getShortMessageLength(status));
- err = snd_rawmidi_write((snd_rawmidi_t*) handle->deviceHandle, buffer, getShortMessageLength(status));
- if (err < 0) {
- ERROR1(" ERROR: MIDI_OUT_SendShortMessage(): snd_rawmidi_write() returned %d\n", err);
- }
-
- TRACE0("< MIDI_OUT_SendShortMessage()\n");
- return err;
-}
-
-
-INT32 MIDI_OUT_SendLongMessage(MidiDeviceHandle* handle, UBYTE* data,
- UINT32 size, UINT32 timestamp) {
- int err;
-
- TRACE2("> MIDI_OUT_SendLongMessage() size %u, time: %u\n", (unsigned int) size, (unsigned int) timestamp);
- if (!handle) {
- ERROR0("< ERROR: MIDI_OUT_SendLongMessage(): handle is NULL\n");
- return MIDI_INVALID_HANDLE;
- }
- if (!handle->deviceHandle) {
- ERROR0("< ERROR: MIDI_OUT_SendLongMessage(): native handle is NULL\n");
- return MIDI_INVALID_HANDLE;
- }
- if (!data) {
- ERROR0("< ERROR: MIDI_OUT_SendLongMessage(): data is NULL\n");
- return MIDI_INVALID_HANDLE;
- }
- err = snd_rawmidi_write((snd_rawmidi_t*) handle->deviceHandle,
- data, size);
- if (err < 0) {
- ERROR1(" ERROR: MIDI_OUT_SendLongMessage(): snd_rawmidi_write() returned %d\n", err);
- }
-
- TRACE0("< MIDI_OUT_SendLongMessage()\n");
- return err;
-}
-
-
-#endif /* USE_PLATFORM_MIDI_OUT */
diff -r eb72d194235c -r 514c68575523 src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c
--- a/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c Fri Mar 23 18:01:52 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,481 +0,0 @@
-/*
- * Copyright (c) 2003, 2014, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#define USE_ERROR
-#define USE_TRACE
-
-#include "PLATFORM_API_LinuxOS_ALSA_MidiUtils.h"
-#include "PLATFORM_API_LinuxOS_ALSA_CommonUtils.h"
-#include
-#include
-
-static INT64 getTimeInMicroseconds() {
- struct timeval tv;
-
- gettimeofday(&tv, NULL);
- return (tv.tv_sec * 1000000UL) + tv.tv_usec;
-}
-
-
-const char* getErrorStr(INT32 err) {
- return snd_strerror((int) err);
-}
-
-
-
-// callback for iteration through devices
-// returns TRUE if iteration should continue
-typedef int (*DeviceIteratorPtr)(UINT32 deviceID,
- snd_rawmidi_info_t* rawmidi_info,
- snd_ctl_card_info_t* cardinfo,
- void *userData);
-
-// for each ALSA device, call iterator. userData is passed to the iterator
-// returns total number of iterations
-static int iterateRawmidiDevices(snd_rawmidi_stream_t direction,
- DeviceIteratorPtr iterator,
- void* userData) {
- int count = 0;
- int subdeviceCount;
- int card, dev, subDev;
- char devname[16];
- int err;
- snd_ctl_t *handle;
- snd_rawmidi_t *rawmidi;
- snd_rawmidi_info_t *rawmidi_info;
- snd_ctl_card_info_t *card_info, *defcardinfo = NULL;
- UINT32 deviceID;
- int doContinue = TRUE;
-
- snd_rawmidi_info_malloc(&rawmidi_info);
- snd_ctl_card_info_malloc(&card_info);
-
- // 1st try "default" device
- if (direction == SND_RAWMIDI_STREAM_INPUT) {
- err = snd_rawmidi_open(&rawmidi, NULL, ALSA_DEFAULT_DEVICE_NAME,
- SND_RAWMIDI_NONBLOCK);
- } else if (direction == SND_RAWMIDI_STREAM_OUTPUT) {
- err = snd_rawmidi_open(NULL, &rawmidi, ALSA_DEFAULT_DEVICE_NAME,
- SND_RAWMIDI_NONBLOCK);
- } else {
- ERROR0("ERROR: iterateRawmidiDevices(): direction is neither"
- " SND_RAWMIDI_STREAM_INPUT nor SND_RAWMIDI_STREAM_OUTPUT\n");
- err = MIDI_INVALID_ARGUMENT;
- }
- if (err < 0) {
- ERROR1("ERROR: snd_rawmidi_open (\"default\"): %s\n",
- snd_strerror(err));
- } else {
- err = snd_rawmidi_info(rawmidi, rawmidi_info);
-
- snd_rawmidi_close(rawmidi);
- if (err < 0) {
- ERROR1("ERROR: snd_rawmidi_info (\"default\"): %s\n",
- snd_strerror(err));
- } else {
- // try to get card info
- card = snd_rawmidi_info_get_card(rawmidi_info);
- if (card >= 0) {
- sprintf(devname, ALSA_HARDWARE_CARD, card);
- if (snd_ctl_open(&handle, devname, SND_CTL_NONBLOCK) >= 0) {
- if (snd_ctl_card_info(handle, card_info) >= 0) {
- defcardinfo = card_info;
- }
- snd_ctl_close(handle);
- }
- }
- // call calback function for the device
- if (iterator != NULL) {
- doContinue = (*iterator)(ALSA_DEFAULT_DEVICE_ID, rawmidi_info,
- defcardinfo, userData);
- }
- count++;
- }
- }
-
- // iterate cards
- card = -1;
- TRACE0("testing for cards...\n");
- if (snd_card_next(&card) >= 0) {
- TRACE1("Found card %d\n", card);
- while (doContinue && (card >= 0)) {
- sprintf(devname, ALSA_HARDWARE_CARD, card);
- TRACE1("Opening control for alsa rawmidi device \"%s\"...\n", devname);
- err = snd_ctl_open(&handle, devname, SND_CTL_NONBLOCK);
- if (err < 0) {
- ERROR2("ERROR: snd_ctl_open, card=%d: %s\n", card, snd_strerror(err));
- } else {
- TRACE0("snd_ctl_open() SUCCESS\n");
- err = snd_ctl_card_info(handle, card_info);
- if (err < 0) {
- ERROR2("ERROR: snd_ctl_card_info, card=%d: %s\n", card, snd_strerror(err));
- } else {
- TRACE0("snd_ctl_card_info() SUCCESS\n");
- dev = -1;
- while (doContinue) {
- if (snd_ctl_rawmidi_next_device(handle, &dev) < 0) {
- ERROR0("snd_ctl_rawmidi_next_device\n");
- }
- TRACE0("snd_ctl_rawmidi_next_device() SUCCESS\n");
- if (dev < 0) {
- break;
- }
- snd_rawmidi_info_set_device(rawmidi_info, dev);
- snd_rawmidi_info_set_subdevice(rawmidi_info, 0);
- snd_rawmidi_info_set_stream(rawmidi_info, direction);
- err = snd_ctl_rawmidi_info(handle, rawmidi_info);
- TRACE0("after snd_ctl_rawmidi_info()\n");
- if (err < 0) {
- if (err != -ENOENT) {
- ERROR2("ERROR: snd_ctl_rawmidi_info, card=%d: %s", card, snd_strerror(err));
- }
- } else {
- TRACE0("snd_ctl_rawmidi_info() SUCCESS\n");
- subdeviceCount = needEnumerateSubdevices(ALSA_RAWMIDI)
- ? snd_rawmidi_info_get_subdevices_count(rawmidi_info)
- : 1;
- if (iterator!=NULL) {
- for (subDev = 0; subDev < subdeviceCount; subDev++) {
- TRACE3(" Iterating %d,%d,%d\n", card, dev, subDev);
- deviceID = encodeDeviceID(card, dev, subDev);
- doContinue = (*iterator)(deviceID, rawmidi_info,
- card_info, userData);
- count++;
- TRACE0("returned from iterator\n");
- if (!doContinue) {
- break;
- }
- }
- } else {
- count += subdeviceCount;
- }
- }
- } // of while(doContinue)
- }
- snd_ctl_close(handle);
- }
- if (snd_card_next(&card) < 0) {
- break;
- }
- }
- } else {
- ERROR0("No cards found!\n");
- }
- snd_ctl_card_info_free(card_info);
- snd_rawmidi_info_free(rawmidi_info);
- return count;
-}
-
-
-
-int getMidiDeviceCount(snd_rawmidi_stream_t direction) {
- int deviceCount;
- TRACE0("> getMidiDeviceCount()\n");
- initAlsaSupport();
- deviceCount = iterateRawmidiDevices(direction, NULL, NULL);
- TRACE0("< getMidiDeviceCount()\n");
- return deviceCount;
-}
-
-
-
-/*
- userData is assumed to be a pointer to ALSA_MIDIDeviceDescription.
- ALSA_MIDIDeviceDescription->index has to be set to the index of the device
- we want to get information of before this method is called the first time via
- iterateRawmidiDevices(). On each call of this method,
- ALSA_MIDIDeviceDescription->index is decremented. If it is equal to zero,
- we have reached the desired device, so action is taken.
- So after successful completion of iterateRawmidiDevices(),
- ALSA_MIDIDeviceDescription->index is zero. If it isn't, this is an
- indication of an error.
-*/
-static int deviceInfoIterator(UINT32 deviceID, snd_rawmidi_info_t *rawmidi_info,
- snd_ctl_card_info_t *cardinfo, void *userData) {
- char buffer[300];
- ALSA_MIDIDeviceDescription* desc = (ALSA_MIDIDeviceDescription*)userData;
-#ifdef ALSA_MIDI_USE_PLUGHW
- int usePlugHw = 1;
-#else
- int usePlugHw = 0;
-#endif
-
- TRACE0("deviceInfoIterator\n");
- initAlsaSupport();
- if (desc->index == 0) {
- // we found the device with correct index
- desc->deviceID = deviceID;
-
- buffer[0]=' '; buffer[1]='[';
- // buffer[300] is enough to store the actual device string w/o overrun
- getDeviceStringFromDeviceID(&buffer[2], deviceID, usePlugHw, ALSA_RAWMIDI);
- strncat(buffer, "]", sizeof(buffer) - strlen(buffer) - 1);
- strncpy(desc->name,
- (cardinfo != NULL)
- ? snd_ctl_card_info_get_id(cardinfo)
- : snd_rawmidi_info_get_id(rawmidi_info),
- desc->strLen - strlen(buffer));
- strncat(desc->name, buffer, desc->strLen - strlen(desc->name));
- desc->description[0] = 0;
- if (cardinfo != NULL) {
- strncpy(desc->description, snd_ctl_card_info_get_name(cardinfo),
- desc->strLen);
- strncat(desc->description, ", ",
- desc->strLen - strlen(desc->description));
- }
- strncat(desc->description, snd_rawmidi_info_get_id(rawmidi_info),
- desc->strLen - strlen(desc->description));
- strncat(desc->description, ", ", desc->strLen - strlen(desc->description));
- strncat(desc->description, snd_rawmidi_info_get_name(rawmidi_info),
- desc->strLen - strlen(desc->description));
- TRACE2("Returning %s, %s\n", desc->name, desc->description);
- return FALSE; // do not continue iteration
- }
- desc->index--;
- return TRUE;
-}
-
-
-static int getMIDIDeviceDescriptionByIndex(snd_rawmidi_stream_t direction,
- ALSA_MIDIDeviceDescription* desc) {
- initAlsaSupport();
- TRACE1(" getMIDIDeviceDescriptionByIndex (index = %d)\n", desc->index);
- iterateRawmidiDevices(direction, &deviceInfoIterator, desc);
- return (desc->index == 0) ? MIDI_SUCCESS : MIDI_INVALID_DEVICEID;
-}
-
-
-
-int initMIDIDeviceDescription(ALSA_MIDIDeviceDescription* desc, int index) {
- int ret = MIDI_SUCCESS;
- desc->index = index;
- desc->strLen = 200;
- desc->name = (char*) calloc(desc->strLen + 1, 1);
- desc->description = (char*) calloc(desc->strLen + 1, 1);
- if (! desc->name ||
- ! desc->description) {
- ret = MIDI_OUT_OF_MEMORY;
- }
- return ret;
-}
-
-
-void freeMIDIDeviceDescription(ALSA_MIDIDeviceDescription* desc) {
- if (desc->name) {
- free(desc->name);
- }
- if (desc->description) {
- free(desc->description);
- }
-}
-
-
-int getMidiDeviceName(snd_rawmidi_stream_t direction, int index, char *name,
- UINT32 nameLength) {
- ALSA_MIDIDeviceDescription desc;
- int ret;
-
- TRACE1("getMidiDeviceName: nameLength: %d\n", (int) nameLength);
- ret = initMIDIDeviceDescription(&desc, index);
- if (ret == MIDI_SUCCESS) {
- TRACE0("getMidiDeviceName: initMIDIDeviceDescription() SUCCESS\n");
- ret = getMIDIDeviceDescriptionByIndex(direction, &desc);
- if (ret == MIDI_SUCCESS) {
- TRACE1("getMidiDeviceName: desc.name: %s\n", desc.name);
- strncpy(name, desc.name, nameLength - 1);
- name[nameLength - 1] = 0;
- }
- }
- freeMIDIDeviceDescription(&desc);
- return ret;
-}
-
-
-int getMidiDeviceVendor(int index, char *name, UINT32 nameLength) {
- strncpy(name, ALSA_VENDOR, nameLength - 1);
- name[nameLength - 1] = 0;
- return MIDI_SUCCESS;
-}
-
-
-int getMidiDeviceDescription(snd_rawmidi_stream_t direction,
- int index, char *name, UINT32 nameLength) {
- ALSA_MIDIDeviceDescription desc;
- int ret;
-
- ret = initMIDIDeviceDescription(&desc, index);
- if (ret == MIDI_SUCCESS) {
- ret = getMIDIDeviceDescriptionByIndex(direction, &desc);
- if (ret == MIDI_SUCCESS) {
- strncpy(name, desc.description, nameLength - 1);
- name[nameLength - 1] = 0;
- }
- }
- freeMIDIDeviceDescription(&desc);
- return ret;
-}
-
-
-int getMidiDeviceVersion(int index, char *name, UINT32 nameLength) {
- getALSAVersion(name, nameLength);
- return MIDI_SUCCESS;
-}
-
-
-static int getMidiDeviceID(snd_rawmidi_stream_t direction, int index,
- UINT32* deviceID) {
- ALSA_MIDIDeviceDescription desc;
- int ret;
-
- ret = initMIDIDeviceDescription(&desc, index);
- if (ret == MIDI_SUCCESS) {
- ret = getMIDIDeviceDescriptionByIndex(direction, &desc);
- if (ret == MIDI_SUCCESS) {
- // TRACE1("getMidiDeviceName: desc.name: %s\n", desc.name);
- *deviceID = desc.deviceID;
- }
- }
- freeMIDIDeviceDescription(&desc);
- return ret;
-}
-
-
-/*
- direction has to be either SND_RAWMIDI_STREAM_INPUT or
- SND_RAWMIDI_STREAM_OUTPUT.
- Returns 0 on success. Otherwise, MIDI_OUT_OF_MEMORY, MIDI_INVALID_ARGUMENT
- or a negative ALSA error code is returned.
-*/
-INT32 openMidiDevice(snd_rawmidi_stream_t direction, INT32 deviceIndex,
- MidiDeviceHandle** handle) {
- snd_rawmidi_t* native_handle;
- snd_midi_event_t* event_parser = NULL;
- int err;
- UINT32 deviceID = 0;
- char devicename[100];
-#ifdef ALSA_MIDI_USE_PLUGHW
- int usePlugHw = 1;
-#else
- int usePlugHw = 0;
-#endif
-
- TRACE0("> openMidiDevice()\n");
-
- (*handle) = (MidiDeviceHandle*) calloc(sizeof(MidiDeviceHandle), 1);
- if (!(*handle)) {
- ERROR0("ERROR: openDevice: out of memory\n");
- return MIDI_OUT_OF_MEMORY;
- }
-
- // TODO: iterate to get dev ID from index
- err = getMidiDeviceID(direction, deviceIndex, &deviceID);
- TRACE1(" openMidiDevice(): deviceID: %d\n", (int) deviceID);
- getDeviceStringFromDeviceID(devicename, deviceID,
- usePlugHw, ALSA_RAWMIDI);
- TRACE1(" openMidiDevice(): deviceString: %s\n", devicename);
-
- // finally open the device
- if (direction == SND_RAWMIDI_STREAM_INPUT) {
- err = snd_rawmidi_open(&native_handle, NULL, devicename,
- SND_RAWMIDI_NONBLOCK);
- } else if (direction == SND_RAWMIDI_STREAM_OUTPUT) {
- err = snd_rawmidi_open(NULL, &native_handle, devicename,
- SND_RAWMIDI_NONBLOCK);
- } else {
- ERROR0(" ERROR: openMidiDevice(): direction is neither SND_RAWMIDI_STREAM_INPUT nor SND_RAWMIDI_STREAM_OUTPUT\n");
- err = MIDI_INVALID_ARGUMENT;
- }
- if (err < 0) {
- ERROR1("< ERROR: openMidiDevice(): snd_rawmidi_open() returned %d\n", err);
- free(*handle);
- (*handle) = NULL;
- return err;
- }
- /* We opened with non-blocking behaviour to not get hung if the device
- is used by a different process. Writing, however, should
- be blocking. So we change it here. */
- if (direction == SND_RAWMIDI_STREAM_OUTPUT) {
- err = snd_rawmidi_nonblock(native_handle, 0);
- if (err < 0) {
- ERROR1(" ERROR: openMidiDevice(): snd_rawmidi_nonblock() returned %d\n", err);
- snd_rawmidi_close(native_handle);
- free(*handle);
- (*handle) = NULL;
- return err;
- }
- }
- if (direction == SND_RAWMIDI_STREAM_INPUT) {
- err = snd_midi_event_new(EVENT_PARSER_BUFSIZE, &event_parser);
- if (err < 0) {
- ERROR1(" ERROR: openMidiDevice(): snd_midi_event_new() returned %d\n", err);
- snd_rawmidi_close(native_handle);
- free(*handle);
- (*handle) = NULL;
- return err;
- }
- }
-
- (*handle)->deviceHandle = (void*) native_handle;
- (*handle)->startTime = getTimeInMicroseconds();
- (*handle)->platformData = event_parser;
- TRACE0("< openMidiDevice(): succeeded\n");
- return err;
-}
-
-
-
-INT32 closeMidiDevice(MidiDeviceHandle* handle) {
- int err;
-
- TRACE0("> closeMidiDevice()\n");
- if (!handle) {
- ERROR0("< ERROR: closeMidiDevice(): handle is NULL\n");
- return MIDI_INVALID_HANDLE;
- }
- if (!handle->deviceHandle) {
- ERROR0("< ERROR: closeMidiDevice(): native handle is NULL\n");
- return MIDI_INVALID_HANDLE;
- }
- err = snd_rawmidi_close((snd_rawmidi_t*) handle->deviceHandle);
- TRACE1(" snd_rawmidi_close() returns %d\n", err);
- if (handle->platformData) {
- snd_midi_event_free((snd_midi_event_t*) handle->platformData);
- }
- free(handle);
- TRACE0("< closeMidiDevice: succeeded\n");
- return err;
-}
-
-
-INT64 getMidiTimestamp(MidiDeviceHandle* handle) {
- if (!handle) {
- ERROR0("< ERROR: closeMidiDevice(): handle is NULL\n");
- return MIDI_INVALID_HANDLE;
- }
- return getTimeInMicroseconds() - handle->startTime;
-}
-
-
-/* end */
diff -r eb72d194235c -r 514c68575523 src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.h
--- a/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.h Fri Mar 23 18:01:52 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2003, 2007, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#include
-#include "Utilities.h"
-#include "PlatformMidi.h"
-
-
-#ifndef PLATFORM_API_LINUXOS_ALSA_MIDIUTILS_H_INCLUDED
-#define PLATFORM_API_LINUXOS_ALSA_MIDIUTILS_H_INCLUDED
-
-#define EVENT_PARSER_BUFSIZE (2048)
-
-// if this is defined, use plughw: devices
-//#define ALSA_MIDI_USE_PLUGHW
-#undef ALSA_MIDI_USE_PLUGHW
-
-typedef struct tag_ALSA_MIDIDeviceDescription {
- int index; // in
- int strLen; // in
- INT32 deviceID; // out
- char* name; // out
- char* description; // out
-} ALSA_MIDIDeviceDescription;
-
-
-const char* getErrorStr(INT32 err);
-
-/* Returns the number of devices. */
-/* direction is either SND_RAWMIDI_STREAM_OUTPUT or
- SND_RAWMIDI_STREAM_INPUT. */
-int getMidiDeviceCount(snd_rawmidi_stream_t direction);
-
-/* Returns MIDI_SUCCESS or MIDI_INVALID_DEVICEID */
-/* direction is either SND_RAWMIDI_STREAM_OUTPUT or
- SND_RAWMIDI_STREAM_INPUT. */
-int getMidiDeviceName(snd_rawmidi_stream_t direction, int index,
- char *name, UINT32 nameLength);
-
-/* Returns MIDI_SUCCESS or MIDI_INVALID_DEVICEID */
-int getMidiDeviceVendor(int index, char *name, UINT32 nameLength);
-
-/* Returns MIDI_SUCCESS or MIDI_INVALID_DEVICEID */
-/* direction is either SND_RAWMIDI_STREAM_OUTPUT or
- SND_RAWMIDI_STREAM_INPUT. */
-int getMidiDeviceDescription(snd_rawmidi_stream_t direction, int index,
- char *name, UINT32 nameLength);
-
-/* Returns MIDI_SUCCESS or MIDI_INVALID_DEVICEID */
-int getMidiDeviceVersion(int index, char *name, UINT32 nameLength);
-
-// returns 0 on success, otherwise MIDI_OUT_OF_MEMORY or ALSA error code
-/* direction is either SND_RAWMIDI_STREAM_OUTPUT or
- SND_RAWMIDI_STREAM_INPUT. */
-INT32 openMidiDevice(snd_rawmidi_stream_t direction, INT32 deviceIndex,
- MidiDeviceHandle** handle);
-
-// returns 0 on success, otherwise a (negative) ALSA error code
-INT32 closeMidiDevice(MidiDeviceHandle* handle);
-
-INT64 getMidiTimestamp(MidiDeviceHandle* handle);
-
-#endif // PLATFORM_API_LINUXOS_ALSA_MIDIUTILS_H_INCLUDED
diff -r eb72d194235c -r 514c68575523 src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCM.c
--- a/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCM.c Fri Mar 23 18:01:52 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,941 +0,0 @@
-/*
- * Copyright (c) 2002, 2011, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#define USE_ERROR
-#define USE_TRACE
-
-#include "PLATFORM_API_LinuxOS_ALSA_PCMUtils.h"
-#include "PLATFORM_API_LinuxOS_ALSA_CommonUtils.h"
-#include "DirectAudio.h"
-
-#if USE_DAUDIO == TRUE
-
-// GetPosition method 1: based on how many bytes are passed to the kernel driver
-// + does not need much processor resources
-// - not very exact, "jumps"
-// GetPosition method 2: ask kernel about actual position of playback.
-// - very exact
-// - switch to kernel layer for each call
-// GetPosition method 3: use snd_pcm_avail() call - not yet in official ALSA
-// quick tests on a Pentium 200MMX showed max. 1.5% processor usage
-// for playing back a CD-quality file and printing 20x per second a line
-// on the console with the current time. So I guess performance is not such a
-// factor here.
-//#define GET_POSITION_METHOD1
-#define GET_POSITION_METHOD2
-
-
-// The default time for a period in microseconds.
-// For very small buffers, only 2 periods are used.
-#define DEFAULT_PERIOD_TIME 20000 /* 20ms */
-
-///// implemented functions of DirectAudio.h
-
-INT32 DAUDIO_GetDirectAudioDeviceCount() {
- return (INT32) getAudioDeviceCount();
-}
-
-
-INT32 DAUDIO_GetDirectAudioDeviceDescription(INT32 mixerIndex, DirectAudioDeviceDescription* description) {
- ALSA_AudioDeviceDescription adesc;
-
- adesc.index = (int) mixerIndex;
- adesc.strLen = DAUDIO_STRING_LENGTH;
-
- adesc.maxSimultaneousLines = (int*) (&(description->maxSimulLines));
- adesc.deviceID = &(description->deviceID);
- adesc.name = description->name;
- adesc.vendor = description->vendor;
- adesc.description = description->description;
- adesc.version = description->version;
-
- return getAudioDeviceDescriptionByIndex(&adesc);
-}
-
-#define MAX_BIT_INDEX 6
-// returns
-// 6: for anything above 24-bit
-// 5: for 4 bytes sample size, 24-bit
-// 4: for 3 bytes sample size, 24-bit
-// 3: for 3 bytes sample size, 20-bit
-// 2: for 2 bytes sample size, 16-bit
-// 1: for 1 byte sample size, 8-bit
-// 0: for anything else
-int getBitIndex(int sampleSizeInBytes, int significantBits) {
- if (significantBits > 24) return 6;
- if (sampleSizeInBytes == 4 && significantBits == 24) return 5;
- if (sampleSizeInBytes == 3) {
- if (significantBits == 24) return 4;
- if (significantBits == 20) return 3;
- }
- if (sampleSizeInBytes == 2 && significantBits == 16) return 2;
- if (sampleSizeInBytes == 1 && significantBits == 8) return 1;
- return 0;
-}
-
-int getSampleSizeInBytes(int bitIndex, int sampleSizeInBytes) {
- switch(bitIndex) {
- case 1: return 1;
- case 2: return 2;
- case 3: /* fall through */
- case 4: return 3;
- case 5: return 4;
- }
- return sampleSizeInBytes;
-}
-
-int getSignificantBits(int bitIndex, int significantBits) {
- switch(bitIndex) {
- case 1: return 8;
- case 2: return 16;
- case 3: return 20;
- case 4: /* fall through */
- case 5: return 24;
- }
- return significantBits;
-}
-
-void DAUDIO_GetFormats(INT32 mixerIndex, INT32 deviceID, int isSource, void* creator) {
- snd_pcm_t* handle;
- snd_pcm_format_mask_t* formatMask;
- snd_pcm_format_t format;
- snd_pcm_hw_params_t* hwParams;
- int handledBits[MAX_BIT_INDEX+1];
-
- int ret;
- int sampleSizeInBytes, significantBits, isSigned, isBigEndian, enc;
- int origSampleSizeInBytes, origSignificantBits;
- unsigned int channels, minChannels, maxChannels;
- int rate, bitIndex;
-
- for (bitIndex = 0; bitIndex <= MAX_BIT_INDEX; bitIndex++) handledBits[bitIndex] = FALSE;
- if (openPCMfromDeviceID(deviceID, &handle, isSource, TRUE /*query hardware*/) < 0) {
- return;
- }
- ret = snd_pcm_format_mask_malloc(&formatMask);
- if (ret != 0) {
- ERROR1("snd_pcm_format_mask_malloc returned error %d\n", ret);
- } else {
- ret = snd_pcm_hw_params_malloc(&hwParams);
- if (ret != 0) {
- ERROR1("snd_pcm_hw_params_malloc returned error %d\n", ret);
- } else {
- ret = snd_pcm_hw_params_any(handle, hwParams);
- /* snd_pcm_hw_params_any can return a positive value on success too */
- if (ret < 0) {
- ERROR1("snd_pcm_hw_params_any returned error %d\n", ret);
- } else {
- /* for the logic following this code, set ret to 0 to indicate success */
- ret = 0;
- }
- }
- snd_pcm_hw_params_get_format_mask(hwParams, formatMask);
- if (ret == 0) {
- ret = snd_pcm_hw_params_get_channels_min(hwParams, &minChannels);
- if (ret != 0) {
- ERROR1("snd_pcm_hw_params_get_channels_min returned error %d\n", ret);
- }
- }
- if (ret == 0) {
- ret = snd_pcm_hw_params_get_channels_max(hwParams, &maxChannels);
- if (ret != 0) {
- ERROR1("snd_pcm_hw_params_get_channels_max returned error %d\n", ret);
- }
- }
-
- // since we queried the hw: device, for many soundcards, it will only
- // report the maximum number of channels (which is the only way to talk
- // to the hw: device). Since we will, however, open the plughw: device
- // when opening the Source/TargetDataLine, we can safely assume that
- // also the channels 1..maxChannels are available.
-#ifdef ALSA_PCM_USE_PLUGHW
- minChannels = 1;
-#endif
- if (ret == 0) {
- // plughw: supports any sample rate
- rate = -1;
- for (format = 0; format <= SND_PCM_FORMAT_LAST; format++) {
- if (snd_pcm_format_mask_test(formatMask, format)) {
- // format exists
- if (getFormatFromAlsaFormat(format, &origSampleSizeInBytes,
- &origSignificantBits,
- &isSigned, &isBigEndian, &enc)) {
- // now if we use plughw:, we can use any bit size below the
- // natively supported ones. Some ALSA drivers only support the maximum
- // bit size, so we add any sample rates below the reported one.
- // E.g. this iteration reports support for 16-bit.
- // getBitIndex will return 2, so it will add entries for
- // 16-bit (bitIndex=2) and in the next do-while loop iteration,
- // it will decrease bitIndex and will therefore add 8-bit support.
- bitIndex = getBitIndex(origSampleSizeInBytes, origSignificantBits);
- do {
- if (bitIndex == 0
- || bitIndex == MAX_BIT_INDEX
- || !handledBits[bitIndex]) {
- handledBits[bitIndex] = TRUE;
- sampleSizeInBytes = getSampleSizeInBytes(bitIndex, origSampleSizeInBytes);
- significantBits = getSignificantBits(bitIndex, origSignificantBits);
- if (maxChannels - minChannels > MAXIMUM_LISTED_CHANNELS) {
- // avoid too many channels explicitly listed
- // just add -1, min, and max
- DAUDIO_AddAudioFormat(creator, significantBits,
- -1, -1, rate,
- enc, isSigned, isBigEndian);
- DAUDIO_AddAudioFormat(creator, significantBits,
- sampleSizeInBytes * minChannels,
- minChannels, rate,
- enc, isSigned, isBigEndian);
- DAUDIO_AddAudioFormat(creator, significantBits,
- sampleSizeInBytes * maxChannels,
- maxChannels, rate,
- enc, isSigned, isBigEndian);
- } else {
- for (channels = minChannels; channels <= maxChannels; channels++) {
- DAUDIO_AddAudioFormat(creator, significantBits,
- sampleSizeInBytes * channels,
- channels, rate,
- enc, isSigned, isBigEndian);
- }
- }
- }
-#ifndef ALSA_PCM_USE_PLUGHW
- // without plugin, do not add fake formats
- break;
-#endif
- } while (--bitIndex > 0);
- } else {
- TRACE1("could not get format from alsa for format %d\n", format);
- }
- } else {
- //TRACE1("Format %d not supported\n", format);
- }
- } // for loop
- snd_pcm_hw_params_free(hwParams);
- }
- snd_pcm_format_mask_free(formatMask);
- }
- snd_pcm_close(handle);
-}
-
-/** Workaround for cr 7033899, 7030629:
- * dmix plugin doesn't like flush (snd_pcm_drop) when the buffer is empty
- * (just opened, underruned or already flushed).
- * Sometimes it causes PCM falls to -EBADFD error,
- * sometimes causes bufferSize change.
- * To prevent unnecessary flushes AlsaPcmInfo::isRunning & isFlushed are used.
- */
-/* ******* ALSA PCM INFO ******************** */
-typedef struct tag_AlsaPcmInfo {
- snd_pcm_t* handle;
- snd_pcm_hw_params_t* hwParams;
- snd_pcm_sw_params_t* swParams;
- int bufferSizeInBytes;
- int frameSize; // storage size in Bytes
- unsigned int periods;
- snd_pcm_uframes_t periodSize;
- short int isRunning; // see comment above
- short int isFlushed; // see comment above
-#ifdef GET_POSITION_METHOD2
- // to be used exclusively by getBytePosition!
- snd_pcm_status_t* positionStatus;
-#endif
-} AlsaPcmInfo;
-
-
-int setStartThresholdNoCommit(AlsaPcmInfo* info, int useThreshold) {
- int ret;
- int threshold;
-
- if (useThreshold) {
- // start device whenever anything is written to the buffer
- threshold = 1;
- } else {
- // never start the device automatically
- threshold = 2000000000; /* near UINT_MAX */
- }
- ret = snd_pcm_sw_params_set_start_threshold(info->handle, info->swParams, threshold);
- if (ret < 0) {
- ERROR1("Unable to set start threshold mode: %s\n", snd_strerror(ret));
- return FALSE;
- }
- return TRUE;
-}
-
-int setStartThreshold(AlsaPcmInfo* info, int useThreshold) {
- int ret = 0;
-
- if (!setStartThresholdNoCommit(info, useThreshold)) {
- ret = -1;
- }
- if (ret == 0) {
- // commit it
- ret = snd_pcm_sw_params(info->handle, info->swParams);
- if (ret < 0) {
- ERROR1("Unable to set sw params: %s\n", snd_strerror(ret));
- }
- }
- return (ret == 0)?TRUE:FALSE;
-}
-
-
-// returns TRUE if successful
-int setHWParams(AlsaPcmInfo* info,
- float sampleRate,
- int channels,
- int bufferSizeInFrames,
- snd_pcm_format_t format) {
- unsigned int rrate, periodTime, periods;
- int ret, dir;
- snd_pcm_uframes_t alsaBufferSizeInFrames = (snd_pcm_uframes_t) bufferSizeInFrames;
-
- /* choose all parameters */
- ret = snd_pcm_hw_params_any(info->handle, info->hwParams);
- if (ret < 0) {
- ERROR1("Broken configuration: no configurations available: %s\n", snd_strerror(ret));
- return FALSE;
- }
- /* set the interleaved read/write format */
- ret = snd_pcm_hw_params_set_access(info->handle, info->hwParams, SND_PCM_ACCESS_RW_INTERLEAVED);
- if (ret < 0) {
- ERROR1("SND_PCM_ACCESS_RW_INTERLEAVED access type not available: %s\n", snd_strerror(ret));
- return FALSE;
- }
- /* set the sample format */
- ret = snd_pcm_hw_params_set_format(info->handle, info->hwParams, format);
- if (ret < 0) {
- ERROR1("Sample format not available: %s\n", snd_strerror(ret));
- return FALSE;
- }
- /* set the count of channels */
- ret = snd_pcm_hw_params_set_channels(info->handle, info->hwParams, channels);
- if (ret < 0) {
- ERROR2("Channels count (%d) not available: %s\n", channels, snd_strerror(ret));
- return FALSE;
- }
- /* set the stream rate */
- rrate = (int) (sampleRate + 0.5f);
- dir = 0;
- ret = snd_pcm_hw_params_set_rate_near(info->handle, info->hwParams, &rrate, &dir);
- if (ret < 0) {
- ERROR2("Rate %dHz not available for playback: %s\n", (int) (sampleRate+0.5f), snd_strerror(ret));
- return FALSE;
- }
- if ((rrate-sampleRate > 2) || (rrate-sampleRate < - 2)) {
- ERROR2("Rate doesn't match (requested %2.2fHz, got %dHz)\n", sampleRate, rrate);
- return FALSE;
- }
- /* set the buffer time */
- ret = snd_pcm_hw_params_set_buffer_size_near(info->handle, info->hwParams, &alsaBufferSizeInFrames);
- if (ret < 0) {
- ERROR2("Unable to set buffer size to %d frames: %s\n",
- (int) alsaBufferSizeInFrames, snd_strerror(ret));
- return FALSE;
- }
- bufferSizeInFrames = (int) alsaBufferSizeInFrames;
- /* set the period time */
- if (bufferSizeInFrames > 1024) {
- dir = 0;
- periodTime = DEFAULT_PERIOD_TIME;
- ret = snd_pcm_hw_params_set_period_time_near(info->handle, info->hwParams, &periodTime, &dir);
- if (ret < 0) {
- ERROR2("Unable to set period time to %d: %s\n", DEFAULT_PERIOD_TIME, snd_strerror(ret));
- return FALSE;
- }
- } else {
- /* set the period count for very small buffer sizes to 2 */
- dir = 0;
- periods = 2;
- ret = snd_pcm_hw_params_set_periods_near(info->handle, info->hwParams, &periods, &dir);
- if (ret < 0) {
- ERROR2("Unable to set period count to %d: %s\n", /*periods*/ 2, snd_strerror(ret));
- return FALSE;
- }
- }
- /* write the parameters to device */
- ret = snd_pcm_hw_params(info->handle, info->hwParams);
- if (ret < 0) {
- ERROR1("Unable to set hw params: %s\n", snd_strerror(ret));
- return FALSE;
- }
- return TRUE;
-}
-
-// returns 1 if successful
-int setSWParams(AlsaPcmInfo* info) {
- int ret;
-
- /* get the current swparams */
- ret = snd_pcm_sw_params_current(info->handle, info->swParams);
- if (ret < 0) {
- ERROR1("Unable to determine current swparams: %s\n", snd_strerror(ret));
- return FALSE;
- }
- /* never start the transfer automatically */
- if (!setStartThresholdNoCommit(info, FALSE /* don't use threshold */)) {
- return FALSE;
- }
-
- /* allow the transfer when at least period_size samples can be processed */
- ret = snd_pcm_sw_params_set_avail_min(info->handle, info->swParams, info->periodSize);
- if (ret < 0) {
- ERROR1("Unable to set avail min for playback: %s\n", snd_strerror(ret));
- return FALSE;
- }
- /* write the parameters to the playback device */
- ret = snd_pcm_sw_params(info->handle, info->swParams);
- if (ret < 0) {
- ERROR1("Unable to set sw params: %s\n", snd_strerror(ret));
- return FALSE;
- }
- return TRUE;
-}
-
-static snd_output_t* ALSA_OUTPUT = NULL;
-
-void* DAUDIO_Open(INT32 mixerIndex, INT32 deviceID, int isSource,
- int encoding, float sampleRate, int sampleSizeInBits,
- int frameSize, int channels,
- int isSigned, int isBigEndian, int bufferSizeInBytes) {
- snd_pcm_format_mask_t* formatMask;
- snd_pcm_format_t format;
- int dir;
- int ret = 0;
- AlsaPcmInfo* info = NULL;
- /* snd_pcm_uframes_t is 64 bit on 64-bit systems */
- snd_pcm_uframes_t alsaBufferSizeInFrames = 0;
-
-
- TRACE0("> DAUDIO_Open\n");
-#ifdef USE_TRACE
- // for using ALSA debug dump methods
- if (ALSA_OUTPUT == NULL) {
- snd_output_stdio_attach(&ALSA_OUTPUT, stdout, 0);
- }
-#endif
- if (channels <= 0) {
- ERROR1("ERROR: Invalid number of channels=%d!\n", channels);
- return NULL;
- }
- info = (AlsaPcmInfo*) malloc(sizeof(AlsaPcmInfo));
- if (!info) {
- ERROR0("Out of memory\n");
- return NULL;
- }
- memset(info, 0, sizeof(AlsaPcmInfo));
- // initial values are: stopped, flushed
- info->isRunning = 0;
- info->isFlushed = 1;
-
- ret = openPCMfromDeviceID(deviceID, &(info->handle), isSource, FALSE /* do open device*/);
- if (ret == 0) {
- // set to blocking mode
- snd_pcm_nonblock(info->handle, 0);
- ret = snd_pcm_hw_params_malloc(&(info->hwParams));
- if (ret != 0) {
- ERROR1(" snd_pcm_hw_params_malloc returned error %d\n", ret);
- } else {
- ret = -1;
- if (getAlsaFormatFromFormat(&format, frameSize / channels, sampleSizeInBits,
- isSigned, isBigEndian, encoding)) {
- if (setHWParams(info,
- sampleRate,
- channels,
- bufferSizeInBytes / frameSize,
- format)) {
- info->frameSize = frameSize;
- ret = snd_pcm_hw_params_get_period_size(info->hwParams, &info->periodSize, &dir);
- if (ret < 0) {
- ERROR1("ERROR: snd_pcm_hw_params_get_period: %s\n", snd_strerror(ret));
- }
- snd_pcm_hw_params_get_periods(info->hwParams, &(info->periods), &dir);
- snd_pcm_hw_params_get_buffer_size(info->hwParams, &alsaBufferSizeInFrames);
- info->bufferSizeInBytes = (int) alsaBufferSizeInFrames * frameSize;
- TRACE3(" DAUDIO_Open: period size = %d frames, periods = %d. Buffer size: %d bytes.\n",
- (int) info->periodSize, info->periods, info->bufferSizeInBytes);
- }
- }
- }
- if (ret == 0) {
- // set software parameters
- ret = snd_pcm_sw_params_malloc(&(info->swParams));
- if (ret != 0) {
- ERROR1("snd_pcm_hw_params_malloc returned error %d\n", ret);
- } else {
- if (!setSWParams(info)) {
- ret = -1;
- }
- }
- }
- if (ret == 0) {
- // prepare device
- ret = snd_pcm_prepare(info->handle);
- if (ret < 0) {
- ERROR1("ERROR: snd_pcm_prepare: %s\n", snd_strerror(ret));
- }
- }
-
-#ifdef GET_POSITION_METHOD2
- if (ret == 0) {
- ret = snd_pcm_status_malloc(&(info->positionStatus));
- if (ret != 0) {
- ERROR1("ERROR in snd_pcm_status_malloc: %s\n", snd_strerror(ret));
- }
- }
-#endif
- }
- if (ret != 0) {
- DAUDIO_Close((void*) info, isSource);
- info = NULL;
- } else {
- // set to non-blocking mode
- snd_pcm_nonblock(info->handle, 1);
- TRACE1("< DAUDIO_Open: Opened device successfully. Handle=%p\n",
- (void*) info->handle);
- }
- return (void*) info;
-}
-
-#ifdef USE_TRACE
-void printState(snd_pcm_state_t state) {
- if (state == SND_PCM_STATE_OPEN) {
- TRACE0("State: SND_PCM_STATE_OPEN\n");
- }
- else if (state == SND_PCM_STATE_SETUP) {
- TRACE0("State: SND_PCM_STATE_SETUP\n");
- }
- else if (state == SND_PCM_STATE_PREPARED) {
- TRACE0("State: SND_PCM_STATE_PREPARED\n");
- }
- else if (state == SND_PCM_STATE_RUNNING) {
- TRACE0("State: SND_PCM_STATE_RUNNING\n");
- }
- else if (state == SND_PCM_STATE_XRUN) {
- TRACE0("State: SND_PCM_STATE_XRUN\n");
- }
- else if (state == SND_PCM_STATE_DRAINING) {
- TRACE0("State: SND_PCM_STATE_DRAINING\n");
- }
- else if (state == SND_PCM_STATE_PAUSED) {
- TRACE0("State: SND_PCM_STATE_PAUSED\n");
- }
- else if (state == SND_PCM_STATE_SUSPENDED) {
- TRACE0("State: SND_PCM_STATE_SUSPENDED\n");
- }
-}
-#endif
-
-int DAUDIO_Start(void* id, int isSource) {
- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
- int ret;
- snd_pcm_state_t state;
-
- TRACE0("> DAUDIO_Start\n");
- // set to blocking mode
- snd_pcm_nonblock(info->handle, 0);
- // set start mode so that it always starts as soon as data is there
- setStartThreshold(info, TRUE /* use threshold */);
- state = snd_pcm_state(info->handle);
- if (state == SND_PCM_STATE_PAUSED) {
- // in case it was stopped previously
- TRACE0(" Un-pausing...\n");
- ret = snd_pcm_pause(info->handle, FALSE);
- if (ret != 0) {
- ERROR2(" NOTE: error in snd_pcm_pause:%d: %s\n", ret, snd_strerror(ret));
- }
- }
- if (state == SND_PCM_STATE_SUSPENDED) {
- TRACE0(" Resuming...\n");
- ret = snd_pcm_resume(info->handle);
- if (ret < 0) {
- if ((ret != -EAGAIN) && (ret != -ENOSYS)) {
- ERROR2(" ERROR: error in snd_pcm_resume:%d: %s\n", ret, snd_strerror(ret));
- }
- }
- }
- if (state == SND_PCM_STATE_SETUP) {
- TRACE0("need to call prepare again...\n");
- // prepare device
- ret = snd_pcm_prepare(info->handle);
- if (ret < 0) {
- ERROR1("ERROR: snd_pcm_prepare: %s\n", snd_strerror(ret));
- }
- }
- // in case there is still data in the buffers
- ret = snd_pcm_start(info->handle);
- if (ret != 0) {
- if (ret != -EPIPE) {
- ERROR2(" NOTE: error in snd_pcm_start: %d: %s\n", ret, snd_strerror(ret));
- }
- }
- // set to non-blocking mode
- ret = snd_pcm_nonblock(info->handle, 1);
- if (ret != 0) {
- ERROR1(" ERROR in snd_pcm_nonblock: %s\n", snd_strerror(ret));
- }
- state = snd_pcm_state(info->handle);
-#ifdef USE_TRACE
- printState(state);
-#endif
- ret = (state == SND_PCM_STATE_PREPARED)
- || (state == SND_PCM_STATE_RUNNING)
- || (state == SND_PCM_STATE_XRUN)
- || (state == SND_PCM_STATE_SUSPENDED);
- if (ret) {
- info->isRunning = 1;
- // source line should keep isFlushed value until Write() is called;
- // for target data line reset it right now.
- if (!isSource) {
- info->isFlushed = 0;
- }
- }
- TRACE1("< DAUDIO_Start %s\n", ret?"success":"error");
- return ret?TRUE:FALSE;
-}
-
-int DAUDIO_Stop(void* id, int isSource) {
- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
- int ret;
-
- TRACE0("> DAUDIO_Stop\n");
- // set to blocking mode
- snd_pcm_nonblock(info->handle, 0);
- setStartThreshold(info, FALSE /* don't use threshold */); // device will not start after buffer xrun
- ret = snd_pcm_pause(info->handle, 1);
- // set to non-blocking mode
- snd_pcm_nonblock(info->handle, 1);
- if (ret != 0) {
- ERROR1("ERROR in snd_pcm_pause: %s\n", snd_strerror(ret));
- return FALSE;
- }
- info->isRunning = 0;
- TRACE0("< DAUDIO_Stop success\n");
- return TRUE;
-}
-
-void DAUDIO_Close(void* id, int isSource) {
- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
-
- TRACE0("DAUDIO_Close\n");
- if (info != NULL) {
- if (info->handle != NULL) {
- snd_pcm_close(info->handle);
- }
- if (info->hwParams) {
- snd_pcm_hw_params_free(info->hwParams);
- }
- if (info->swParams) {
- snd_pcm_sw_params_free(info->swParams);
- }
-#ifdef GET_POSITION_METHOD2
- if (info->positionStatus) {
- snd_pcm_status_free(info->positionStatus);
- }
-#endif
- free(info);
- }
-}
-
-/*
- * Underrun and suspend recovery
- * returns
- * 0: exit native and return 0
- * 1: try again to write/read
- * -1: error - exit native with return value -1
- */
-int xrun_recovery(AlsaPcmInfo* info, int err) {
- int ret;
-
- if (err == -EPIPE) { /* underrun / overflow */
- TRACE0("xrun_recovery: underrun/overflow.\n");
- ret = snd_pcm_prepare(info->handle);
- if (ret < 0) {
- ERROR1("Can't recover from underrun/overflow, prepare failed: %s\n", snd_strerror(ret));
- return -1;
- }
- return 1;
- } else if (err == -ESTRPIPE) {
- TRACE0("xrun_recovery: suspended.\n");
- ret = snd_pcm_resume(info->handle);
- if (ret < 0) {
- if (ret == -EAGAIN) {
- return 0; /* wait until the suspend flag is released */
- }
- return -1;
- }
- ret = snd_pcm_prepare(info->handle);
- if (ret < 0) {
- ERROR1("Can't recover from underrun/overflow, prepare failed: %s\n", snd_strerror(ret));
- return -1;
- }
- return 1;
- } else if (err == -EAGAIN) {
- TRACE0("xrun_recovery: EAGAIN try again flag.\n");
- return 0;
- }
-
- TRACE2("xrun_recovery: unexpected error %d: %s\n", err, snd_strerror(err));
- return -1;
-}
-
-// returns -1 on error
-int DAUDIO_Write(void* id, char* data, int byteSize) {
- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
- int ret, count;
- snd_pcm_sframes_t frameSize, writtenFrames;
-
- TRACE1("> DAUDIO_Write %d bytes\n", byteSize);
-
- /* sanity */
- if (byteSize <= 0 || info->frameSize <= 0) {
- ERROR2(" DAUDIO_Write: byteSize=%d, frameSize=%d!\n",
- (int) byteSize, (int) info->frameSize);
- TRACE0("< DAUDIO_Write returning -1\n");
- return -1;
- }
-
- count = 2; // maximum number of trials to recover from underrun
- //frameSize = snd_pcm_bytes_to_frames(info->handle, byteSize);
- frameSize = (snd_pcm_sframes_t) (byteSize / info->frameSize);
- do {
- writtenFrames = snd_pcm_writei(info->handle, (const void*) data, (snd_pcm_uframes_t) frameSize);
-
- if (writtenFrames < 0) {
- ret = xrun_recovery(info, (int) writtenFrames);
- if (ret <= 0) {
- TRACE1("DAUDIO_Write: xrun recovery returned %d -> return.\n", ret);
- return ret;
- }
- if (count-- <= 0) {
- ERROR0("DAUDIO_Write: too many attempts to recover from xrun/suspend\n");
- return -1;
- }
- } else {
- break;
- }
- } while (TRUE);
- //ret = snd_pcm_frames_to_bytes(info->handle, writtenFrames);
-
- if (writtenFrames > 0) {
- // reset "flushed" flag
- info->isFlushed = 0;
- }
-
- ret = (int) (writtenFrames * info->frameSize);
- TRACE1("< DAUDIO_Write: returning %d bytes.\n", ret);
- return ret;
-}
-
-// returns -1 on error
-int DAUDIO_Read(void* id, char* data, int byteSize) {
- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
- int ret, count;
- snd_pcm_sframes_t frameSize, readFrames;
-
- TRACE1("> DAUDIO_Read %d bytes\n", byteSize);
- /*TRACE3(" info=%p, data=%p, byteSize=%d\n",
- (void*) info, (void*) data, (int) byteSize);
- TRACE2(" info->frameSize=%d, info->handle=%p\n",
- (int) info->frameSize, (void*) info->handle);
- */
- /* sanity */
- if (byteSize <= 0 || info->frameSize <= 0) {
- ERROR2(" DAUDIO_Read: byteSize=%d, frameSize=%d!\n",
- (int) byteSize, (int) info->frameSize);
- TRACE0("< DAUDIO_Read returning -1\n");
- return -1;
- }
- if (!info->isRunning && info->isFlushed) {
- // PCM has nothing to read
- return 0;
- }
-
- count = 2; // maximum number of trials to recover from error
- //frameSize = snd_pcm_bytes_to_frames(info->handle, byteSize);
- frameSize = (snd_pcm_sframes_t) (byteSize / info->frameSize);
- do {
- readFrames = snd_pcm_readi(info->handle, (void*) data, (snd_pcm_uframes_t) frameSize);
- if (readFrames < 0) {
- ret = xrun_recovery(info, (int) readFrames);
- if (ret <= 0) {
- TRACE1("DAUDIO_Read: xrun recovery returned %d -> return.\n", ret);
- return ret;
- }
- if (count-- <= 0) {
- ERROR0("DAUDIO_Read: too many attempts to recover from xrun/suspend\n");
- return -1;
- }
- } else {
- break;
- }
- } while (TRUE);
- //ret = snd_pcm_frames_to_bytes(info->handle, readFrames);
- ret = (int) (readFrames * info->frameSize);
- TRACE1("< DAUDIO_Read: returning %d bytes.\n", ret);
- return ret;
-}
-
-
-int DAUDIO_GetBufferSize(void* id, int isSource) {
- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
-
- return info->bufferSizeInBytes;
-}
-
-int DAUDIO_StillDraining(void* id, int isSource) {
- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
- snd_pcm_state_t state;
-
- state = snd_pcm_state(info->handle);
- //printState(state);
- //TRACE1("Still draining: %s\n", (state != SND_PCM_STATE_XRUN)?"TRUE":"FALSE");
- return (state == SND_PCM_STATE_RUNNING)?TRUE:FALSE;
-}
-
-
-int DAUDIO_Flush(void* id, int isSource) {
- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
- int ret;
-
- TRACE0("DAUDIO_Flush\n");
-
- if (info->isFlushed) {
- // nothing to drop
- return 1;
- }
-
- ret = snd_pcm_drop(info->handle);
- if (ret != 0) {
- ERROR1("ERROR in snd_pcm_drop: %s\n", snd_strerror(ret));
- return FALSE;
- }
-
- info->isFlushed = 1;
- if (info->isRunning) {
- ret = DAUDIO_Start(id, isSource);
- }
- return ret;
-}
-
-int DAUDIO_GetAvailable(void* id, int isSource) {
- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
- snd_pcm_sframes_t availableInFrames;
- snd_pcm_state_t state;
- int ret;
-
- state = snd_pcm_state(info->handle);
- if (info->isFlushed || state == SND_PCM_STATE_XRUN) {
- // if in xrun state then we have the entire buffer available,
- // not 0 as alsa reports
- ret = info->bufferSizeInBytes;
- } else {
- availableInFrames = snd_pcm_avail_update(info->handle);
- if (availableInFrames < 0) {
- ret = 0;
- } else {
- //ret = snd_pcm_frames_to_bytes(info->handle, availableInFrames);
- ret = (int) (availableInFrames * info->frameSize);
- }
- }
- TRACE1("DAUDIO_GetAvailable returns %d bytes\n", ret);
- return ret;
-}
-
-INT64 estimatePositionFromAvail(AlsaPcmInfo* info, int isSource, INT64 javaBytePos, int availInBytes) {
- // estimate the current position with the buffer size and
- // the available bytes to read or write in the buffer.
- // not an elegant solution - bytePos will stop on xruns,
- // and in race conditions it may jump backwards
- // Advantage is that it is indeed based on the samples that go through
- // the system (rather than time-based methods)
- if (isSource) {
- // javaBytePos is the position that is reached when the current
- // buffer is played completely
- return (INT64) (javaBytePos - info->bufferSizeInBytes + availInBytes);
- } else {
- // javaBytePos is the position that was when the current buffer was empty
- return (INT64) (javaBytePos + availInBytes);
- }
-}
-
-INT64 DAUDIO_GetBytePosition(void* id, int isSource, INT64 javaBytePos) {
- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
- int ret;
- INT64 result = javaBytePos;
- snd_pcm_state_t state;
- state = snd_pcm_state(info->handle);
-
- if (!info->isFlushed && state != SND_PCM_STATE_XRUN) {
-#ifdef GET_POSITION_METHOD2
- snd_timestamp_t* ts;
- snd_pcm_uframes_t framesAvail;
-
- // note: slight race condition if this is called simultaneously from 2 threads
- ret = snd_pcm_status(info->handle, info->positionStatus);
- if (ret != 0) {
- ERROR1("ERROR in snd_pcm_status: %s\n", snd_strerror(ret));
- result = javaBytePos;
- } else {
- // calculate from time value, or from available bytes
- framesAvail = snd_pcm_status_get_avail(info->positionStatus);
- result = estimatePositionFromAvail(info, isSource, javaBytePos, framesAvail * info->frameSize);
- }
-#endif
-#ifdef GET_POSITION_METHOD3
- snd_pcm_uframes_t framesAvail;
- ret = snd_pcm_avail(info->handle, &framesAvail);
- if (ret != 0) {
- ERROR1("ERROR in snd_pcm_avail: %s\n", snd_strerror(ret));
- result = javaBytePos;
- } else {
- result = estimatePositionFromAvail(info, isSource, javaBytePos, framesAvail * info->frameSize);
- }
-#endif
-#ifdef GET_POSITION_METHOD1
- result = estimatePositionFromAvail(info, isSource, javaBytePos, DAUDIO_GetAvailable(id, isSource));
-#endif
- }
- //printf("getbyteposition: javaBytePos=%d , return=%d\n", (int) javaBytePos, (int) result);
- return result;
-}
-
-
-
-void DAUDIO_SetBytePosition(void* id, int isSource, INT64 javaBytePos) {
- /* save to ignore, since GetBytePosition
- * takes the javaBytePos param into account
- */
-}
-
-int DAUDIO_RequiresServicing(void* id, int isSource) {
- // never need servicing on Linux
- return FALSE;
-}
-
-void DAUDIO_Service(void* id, int isSource) {
- // never need servicing on Linux
-}
-
-
-#endif // USE_DAUDIO
diff -r eb72d194235c -r 514c68575523 src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.c
--- a/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.c Fri Mar 23 18:01:52 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,292 +0,0 @@
-/*
- * Copyright (c) 2003, 2014, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-//#define USE_ERROR
-//#define USE_TRACE
-
-#include "PLATFORM_API_LinuxOS_ALSA_PCMUtils.h"
-#include "PLATFORM_API_LinuxOS_ALSA_CommonUtils.h"
-
-
-
-// callback for iteration through devices
-// returns TRUE if iteration should continue
-// NOTE: cardinfo may be NULL (for "default" device)
-typedef int (*DeviceIteratorPtr)(UINT32 deviceID, snd_pcm_info_t* pcminfo,
- snd_ctl_card_info_t* cardinfo, void *userData);
-
-// for each ALSA device, call iterator. userData is passed to the iterator
-// returns total number of iterations
-int iteratePCMDevices(DeviceIteratorPtr iterator, void* userData) {
- int count = 0;
- int subdeviceCount;
- int card, dev, subDev;
- char devname[16];
- int err;
- snd_ctl_t *handle;
- snd_pcm_t *pcm;
- snd_pcm_info_t* pcminfo;
- snd_ctl_card_info_t *cardinfo, *defcardinfo = NULL;
- UINT32 deviceID;
- int doContinue = TRUE;
-
- snd_pcm_info_malloc(&pcminfo);
- snd_ctl_card_info_malloc(&cardinfo);
-
- // 1st try "default" device
- err = snd_pcm_open(&pcm, ALSA_DEFAULT_DEVICE_NAME,
- SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK);
- if (err < 0) {
- // try with the other direction
- err = snd_pcm_open(&pcm, ALSA_DEFAULT_DEVICE_NAME,
- SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK);
- }
- if (err < 0) {
- ERROR1("ERROR: snd_pcm_open (\"default\"): %s\n", snd_strerror(err));
- } else {
- err = snd_pcm_info(pcm, pcminfo);
- snd_pcm_close(pcm);
- if (err < 0) {
- ERROR1("ERROR: snd_pcm_info (\"default\"): %s\n",
- snd_strerror(err));
- } else {
- // try to get card info
- card = snd_pcm_info_get_card(pcminfo);
- if (card >= 0) {
- sprintf(devname, ALSA_HARDWARE_CARD, card);
- if (snd_ctl_open(&handle, devname, SND_CTL_NONBLOCK) >= 0) {
- if (snd_ctl_card_info(handle, cardinfo) >= 0) {
- defcardinfo = cardinfo;
- }
- snd_ctl_close(handle);
- }
- }
- // call callback function for the device
- if (iterator != NULL) {
- doContinue = (*iterator)(ALSA_DEFAULT_DEVICE_ID, pcminfo,
- defcardinfo, userData);
- }
- count++;
- }
- }
-
- // iterate cards
- card = -1;
- while (doContinue) {
- if (snd_card_next(&card) < 0) {
- break;
- }
- if (card < 0) {
- break;
- }
- sprintf(devname, ALSA_HARDWARE_CARD, card);
- TRACE1("Opening alsa device \"%s\"...\n", devname);
- err = snd_ctl_open(&handle, devname, SND_CTL_NONBLOCK);
- if (err < 0) {
- ERROR2("ERROR: snd_ctl_open, card=%d: %s\n",
- card, snd_strerror(err));
- } else {
- err = snd_ctl_card_info(handle, cardinfo);
- if (err < 0) {
- ERROR2("ERROR: snd_ctl_card_info, card=%d: %s\n",
- card, snd_strerror(err));
- } else {
- dev = -1;
- while (doContinue) {
- if (snd_ctl_pcm_next_device(handle, &dev) < 0) {
- ERROR0("snd_ctl_pcm_next_device\n");
- }
- if (dev < 0) {
- break;
- }
- snd_pcm_info_set_device(pcminfo, dev);
- snd_pcm_info_set_subdevice(pcminfo, 0);
- snd_pcm_info_set_stream(pcminfo, SND_PCM_STREAM_PLAYBACK);
- err = snd_ctl_pcm_info(handle, pcminfo);
- if (err == -ENOENT) {
- // try with the other direction
- snd_pcm_info_set_stream(pcminfo, SND_PCM_STREAM_CAPTURE);
- err = snd_ctl_pcm_info(handle, pcminfo);
- }
- if (err < 0) {
- if (err != -ENOENT) {
- ERROR2("ERROR: snd_ctl_pcm_info, card=%d: %s",
- card, snd_strerror(err));
- }
- } else {
- subdeviceCount = needEnumerateSubdevices(ALSA_PCM) ?
- snd_pcm_info_get_subdevices_count(pcminfo) : 1;
- if (iterator!=NULL) {
- for (subDev = 0; subDev < subdeviceCount; subDev++) {
- deviceID = encodeDeviceID(card, dev, subDev);
- doContinue = (*iterator)(deviceID, pcminfo,
- cardinfo, userData);
- count++;
- if (!doContinue) {
- break;
- }
- }
- } else {
- count += subdeviceCount;
- }
- }
- } // of while(doContinue)
- }
- snd_ctl_close(handle);
- }
- }
- snd_ctl_card_info_free(cardinfo);
- snd_pcm_info_free(pcminfo);
- return count;
-}
-
-int getAudioDeviceCount() {
- initAlsaSupport();
- return iteratePCMDevices(NULL, NULL);
-}
-
-int deviceInfoIterator(UINT32 deviceID, snd_pcm_info_t* pcminfo,
- snd_ctl_card_info_t* cardinfo, void* userData) {
- char buffer[300];
- ALSA_AudioDeviceDescription* desc = (ALSA_AudioDeviceDescription*)userData;
-#ifdef ALSA_PCM_USE_PLUGHW
- int usePlugHw = 1;
-#else
- int usePlugHw = 0;
-#endif
-
- initAlsaSupport();
- if (desc->index == 0) {
- // we found the device with correct index
- *(desc->maxSimultaneousLines) = needEnumerateSubdevices(ALSA_PCM) ?
- 1 : snd_pcm_info_get_subdevices_count(pcminfo);
- *desc->deviceID = deviceID;
- buffer[0]=' '; buffer[1]='[';
- // buffer[300] is enough to store the actual device string w/o overrun
- getDeviceStringFromDeviceID(&buffer[2], deviceID, usePlugHw, ALSA_PCM);
- strncat(buffer, "]", sizeof(buffer) - strlen(buffer) - 1);
- strncpy(desc->name,
- (cardinfo != NULL)
- ? snd_ctl_card_info_get_id(cardinfo)
- : snd_pcm_info_get_id(pcminfo),
- desc->strLen - strlen(buffer));
- strncat(desc->name, buffer, desc->strLen - strlen(desc->name));
- strncpy(desc->vendor, "ALSA (http://www.alsa-project.org)", desc->strLen);
- strncpy(desc->description,
- (cardinfo != NULL)
- ? snd_ctl_card_info_get_name(cardinfo)
- : snd_pcm_info_get_name(pcminfo),
- desc->strLen);
- strncat(desc->description, ", ", desc->strLen - strlen(desc->description));
- strncat(desc->description, snd_pcm_info_get_id(pcminfo), desc->strLen - strlen(desc->description));
- strncat(desc->description, ", ", desc->strLen - strlen(desc->description));
- strncat(desc->description, snd_pcm_info_get_name(pcminfo), desc->strLen - strlen(desc->description));
- getALSAVersion(desc->version, desc->strLen);
- TRACE4("Returning %s, %s, %s, %s\n", desc->name, desc->vendor, desc->description, desc->version);
- return FALSE; // do not continue iteration
- }
- desc->index--;
- return TRUE;
-}
-
-// returns 0 if successful
-int openPCMfromDeviceID(int deviceID, snd_pcm_t** handle, int isSource, int hardware) {
- char buffer[200];
- int ret;
-
- initAlsaSupport();
- getDeviceStringFromDeviceID(buffer, deviceID, !hardware, ALSA_PCM);
-
- TRACE1("Opening ALSA device %s\n", buffer);
- ret = snd_pcm_open(handle, buffer,
- isSource?SND_PCM_STREAM_PLAYBACK:SND_PCM_STREAM_CAPTURE,
- SND_PCM_NONBLOCK);
- if (ret != 0) {
- ERROR1("snd_pcm_open returned error code %d \n", ret);
- *handle = NULL;
- }
- return ret;
-}
-
-
-int getAudioDeviceDescriptionByIndex(ALSA_AudioDeviceDescription* desc) {
- initAlsaSupport();
- TRACE1(" getAudioDeviceDescriptionByIndex(mixerIndex = %d\n", desc->index);
- iteratePCMDevices(&deviceInfoIterator, desc);
- return (desc->index == 0)?TRUE:FALSE;
-}
-
-// returns 1 if successful
-// enc: 0 for PCM, 1 for ULAW, 2 for ALAW (see DirectAudio.h)
-int getFormatFromAlsaFormat(snd_pcm_format_t alsaFormat,
- int* sampleSizeInBytes, int* significantBits,
- int* isSigned, int* isBigEndian, int* enc) {
-
- *sampleSizeInBytes = (snd_pcm_format_physical_width(alsaFormat) + 7) / 8;
- *significantBits = snd_pcm_format_width(alsaFormat);
-
- // defaults
- *enc = 0; // PCM
- *isSigned = (snd_pcm_format_signed(alsaFormat) > 0);
- *isBigEndian = (snd_pcm_format_big_endian(alsaFormat) > 0);
-
- // non-PCM formats
- if (alsaFormat == SND_PCM_FORMAT_MU_LAW) { // Mu-Law
- *sampleSizeInBytes = 8; *enc = 1; *significantBits = *sampleSizeInBytes;
- }
- else if (alsaFormat == SND_PCM_FORMAT_A_LAW) { // A-Law
- *sampleSizeInBytes = 8; *enc = 2; *significantBits = *sampleSizeInBytes;
- }
- else if (snd_pcm_format_linear(alsaFormat) < 1) {
- return 0;
- }
- return (*sampleSizeInBytes > 0);
-}
-
-// returns 1 if successful
-int getAlsaFormatFromFormat(snd_pcm_format_t* alsaFormat,
- int sampleSizeInBytes, int significantBits,
- int isSigned, int isBigEndian, int enc) {
- *alsaFormat = SND_PCM_FORMAT_UNKNOWN;
-
- if (enc == 0) {
- *alsaFormat = snd_pcm_build_linear_format(significantBits,
- sampleSizeInBytes * 8,
- isSigned?0:1,
- isBigEndian?1:0);
- }
- else if ((sampleSizeInBytes == 1) && (significantBits == 8)) {
- if (enc == 1) { // ULAW
- *alsaFormat = SND_PCM_FORMAT_MU_LAW;
- }
- else if (enc == 2) { // ALAW
- *alsaFormat = SND_PCM_FORMAT_A_LAW;
- }
- }
- return (*alsaFormat == SND_PCM_FORMAT_UNKNOWN)?0:1;
-}
-
-
-/* end */
diff -r eb72d194235c -r 514c68575523 src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.h
--- a/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.h Fri Mar 23 18:01:52 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2003, 2010, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-// define this with a later version of ALSA than 0.9.0rc3
-// (starting from 1.0.0 it became default behaviour)
-#define ALSA_PCM_NEW_HW_PARAMS_API
-#include
-#include "Utilities.h"
-
-#ifndef PLATFORM_API_LINUXOS_ALSA_PCMUTILS_H_INCLUDED
-#define PLATFORM_API_LINUXOS_ALSA_PCMUTILS_H_INCLUDED
-
-// if this is defined, use plughw: devices
-#define ALSA_PCM_USE_PLUGHW
-//#undef ALSA_PCM_USE_PLUGHW
-
-
-// maximum number of channels that is listed in the formats. If more, than
-// just -1 for channel count is used.
-#define MAXIMUM_LISTED_CHANNELS 32
-
-typedef struct tag_ALSA_AudioDeviceDescription {
- int index; // in
- int strLen; // in
- INT32* deviceID; // out
- int* maxSimultaneousLines; // out
- char* name; // out
- char* vendor; // out
- char* description; // out
- char* version; // out
-} ALSA_AudioDeviceDescription;
-
-
-
-int getAudioDeviceCount();
-int getAudioDeviceDescriptionByIndex(ALSA_AudioDeviceDescription* desc);
-
-// returns ALSA error code, or 0 if successful
-int openPCMfromDeviceID(int deviceID, snd_pcm_t** handle, int isSource, int hardware);
-
-// returns 1 if successful
-// enc: 0 for PCM, 1 for ULAW, 2 for ALAW (see DirectAudio.h)
-int getFormatFromAlsaFormat(snd_pcm_format_t alsaFormat,
- int* sampleSizeInBytes, int* significantBits,
- int* isSigned, int* isBigEndian, int* enc);
-
-int getAlsaFormatFromFormat(snd_pcm_format_t* alsaFormat,
- int sampleSizeInBytes, int significantBits,
- int isSigned, int isBigEndian, int enc);
-
-#endif // PLATFORM_API_LINUXOS_ALSA_PCMUTILS_H_INCLUDED
diff -r eb72d194235c -r 514c68575523 src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_Ports.c
--- a/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_Ports.c Fri Mar 23 18:01:52 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,724 +0,0 @@
-/*
- * Copyright (c) 2003, 2016, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#define USE_ERROR
-//#define USE_TRACE
-
-#include "Ports.h"
-#include "PLATFORM_API_LinuxOS_ALSA_CommonUtils.h"
-#include
-
-#if USE_PORTS == TRUE
-
-#define MAX_ELEMS (300)
-#define MAX_CONTROLS (MAX_ELEMS * 4)
-
-#define CHANNELS_MONO (SND_MIXER_SCHN_LAST + 1)
-#define CHANNELS_STEREO (SND_MIXER_SCHN_LAST + 2)
-
-typedef struct {
- snd_mixer_elem_t* elem;
- INT32 portType; /* one of PORT_XXX_xx */
- char* controlType; /* one of CONTROL_TYPE_xx */
- /* Values: either SND_MIXER_SCHN_FRONT_xx, CHANNELS_MONO or CHANNELS_STEREO.
- For SND_MIXER_SCHN_FRONT_xx, exactly this channel is set/retrieved directly.
- For CHANNELS_MONO, ALSA channel SND_MIXER_SCHN_MONO is set/retrieved directly.
- For CHANNELS_STEREO, ALSA channels SND_MIXER_SCHN_FRONT_LEFT and SND_MIXER_SCHN_FRONT_RIGHT
- are set after a calculation that takes balance into account. Retrieved? Average of both
- channels? (Using a cached value is not a good idea since the value in the HW may have been
- altered.) */
- INT32 channel;
-} PortControl;
-
-
-typedef struct tag_PortMixer {
- snd_mixer_t* mixer_handle;
- /* Number of array elements used in elems and types. */
- int numElems;
- snd_mixer_elem_t** elems;
- /* Array of port types (PORT_SRC_UNKNOWN etc.). Indices are the same as in elems. */
- INT32* types;
- /* Number of array elements used in controls. */
- int numControls;
- PortControl* controls;
-} PortMixer;
-
-
-///// implemented functions of Ports.h
-
-INT32 PORT_GetPortMixerCount() {
- INT32 mixerCount;
- int card;
- char devname[16];
- int err;
- snd_ctl_t *handle;
- snd_ctl_card_info_t* info;
-
- TRACE0("> PORT_GetPortMixerCount\n");
-
- initAlsaSupport();
-
- snd_ctl_card_info_malloc(&info);
- card = -1;
- mixerCount = 0;
- if (snd_card_next(&card) >= 0) {
- while (card >= 0) {
- sprintf(devname, ALSA_HARDWARE_CARD, card);
- TRACE1("PORT_GetPortMixerCount: Opening alsa device \"%s\"...\n", devname);
- err = snd_ctl_open(&handle, devname, 0);
- if (err < 0) {
- ERROR2("ERROR: snd_ctl_open, card=%d: %s\n", card, snd_strerror(err));
- } else {
- mixerCount++;
- snd_ctl_close(handle);
- }
- if (snd_card_next(&card) < 0) {
- break;
- }
- }
- }
- snd_ctl_card_info_free(info);
- TRACE0("< PORT_GetPortMixerCount\n");
- return mixerCount;
-}
-
-
-INT32 PORT_GetPortMixerDescription(INT32 mixerIndex, PortMixerDescription* description) {
- snd_ctl_t* handle;
- snd_ctl_card_info_t* card_info;
- char devname[16];
- int err;
- char buffer[100];
-
- TRACE0("> PORT_GetPortMixerDescription\n");
- snd_ctl_card_info_malloc(&card_info);
-
- sprintf(devname, ALSA_HARDWARE_CARD, (int) mixerIndex);
- TRACE1("Opening alsa device \"%s\"...\n", devname);
- err = snd_ctl_open(&handle, devname, 0);
- if (err < 0) {
- ERROR2("ERROR: snd_ctl_open, card=%d: %s\n", (int) mixerIndex, snd_strerror(err));
- return FALSE;
- }
- err = snd_ctl_card_info(handle, card_info);
- if (err < 0) {
- ERROR2("ERROR: snd_ctl_card_info, card=%d: %s\n", (int) mixerIndex, snd_strerror(err));
- }
- strncpy(description->name, snd_ctl_card_info_get_id(card_info), PORT_STRING_LENGTH - 1);
- sprintf(buffer, " [%s]", devname);
- strncat(description->name, buffer, PORT_STRING_LENGTH - 1 - strlen(description->name));
- strncpy(description->vendor, "ALSA (http://www.alsa-project.org)", PORT_STRING_LENGTH - 1);
- strncpy(description->description, snd_ctl_card_info_get_name(card_info), PORT_STRING_LENGTH - 1);
- strncat(description->description, ", ", PORT_STRING_LENGTH - 1 - strlen(description->description));
- strncat(description->description, snd_ctl_card_info_get_mixername(card_info), PORT_STRING_LENGTH - 1 - strlen(description->description));
- getALSAVersion(description->version, PORT_STRING_LENGTH - 1);
-
- snd_ctl_close(handle);
- snd_ctl_card_info_free(card_info);
- TRACE0("< PORT_GetPortMixerDescription\n");
- return TRUE;
-}
-
-
-void* PORT_Open(INT32 mixerIndex) {
- char devname[16];
- snd_mixer_t* mixer_handle;
- int err;
- PortMixer* handle;
-
- TRACE0("> PORT_Open\n");
- sprintf(devname, ALSA_HARDWARE_CARD, (int) mixerIndex);
- if ((err = snd_mixer_open(&mixer_handle, 0)) < 0) {
- ERROR2("Mixer %s open error: %s", devname, snd_strerror(err));
- return NULL;
- }
- if ((err = snd_mixer_attach(mixer_handle, devname)) < 0) {
- ERROR2("Mixer attach %s error: %s", devname, snd_strerror(err));
- snd_mixer_close(mixer_handle);
- return NULL;
- }
- if ((err = snd_mixer_selem_register(mixer_handle, NULL, NULL)) < 0) {
- ERROR1("Mixer register error: %s", snd_strerror(err));
- snd_mixer_close(mixer_handle);
- return NULL;
- }
- err = snd_mixer_load(mixer_handle);
- if (err < 0) {
- ERROR2("Mixer %s load error: %s", devname, snd_strerror(err));
- snd_mixer_close(mixer_handle);
- return NULL;
- }
- handle = (PortMixer*) calloc(1, sizeof(PortMixer));
- if (handle == NULL) {
- ERROR0("malloc() failed.");
- snd_mixer_close(mixer_handle);
- return NULL;
- }
- handle->numElems = 0;
- handle->elems = (snd_mixer_elem_t**) calloc(MAX_ELEMS, sizeof(snd_mixer_elem_t*));
- if (handle->elems == NULL) {
- ERROR0("malloc() failed.");
- snd_mixer_close(mixer_handle);
- free(handle);
- return NULL;
- }
- handle->types = (INT32*) calloc(MAX_ELEMS, sizeof(INT32));
- if (handle->types == NULL) {
- ERROR0("malloc() failed.");
- snd_mixer_close(mixer_handle);
- free(handle->elems);
- free(handle);
- return NULL;
- }
- handle->controls = (PortControl*) calloc(MAX_CONTROLS, sizeof(PortControl));
- if (handle->controls == NULL) {
- ERROR0("malloc() failed.");
- snd_mixer_close(mixer_handle);
- free(handle->elems);
- free(handle->types);
- free(handle);
- return NULL;
- }
- handle->mixer_handle = mixer_handle;
- // necessary to initialize data structures
- PORT_GetPortCount(handle);
- TRACE0("< PORT_Open\n");
- return handle;
-}
-
-
-void PORT_Close(void* id) {
- TRACE0("> PORT_Close\n");
- if (id != NULL) {
- PortMixer* handle = (PortMixer*) id;
- if (handle->mixer_handle != NULL) {
- snd_mixer_close(handle->mixer_handle);
- }
- if (handle->elems != NULL) {
- free(handle->elems);
- }
- if (handle->types != NULL) {
- free(handle->types);
- }
- if (handle->controls != NULL) {
- free(handle->controls);
- }
- free(handle);
- }
- TRACE0("< PORT_Close\n");
-}
-
-
-
-INT32 PORT_GetPortCount(void* id) {
- PortMixer* portMixer;
- snd_mixer_elem_t *elem;
-
- TRACE0("> PORT_GetPortCount\n");
- if (id == NULL) {
- // $$mp: Should become a descriptive error code (invalid handle).
- return -1;
- }
- portMixer = (PortMixer*) id;
- if (portMixer->numElems == 0) {
- for (elem = snd_mixer_first_elem(portMixer->mixer_handle); elem; elem = snd_mixer_elem_next(elem)) {
- if (!snd_mixer_selem_is_active(elem))
- continue;
- TRACE2("Simple mixer control '%s',%i\n",
- snd_mixer_selem_get_name(elem),
- snd_mixer_selem_get_index(elem));
- if (snd_mixer_selem_has_playback_volume(elem)) {
- portMixer->elems[portMixer->numElems] = elem;
- portMixer->types[portMixer->numElems] = PORT_DST_UNKNOWN;
- portMixer->numElems++;
- }
- // to prevent buffer overflow
- if (portMixer->numElems >= MAX_ELEMS) {
- break;
- }
- /* If an element has both playback an capture volume, it is put into the arrays
- twice. */
- if (snd_mixer_selem_has_capture_volume(elem)) {
- portMixer->elems[portMixer->numElems] = elem;
- portMixer->types[portMixer->numElems] = PORT_SRC_UNKNOWN;
- portMixer->numElems++;
- }
- // to prevent buffer overflow
- if (portMixer->numElems >= MAX_ELEMS) {
- break;
- }
- }
- }
- TRACE0("< PORT_GetPortCount\n");
- return portMixer->numElems;
-}
-
-
-INT32 PORT_GetPortType(void* id, INT32 portIndex) {
- PortMixer* portMixer;
- INT32 type;
- TRACE0("> PORT_GetPortType\n");
- if (id == NULL) {
- // $$mp: Should become a descriptive error code (invalid handle).
- return -1;
- }
- portMixer = (PortMixer*) id;
- if (portIndex < 0 || portIndex >= portMixer->numElems) {
- // $$mp: Should become a descriptive error code (index out of bounds).
- return -1;
- }
- type = portMixer->types[portIndex];
- TRACE0("< PORT_GetPortType\n");
- return type;
-}
-
-
-INT32 PORT_GetPortName(void* id, INT32 portIndex, char* name, INT32 len) {
- PortMixer* portMixer;
- const char* nam;
-
- TRACE0("> PORT_GetPortName\n");
- if (id == NULL) {
- // $$mp: Should become a descriptive error code (invalid handle).
- return -1;
- }
- portMixer = (PortMixer*) id;
- if (portIndex < 0 || portIndex >= portMixer->numElems) {
- // $$mp: Should become a descriptive error code (index out of bounds).
- return -1;
- }
- nam = snd_mixer_selem_get_name(portMixer->elems[portIndex]);
- strncpy(name, nam, len - 1);
- name[len - 1] = 0;
- TRACE0("< PORT_GetPortName\n");
- return TRUE;
-}
-
-
-static int isPlaybackFunction(INT32 portType) {
- return (portType & PORT_DST_MASK);
-}
-
-
-/* Sets portControl to a pointer to the next free array element in the PortControl (pointer)
- array of the passed portMixer. Returns TRUE if successful. May return FALSE if there is no
- free slot. In this case, portControl is not altered */
-static int getControlSlot(PortMixer* portMixer, PortControl** portControl) {
- if (portMixer->numControls >= MAX_CONTROLS) {
- return FALSE;
- } else {
- *portControl = &(portMixer->controls[portMixer->numControls]);
- portMixer->numControls++;
- return TRUE;
- }
-}
-
-
-/* Protect against illegal min-max values, preventing divisions by zero.
- */
-inline static long getRange(long min, long max) {
- if (max > min) {
- return max - min;
- } else {
- return 1;
- }
-}
-
-
-/* Idea: we may specify that if unit is an empty string, the values are linear and if unit is "dB",
- the values are logarithmic.
-*/
-static void* createVolumeControl(PortControlCreator* creator,
- PortControl* portControl,
- snd_mixer_elem_t* elem, int isPlayback) {
- void* control;
- float precision;
- long min, max;
-
- if (isPlayback) {
- snd_mixer_selem_get_playback_volume_range(elem, &min, &max);
- } else {
- snd_mixer_selem_get_capture_volume_range(elem, &min, &max);
- }
- /* $$mp: The volume values retrieved with the ALSA API are strongly supposed to be logarithmic.
- So the following calculation is wrong. However, there is no correct calculation, since
- for equal-distant logarithmic steps, the precision expressed in linear varies over the
- scale. */
- precision = 1.0F / getRange(min, max);
- control = (creator->newFloatControl)(creator, portControl, CONTROL_TYPE_VOLUME, 0.0F, +1.0F, precision, "");
- return control;
-}
-
-
-void PORT_GetControls(void* id, INT32 portIndex, PortControlCreator* creator) {
- PortMixer* portMixer;
- snd_mixer_elem_t* elem;
- void* control;
- PortControl* portControl;
- void* controls[10];
- int numControls;
- char* portName;
- int isPlayback = 0;
- int isMono;
- int isStereo;
- char* type;
- snd_mixer_selem_channel_id_t channel;
- memset(controls, 0, sizeof(controls));
-
- TRACE0("> PORT_GetControls\n");
- if (id == NULL) {
- ERROR0("Invalid handle!");
- // $$mp: an error code should be returned.
- return;
- }
- portMixer = (PortMixer*) id;
- if (portIndex < 0 || portIndex >= portMixer->numElems) {
- ERROR0("Port index out of range!");
- // $$mp: an error code should be returned.
- return;
- }
- numControls = 0;
- elem = portMixer->elems[portIndex];
- if (snd_mixer_selem_has_playback_volume(elem) || snd_mixer_selem_has_capture_volume(elem)) {
- /* Since we've split/duplicated elements with both playback and capture on the recovery
- of elements, we now can assume that we handle only to deal with either playback or
- capture. */
- isPlayback = isPlaybackFunction(portMixer->types[portIndex]);
- isMono = (isPlayback && snd_mixer_selem_is_playback_mono(elem)) ||
- (!isPlayback && snd_mixer_selem_is_capture_mono(elem));
- isStereo = (isPlayback &&
- snd_mixer_selem_has_playback_channel(elem, SND_MIXER_SCHN_FRONT_LEFT) &&
- snd_mixer_selem_has_playback_channel(elem, SND_MIXER_SCHN_FRONT_RIGHT)) ||
- (!isPlayback &&
- snd_mixer_selem_has_capture_channel(elem, SND_MIXER_SCHN_FRONT_LEFT) &&
- snd_mixer_selem_has_capture_channel(elem, SND_MIXER_SCHN_FRONT_RIGHT));
- // single volume control
- if (isMono || isStereo) {
- if (getControlSlot(portMixer, &portControl)) {
- portControl->elem = elem;
- portControl->portType = portMixer->types[portIndex];
- portControl->controlType = CONTROL_TYPE_VOLUME;
- if (isMono) {
- portControl->channel = CHANNELS_MONO;
- } else {
- portControl->channel = CHANNELS_STEREO;
- }
- control = createVolumeControl(creator, portControl, elem, isPlayback);
- if (control != NULL) {
- controls[numControls++] = control;
- }
- }
- } else { // more than two channels, each channels has its own control.
- for (channel = SND_MIXER_SCHN_FRONT_LEFT; channel <= SND_MIXER_SCHN_LAST; channel++) {
- if ((isPlayback && snd_mixer_selem_has_playback_channel(elem, channel)) ||
- (!isPlayback && snd_mixer_selem_has_capture_channel(elem, channel))) {
- if (getControlSlot(portMixer, &portControl)) {
- portControl->elem = elem;
- portControl->portType = portMixer->types[portIndex];
- portControl->controlType = CONTROL_TYPE_VOLUME;
- portControl->channel = channel;
- control = createVolumeControl(creator, portControl, elem, isPlayback);
- // We wrap in a compound control to provide the channel name.
- if (control != NULL) {
- /* $$mp 2003-09-14: The following cast shouln't be necessary. Instead, the
- declaration of PORT_NewCompoundControlPtr in Ports.h should be changed
- to take a const char* parameter. */
- control = (creator->newCompoundControl)(creator, (char*) snd_mixer_selem_channel_name(channel), &control, 1);
- }
- if (control != NULL) {
- controls[numControls++] = control;
- }
- }
- }
- }
- }
- // BALANCE control
- if (isStereo) {
- if (getControlSlot(portMixer, &portControl)) {
- portControl->elem = elem;
- portControl->portType = portMixer->types[portIndex];
- portControl->controlType = CONTROL_TYPE_BALANCE;
- portControl->channel = CHANNELS_STEREO;
- /* $$mp: The value for precision is chosen more or less arbitrarily. */
- control = (creator->newFloatControl)(creator, portControl, CONTROL_TYPE_BALANCE, -1.0F, 1.0F, 0.01F, "");
- if (control != NULL) {
- controls[numControls++] = control;
- }
- }
- }
- }
- if (snd_mixer_selem_has_playback_switch(elem) || snd_mixer_selem_has_capture_switch(elem)) {
- if (getControlSlot(portMixer, &portControl)) {
- type = isPlayback ? CONTROL_TYPE_MUTE : CONTROL_TYPE_SELECT;
- portControl->elem = elem;
- portControl->portType = portMixer->types[portIndex];
- portControl->controlType = type;
- control = (creator->newBooleanControl)(creator, portControl, type);
- if (control != NULL) {
- controls[numControls++] = control;
- }
- }
- }
- /* $$mp 2003-09-14: The following cast shouln't be necessary. Instead, the
- declaration of PORT_NewCompoundControlPtr in Ports.h should be changed
- to take a const char* parameter. */
- portName = (char*) snd_mixer_selem_get_name(elem);
- control = (creator->newCompoundControl)(creator, portName, controls, numControls);
- if (control != NULL) {
- (creator->addControl)(creator, control);
- }
- TRACE0("< PORT_GetControls\n");
-}
-
-
-INT32 PORT_GetIntValue(void* controlIDV) {
- PortControl* portControl = (PortControl*) controlIDV;
- int value = 0;
- snd_mixer_selem_channel_id_t channel;
-
- if (portControl != NULL) {
- switch (portControl->channel) {
- case CHANNELS_MONO:
- channel = SND_MIXER_SCHN_MONO;
- break;
-
- case CHANNELS_STEREO:
- channel = SND_MIXER_SCHN_FRONT_LEFT;
- break;
-
- default:
- channel = portControl->channel;
- }
- if (portControl->controlType == CONTROL_TYPE_MUTE ||
- portControl->controlType == CONTROL_TYPE_SELECT) {
- if (isPlaybackFunction(portControl->portType)) {
- snd_mixer_selem_get_playback_switch(portControl->elem, channel, &value);
- } else {
- snd_mixer_selem_get_capture_switch(portControl->elem, channel, &value);
- }
- if (portControl->controlType == CONTROL_TYPE_MUTE) {
- value = ! value;
- }
- } else {
- ERROR1("PORT_GetIntValue(): inappropriate control type: %s\n",
- portControl->controlType);
- }
- }
- return (INT32) value;
-}
-
-
-void PORT_SetIntValue(void* controlIDV, INT32 value) {
- PortControl* portControl = (PortControl*) controlIDV;
- snd_mixer_selem_channel_id_t channel;
-
- if (portControl != NULL) {
- if (portControl->controlType == CONTROL_TYPE_MUTE) {
- value = ! value;
- }
- if (portControl->controlType == CONTROL_TYPE_MUTE ||
- portControl->controlType == CONTROL_TYPE_SELECT) {
- if (isPlaybackFunction(portControl->portType)) {
- snd_mixer_selem_set_playback_switch_all(portControl->elem, value);
- } else {
- snd_mixer_selem_set_capture_switch_all(portControl->elem, value);
- }
- } else {
- ERROR1("PORT_SetIntValue(): inappropriate control type: %s\n",
- portControl->controlType);
- }
- }
-}
-
-
-static float scaleVolumeValueToNormalized(long value, long min, long max) {
- return (float) (value - min) / getRange(min, max);
-}
-
-
-static long scaleVolumeValueToHardware(float value, long min, long max) {
- return (long)(value * getRange(min, max) + min);
-}
-
-
-float getRealVolume(PortControl* portControl,
- snd_mixer_selem_channel_id_t channel) {
- float fValue;
- long lValue = 0;
- long min = 0;
- long max = 0;
-
- if (isPlaybackFunction(portControl->portType)) {
- snd_mixer_selem_get_playback_volume_range(portControl->elem,
- &min, &max);
- snd_mixer_selem_get_playback_volume(portControl->elem,
- channel, &lValue);
- } else {
- snd_mixer_selem_get_capture_volume_range(portControl->elem,
- &min, &max);
- snd_mixer_selem_get_capture_volume(portControl->elem,
- channel, &lValue);
- }
- fValue = scaleVolumeValueToNormalized(lValue, min, max);
- return fValue;
-}
-
-
-void setRealVolume(PortControl* portControl,
- snd_mixer_selem_channel_id_t channel, float value) {
- long lValue = 0;
- long min = 0;
- long max = 0;
-
- if (isPlaybackFunction(portControl->portType)) {
- snd_mixer_selem_get_playback_volume_range(portControl->elem,
- &min, &max);
- lValue = scaleVolumeValueToHardware(value, min, max);
- snd_mixer_selem_set_playback_volume(portControl->elem,
- channel, lValue);
- } else {
- snd_mixer_selem_get_capture_volume_range(portControl->elem,
- &min, &max);
- lValue = scaleVolumeValueToHardware(value, min, max);
- snd_mixer_selem_set_capture_volume(portControl->elem,
- channel, lValue);
- }
-}
-
-
-static float getFakeBalance(PortControl* portControl) {
- float volL, volR;
-
- // pan is the ratio of left and right
- volL = getRealVolume(portControl, SND_MIXER_SCHN_FRONT_LEFT);
- volR = getRealVolume(portControl, SND_MIXER_SCHN_FRONT_RIGHT);
- if (volL > volR) {
- return -1.0f + (volR / volL);
- }
- else if (volR > volL) {
- return 1.0f - (volL / volR);
- }
- return 0.0f;
-}
-
-
-static float getFakeVolume(PortControl* portControl) {
- float valueL;
- float valueR;
- float value;
-
- valueL = getRealVolume(portControl, SND_MIXER_SCHN_FRONT_LEFT);
- valueR = getRealVolume(portControl, SND_MIXER_SCHN_FRONT_RIGHT);
- // volume is the greater value of both
- value = valueL > valueR ? valueL : valueR ;
- return value;
-}
-
-
-/*
- * sets the unsigned values for left and right volume according to
- * the given volume (0...1) and balance (-1..0..+1)
- */
-static void setFakeVolume(PortControl* portControl, float vol, float bal) {
- float volumeLeft;
- float volumeRight;
-
- if (bal < 0.0f) {
- volumeLeft = vol;
- volumeRight = vol * (bal + 1.0f);
- } else {
- volumeLeft = vol * (1.0f - bal);
- volumeRight = vol;
- }
- setRealVolume(portControl, SND_MIXER_SCHN_FRONT_LEFT, volumeLeft);
- setRealVolume(portControl, SND_MIXER_SCHN_FRONT_RIGHT, volumeRight);
-}
-
-
-float PORT_GetFloatValue(void* controlIDV) {
- PortControl* portControl = (PortControl*) controlIDV;
- float value = 0.0F;
-
- if (portControl != NULL) {
- if (portControl->controlType == CONTROL_TYPE_VOLUME) {
- switch (portControl->channel) {
- case CHANNELS_MONO:
- value = getRealVolume(portControl, SND_MIXER_SCHN_MONO);
- break;
-
- case CHANNELS_STEREO:
- value = getFakeVolume(portControl);
- break;
-
- default:
- value = getRealVolume(portControl, portControl->channel);
- }
- } else if (portControl->controlType == CONTROL_TYPE_BALANCE) {
- if (portControl->channel == CHANNELS_STEREO) {
- value = getFakeBalance(portControl);
- } else {
- ERROR0("PORT_GetFloatValue(): Balance only allowed for stereo channels!\n");
- }
- } else {
- ERROR1("PORT_GetFloatValue(): inappropriate control type: %s!\n",
- portControl->controlType);
- }
- }
- return value;
-}
-
-
-void PORT_SetFloatValue(void* controlIDV, float value) {
- PortControl* portControl = (PortControl*) controlIDV;
-
- if (portControl != NULL) {
- if (portControl->controlType == CONTROL_TYPE_VOLUME) {
- switch (portControl->channel) {
- case CHANNELS_MONO:
- setRealVolume(portControl, SND_MIXER_SCHN_MONO, value);
- break;
-
- case CHANNELS_STEREO:
- setFakeVolume(portControl, value, getFakeBalance(portControl));
- break;
-
- default:
- setRealVolume(portControl, portControl->channel, value);
- }
- } else if (portControl->controlType == CONTROL_TYPE_BALANCE) {
- if (portControl->channel == CHANNELS_STEREO) {
- setFakeVolume(portControl, getFakeVolume(portControl), value);
- } else {
- ERROR0("PORT_SetFloatValue(): Balance only allowed for stereo channels!\n");
- }
- } else {
- ERROR1("PORT_SetFloatValue(): inappropriate control type: %s!\n",
- portControl->controlType);
- }
- }
-}
-
-
-#endif // USE_PORTS
diff -r eb72d194235c -r 514c68575523 src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_PCM.c
--- a/src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_PCM.c Fri Mar 23 18:01:52 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,626 +0,0 @@
-/*
- * Copyright (c) 2003, 2013, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#define USE_ERROR
-#define USE_TRACE
-
-#include "PLATFORM_API_SolarisOS_Utils.h"
-#include "DirectAudio.h"
-
-#if USE_DAUDIO == TRUE
-
-
-// The default buffer time
-#define DEFAULT_PERIOD_TIME_MILLIS 50
-
-///// implemented functions of DirectAudio.h
-
-INT32 DAUDIO_GetDirectAudioDeviceCount() {
- return (INT32) getAudioDeviceCount();
-}
-
-
-INT32 DAUDIO_GetDirectAudioDeviceDescription(INT32 mixerIndex,
- DirectAudioDeviceDescription* description) {
- AudioDeviceDescription desc;
-
- if (getAudioDeviceDescriptionByIndex(mixerIndex, &desc, TRUE)) {
- description->maxSimulLines = desc.maxSimulLines;
- strncpy(description->name, desc.name, DAUDIO_STRING_LENGTH-1);
- description->name[DAUDIO_STRING_LENGTH-1] = 0;
- strncpy(description->vendor, desc.vendor, DAUDIO_STRING_LENGTH-1);
- description->vendor[DAUDIO_STRING_LENGTH-1] = 0;
- strncpy(description->version, desc.version, DAUDIO_STRING_LENGTH-1);
- description->version[DAUDIO_STRING_LENGTH-1] = 0;
- /*strncpy(description->description, desc.description, DAUDIO_STRING_LENGTH-1);*/
- strncpy(description->description, "Solaris Mixer", DAUDIO_STRING_LENGTH-1);
- description->description[DAUDIO_STRING_LENGTH-1] = 0;
- return TRUE;
- }
- return FALSE;
-
-}
-
-#define MAX_SAMPLE_RATES 20
-
-void DAUDIO_GetFormats(INT32 mixerIndex, INT32 deviceID, int isSource, void* creator) {
- int fd = -1;
- AudioDeviceDescription desc;
- am_sample_rates_t *sr;
- /* hardcoded bits and channels */
- int bits[] = {8, 16};
- int bitsCount = 2;
- int channels[] = {1, 2};
- int channelsCount = 2;
- /* for querying sample rates */
- int err;
- int ch, b, s;
-
- TRACE2("DAUDIO_GetFormats, mixer %d, isSource=%d\n", mixerIndex, isSource);
- if (getAudioDeviceDescriptionByIndex(mixerIndex, &desc, FALSE)) {
- fd = open(desc.pathctl, O_RDONLY);
- }
- if (fd < 0) {
- ERROR1("Couldn't open audio device ctl for device %d!\n", mixerIndex);
- return;
- }
-
- /* get sample rates */
- sr = (am_sample_rates_t*) malloc(AUDIO_MIXER_SAMP_RATES_STRUCT_SIZE(MAX_SAMPLE_RATES));
- if (sr == NULL) {
- ERROR1("DAUDIO_GetFormats: out of memory for mixer %d\n", (int) mixerIndex);
- close(fd);
- return;
- }
-
- sr->num_samp_rates = MAX_SAMPLE_RATES;
- sr->type = isSource?AUDIO_PLAY:AUDIO_RECORD;
- sr->samp_rates[0] = -2;
- err = ioctl(fd, AUDIO_MIXER_GET_SAMPLE_RATES, sr);
- if (err < 0) {
- ERROR1(" DAUDIO_GetFormats: AUDIO_MIXER_GET_SAMPLE_RATES failed for mixer %d!\n",
- (int)mixerIndex);
- ERROR2(" -> num_sample_rates=%d sample_rates[0] = %d\n",
- (int) sr->num_samp_rates,
- (int) sr->samp_rates[0]);
- /* Some Solaris 8 drivers fail for get sample rates!
- * Do as if we support all sample rates
- */
- sr->flags = MIXER_SR_LIMITS;
- }
- if ((sr->flags & MIXER_SR_LIMITS)
- || (sr->num_samp_rates > MAX_SAMPLE_RATES)) {
-#ifdef USE_TRACE
- if ((sr->flags & MIXER_SR_LIMITS)) {
- TRACE1(" DAUDIO_GetFormats: floating sample rate allowed by mixer %d\n",
- (int)mixerIndex);
- }
- if (sr->num_samp_rates > MAX_SAMPLE_RATES) {
- TRACE2(" DAUDIO_GetFormats: more than %d formats. Use -1 for sample rates mixer %d\n",
- MAX_SAMPLE_RATES, (int)mixerIndex);
- }
-#endif
- /*
- * Fake it to have only one sample rate: -1
- */
- sr->num_samp_rates = 1;
- sr->samp_rates[0] = -1;
- }
- close(fd);
-
- for (ch = 0; ch < channelsCount; ch++) {
- for (b = 0; b < bitsCount; b++) {
- for (s = 0; s < sr->num_samp_rates; s++) {
- DAUDIO_AddAudioFormat(creator,
- bits[b], /* significant bits */
- 0, /* frameSize: let it be calculated */
- channels[ch],
- (float) ((int) sr->samp_rates[s]),
- DAUDIO_PCM, /* encoding - let's only do PCM */
- (bits[b] > 8)?TRUE:TRUE, /* isSigned */
-#ifdef _LITTLE_ENDIAN
- FALSE /* little endian */
-#else
- (bits[b] > 8)?TRUE:FALSE /* big endian */
-#endif
- );
- }
- }
- }
- free(sr);
-}
-
-
-typedef struct {
- int fd;
- audio_info_t info;
- int bufferSizeInBytes;
- int frameSize; /* storage size in Bytes */
- /* how many bytes were written or read */
- INT32 transferedBytes;
- /* if transferedBytes exceed 32-bit boundary,
- * it will be reset and positionOffset will receive
- * the offset
- */
- INT64 positionOffset;
-} SolPcmInfo;
-
-
-void* DAUDIO_Open(INT32 mixerIndex, INT32 deviceID, int isSource,
- int encoding, float sampleRate, int sampleSizeInBits,
- int frameSize, int channels,
- int isSigned, int isBigEndian, int bufferSizeInBytes) {
- int err = 0;
- int openMode;
- AudioDeviceDescription desc;
- SolPcmInfo* info;
-
- TRACE0("> DAUDIO_Open\n");
- if (encoding != DAUDIO_PCM) {
- ERROR1(" DAUDIO_Open: invalid encoding %d\n", (int) encoding);
- return NULL;
- }
- if (channels <= 0) {
- ERROR1(" DAUDIO_Open: Invalid number of channels=%d!\n", channels);
- return NULL;
- }
-
- info = (SolPcmInfo*) malloc(sizeof(SolPcmInfo));
- if (!info) {
- ERROR0("Out of memory\n");
- return NULL;
- }
- memset(info, 0, sizeof(SolPcmInfo));
- info->frameSize = frameSize;
- info->fd = -1;
-
- if (isSource) {
- openMode = O_WRONLY;
- } else {
- openMode = O_RDONLY;
- }
-
-#ifndef __linux__
- /* blackdown does not use NONBLOCK */
- openMode |= O_NONBLOCK;
-#endif
-
- if (getAudioDeviceDescriptionByIndex(mixerIndex, &desc, FALSE)) {
- info->fd = open(desc.path, openMode);
- }
- if (info->fd < 0) {
- ERROR1("Couldn't open audio device for mixer %d!\n", mixerIndex);
- free(info);
- return NULL;
- }
- /* set to multiple open */
- if (ioctl(info->fd, AUDIO_MIXER_MULTIPLE_OPEN, NULL) >= 0) {
- TRACE1("DAUDIO_Open: %s set to multiple open\n", desc.path);
- } else {
- ERROR1("DAUDIO_Open: ioctl AUDIO_MIXER_MULTIPLE_OPEN failed on %s!\n", desc.path);
- }
-
- AUDIO_INITINFO(&(info->info));
- /* need AUDIO_GETINFO ioctl to get this to work on solaris x86 */
- err = ioctl(info->fd, AUDIO_GETINFO, &(info->info));
-
- /* not valid to call AUDIO_SETINFO ioctl with all the fields from AUDIO_GETINFO. */
- AUDIO_INITINFO(&(info->info));
-
- if (isSource) {
- info->info.play.sample_rate = sampleRate;
- info->info.play.precision = sampleSizeInBits;
- info->info.play.channels = channels;
- info->info.play.encoding = AUDIO_ENCODING_LINEAR;
- info->info.play.buffer_size = bufferSizeInBytes;
- info->info.play.pause = 1;
- } else {
- info->info.record.sample_rate = sampleRate;
- info->info.record.precision = sampleSizeInBits;
- info->info.record.channels = channels;
- info->info.record.encoding = AUDIO_ENCODING_LINEAR;
- info->info.record.buffer_size = bufferSizeInBytes;
- info->info.record.pause = 1;
- }
- err = ioctl(info->fd, AUDIO_SETINFO, &(info->info));
- if (err < 0) {
- ERROR0("DAUDIO_Open: could not set info!\n");
- DAUDIO_Close((void*) info, isSource);
- return NULL;
- }
- DAUDIO_Flush((void*) info, isSource);
-
- err = ioctl(info->fd, AUDIO_GETINFO, &(info->info));
- if (err >= 0) {
- if (isSource) {
- info->bufferSizeInBytes = info->info.play.buffer_size;
- } else {
- info->bufferSizeInBytes = info->info.record.buffer_size;
- }
- TRACE2("DAUDIO: buffersize in bytes: requested=%d, got %d\n",
- (int) bufferSizeInBytes,
- (int) info->bufferSizeInBytes);
- } else {
- ERROR0("DAUDIO_Open: cannot get info!\n");
- DAUDIO_Close((void*) info, isSource);
- return NULL;
- }
- TRACE0("< DAUDIO_Open: Opened device successfully.\n");
- return (void*) info;
-}
-
-
-int DAUDIO_Start(void* id, int isSource) {
- SolPcmInfo* info = (SolPcmInfo*) id;
- int err, modified;
- audio_info_t audioInfo;
-
- TRACE0("> DAUDIO_Start\n");
-
- AUDIO_INITINFO(&audioInfo);
- err = ioctl(info->fd, AUDIO_GETINFO, &audioInfo);
- if (err >= 0) {
- // unpause
- modified = FALSE;
- if (isSource && audioInfo.play.pause) {
- audioInfo.play.pause = 0;
- modified = TRUE;
- }
- if (!isSource && audioInfo.record.pause) {
- audioInfo.record.pause = 0;
- modified = TRUE;
- }
- if (modified) {
- err = ioctl(info->fd, AUDIO_SETINFO, &audioInfo);
- }
- }
-
- TRACE1("< DAUDIO_Start %s\n", (err>=0)?"success":"error");
- return (err >= 0)?TRUE:FALSE;
-}
-
-int DAUDIO_Stop(void* id, int isSource) {
- SolPcmInfo* info = (SolPcmInfo*) id;
- int err, modified;
- audio_info_t audioInfo;
-
- TRACE0("> DAUDIO_Stop\n");
-
- AUDIO_INITINFO(&audioInfo);
- err = ioctl(info->fd, AUDIO_GETINFO, &audioInfo);
- if (err >= 0) {
- // pause
- modified = FALSE;
- if (isSource && !audioInfo.play.pause) {
- audioInfo.play.pause = 1;
- modified = TRUE;
- }
- if (!isSource && !audioInfo.record.pause) {
- audioInfo.record.pause = 1;
- modified = TRUE;
- }
- if (modified) {
- err = ioctl(info->fd, AUDIO_SETINFO, &audioInfo);
- }
- }
-
- TRACE1("< DAUDIO_Stop %s\n", (err>=0)?"success":"error");
- return (err >= 0)?TRUE:FALSE;
-}
-
-void DAUDIO_Close(void* id, int isSource) {
- SolPcmInfo* info = (SolPcmInfo*) id;
-
- TRACE0("DAUDIO_Close\n");
- if (info != NULL) {
- if (info->fd >= 0) {
- DAUDIO_Flush(id, isSource);
- close(info->fd);
- }
- free(info);
- }
-}
-
-#ifndef USE_TRACE
-/* close to 2^31 */
-#define POSITION_MAX 2000000000
-#else
-/* for testing */
-#define POSITION_MAX 1000000
-#endif
-
-void resetErrorFlagAndAdjustPosition(SolPcmInfo* info, int isSource, int count) {
- audio_info_t audioInfo;
- audio_prinfo_t* prinfo;
- int err;
- int offset = -1;
- int underrun = FALSE;
- int devBytes = 0;
-
- if (count > 0) {
- info->transferedBytes += count;
-
- if (isSource) {
- prinfo = &(audioInfo.play);
- } else {
- prinfo = &(audioInfo.record);
- }
- AUDIO_INITINFO(&audioInfo);
- err = ioctl(info->fd, AUDIO_GETINFO, &audioInfo);
- if (err >= 0) {
- underrun = prinfo->error;
- devBytes = prinfo->samples * info->frameSize;
- }
- AUDIO_INITINFO(&audioInfo);
- if (underrun) {
- /* if an underrun occurred, reset */
- ERROR1("DAUDIO_Write/Read: Underrun/overflow: adjusting positionOffset by %d:\n",
- (devBytes - info->transferedBytes));
- ERROR1(" devBytes from %d to 0, ", devBytes);
- ERROR2(" positionOffset from %d to %d ",
- (int) info->positionOffset,
- (int) (info->positionOffset + info->transferedBytes));
- ERROR1(" transferedBytes from %d to 0\n",
- (int) info->transferedBytes);
- prinfo->samples = 0;
- info->positionOffset += info->transferedBytes;
- info->transferedBytes = 0;
- }
- else if (info->transferedBytes > POSITION_MAX) {
- /* we will reset transferedBytes and
- * the samples field in prinfo
- */
- offset = devBytes;
- prinfo->samples = 0;
- }
- /* reset error flag */
- prinfo->error = 0;
-
- err = ioctl(info->fd, AUDIO_SETINFO, &audioInfo);
- if (err >= 0) {
- if (offset > 0) {
- /* upon exit of AUDIO_SETINFO, the samples parameter
- * was set to the previous value. This is our
- * offset.
- */
- TRACE1("Adjust samplePos: offset=%d, ", (int) offset);
- TRACE2("transferedBytes=%d -> %d, ",
- (int) info->transferedBytes,
- (int) (info->transferedBytes - offset));
- TRACE2("positionOffset=%d -> %d\n",
- (int) (info->positionOffset),
- (int) (((int) info->positionOffset) + offset));
- info->transferedBytes -= offset;
- info->positionOffset += offset;
- }
- } else {
- ERROR0("DAUDIO: resetErrorFlagAndAdjustPosition ioctl failed!\n");
- }
- }
-}
-
-// returns -1 on error
-int DAUDIO_Write(void* id, char* data, int byteSize) {
- SolPcmInfo* info = (SolPcmInfo*) id;
- int ret = -1;
-
- TRACE1("> DAUDIO_Write %d bytes\n", byteSize);
- if (info!=NULL) {
- ret = write(info->fd, data, byteSize);
- resetErrorFlagAndAdjustPosition(info, TRUE, ret);
- /* sets ret to -1 if buffer full, no error! */
- if (ret < 0) {
- ret = 0;
- }
- }
- TRACE1("< DAUDIO_Write: returning %d bytes.\n", ret);
- return ret;
-}
-
-// returns -1 on error
-int DAUDIO_Read(void* id, char* data, int byteSize) {
- SolPcmInfo* info = (SolPcmInfo*) id;
- int ret = -1;
-
- TRACE1("> DAUDIO_Read %d bytes\n", byteSize);
- if (info != NULL) {
- ret = read(info->fd, data, byteSize);
- resetErrorFlagAndAdjustPosition(info, TRUE, ret);
- /* sets ret to -1 if buffer full, no error! */
- if (ret < 0) {
- ret = 0;
- }
- }
- TRACE1("< DAUDIO_Read: returning %d bytes.\n", ret);
- return ret;
-}
-
-
-int DAUDIO_GetBufferSize(void* id, int isSource) {
- SolPcmInfo* info = (SolPcmInfo*) id;
- if (info) {
- return info->bufferSizeInBytes;
- }
- return 0;
-}
-
-int DAUDIO_StillDraining(void* id, int isSource) {
- SolPcmInfo* info = (SolPcmInfo*) id;
- audio_info_t audioInfo;
- audio_prinfo_t* prinfo;
- int ret = FALSE;
-
- if (info!=NULL) {
- if (isSource) {
- prinfo = &(audioInfo.play);
- } else {
- prinfo = &(audioInfo.record);
- }
- /* check error flag */
- AUDIO_INITINFO(&audioInfo);
- ioctl(info->fd, AUDIO_GETINFO, &audioInfo);
- ret = (prinfo->error != 0)?FALSE:TRUE;
- }
- return ret;
-}
-
-
-int getDevicePosition(SolPcmInfo* info, int isSource) {
- audio_info_t audioInfo;
- audio_prinfo_t* prinfo;
- int err;
-
- if (isSource) {
- prinfo = &(audioInfo.play);
- } else {
- prinfo = &(audioInfo.record);
- }
- AUDIO_INITINFO(&audioInfo);
- err = ioctl(info->fd, AUDIO_GETINFO, &audioInfo);
- if (err >= 0) {
- /*TRACE2("---> device paused: %d eof=%d\n",
- prinfo->pause, prinfo->eof);
- */
- return (int) (prinfo->samples * info->frameSize);
- }
- ERROR0("DAUDIO: getDevicePosition: ioctl failed!\n");
- return -1;
-}
-
-int DAUDIO_Flush(void* id, int isSource) {
- SolPcmInfo* info = (SolPcmInfo*) id;
- int err = -1;
- int pos;
-
- TRACE0("DAUDIO_Flush\n");
- if (info) {
- if (isSource) {
- err = ioctl(info->fd, I_FLUSH, FLUSHW);
- } else {
- err = ioctl(info->fd, I_FLUSH, FLUSHR);
- }
- if (err >= 0) {
- /* resets the transferedBytes parameter to
- * the current samples count of the device
- */
- pos = getDevicePosition(info, isSource);
- if (pos >= 0) {
- info->transferedBytes = pos;
- }
- }
- }
- if (err < 0) {
- ERROR0("ERROR in DAUDIO_Flush\n");
- }
- return (err < 0)?FALSE:TRUE;
-}
-
-int DAUDIO_GetAvailable(void* id, int isSource) {
- SolPcmInfo* info = (SolPcmInfo*) id;
- int ret = 0;
- int pos;
-
- if (info) {
- /* unfortunately, the STREAMS architecture
- * seems to not have a method for querying
- * the available bytes to read/write!
- * estimate it...
- */
- pos = getDevicePosition(info, isSource);
- if (pos >= 0) {
- if (isSource) {
- /* we usually have written more bytes
- * to the queue than the device position should be
- */
- ret = (info->bufferSizeInBytes) - (info->transferedBytes - pos);
- } else {
- /* for record, the device stream should
- * be usually ahead of our read actions
- */
- ret = pos - info->transferedBytes;
- }
- if (ret > info->bufferSizeInBytes) {
- ERROR2("DAUDIO_GetAvailable: available=%d, too big at bufferSize=%d!\n",
- (int) ret, (int) info->bufferSizeInBytes);
- ERROR2(" devicePos=%d, transferedBytes=%d\n",
- (int) pos, (int) info->transferedBytes);
- ret = info->bufferSizeInBytes;
- }
- else if (ret < 0) {
- ERROR1("DAUDIO_GetAvailable: available=%d, in theory not possible!\n",
- (int) ret);
- ERROR2(" devicePos=%d, transferedBytes=%d\n",
- (int) pos, (int) info->transferedBytes);
- ret = 0;
- }
- }
- }
-
- TRACE1("DAUDIO_GetAvailable returns %d bytes\n", ret);
- return ret;
-}
-
-INT64 DAUDIO_GetBytePosition(void* id, int isSource, INT64 javaBytePos) {
- SolPcmInfo* info = (SolPcmInfo*) id;
- int ret;
- int pos;
- INT64 result = javaBytePos;
-
- if (info) {
- pos = getDevicePosition(info, isSource);
- if (pos >= 0) {
- result = info->positionOffset + pos;
- }
- }
-
- //printf("getbyteposition: javaBytePos=%d , return=%d\n", (int) javaBytePos, (int) result);
- return result;
-}
-
-
-void DAUDIO_SetBytePosition(void* id, int isSource, INT64 javaBytePos) {
- SolPcmInfo* info = (SolPcmInfo*) id;
- int ret;
- int pos;
-
- if (info) {
- pos = getDevicePosition(info, isSource);
- if (pos >= 0) {
- info->positionOffset = javaBytePos - pos;
- }
- }
-}
-
-int DAUDIO_RequiresServicing(void* id, int isSource) {
- // never need servicing on Solaris
- return FALSE;
-}
-
-void DAUDIO_Service(void* id, int isSource) {
- // never need servicing on Solaris
-}
-
-
-#endif // USE_DAUDIO
diff -r eb72d194235c -r 514c68575523 src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Ports.c
--- a/src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Ports.c Fri Mar 23 18:01:52 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,600 +0,0 @@
-/*
- * Copyright (c) 2002, 2016, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#define USE_ERROR
-//#define USE_TRACE
-
-#include "Ports.h"
-#include "PLATFORM_API_SolarisOS_Utils.h"
-
-#if USE_PORTS == TRUE
-
-#define MONITOR_GAIN_STRING "Monitor Gain"
-
-#define ALL_TARGET_PORT_COUNT 6
-
-// define the following to not use audio_prinfo_t.mod_ports
-#define SOLARIS7_COMPATIBLE
-
-// Solaris audio defines
-static int targetPorts[ALL_TARGET_PORT_COUNT] = {
- AUDIO_SPEAKER,
- AUDIO_HEADPHONE,
- AUDIO_LINE_OUT,
- AUDIO_AUX1_OUT,
- AUDIO_AUX2_OUT,
- AUDIO_SPDIF_OUT
-};
-
-static char* targetPortNames[ALL_TARGET_PORT_COUNT] = {
- "Speaker",
- "Headphone",
- "Line Out",
- "AUX1 Out",
- "AUX2 Out",
- "SPDIF Out"
-};
-
-// defined in Ports.h
-static int targetPortJavaSoundMapping[ALL_TARGET_PORT_COUNT] = {
- PORT_DST_SPEAKER,
- PORT_DST_HEADPHONE,
- PORT_DST_LINE_OUT,
- PORT_DST_UNKNOWN,
- PORT_DST_UNKNOWN,
- PORT_DST_UNKNOWN,
-};
-
-#define ALL_SOURCE_PORT_COUNT 7
-
-// Solaris audio defines
-static int sourcePorts[ALL_SOURCE_PORT_COUNT] = {
- AUDIO_MICROPHONE,
- AUDIO_LINE_IN,
- AUDIO_CD,
- AUDIO_AUX1_IN,
- AUDIO_AUX2_IN,
- AUDIO_SPDIF_IN,
- AUDIO_CODEC_LOOPB_IN
-};
-
-static char* sourcePortNames[ALL_SOURCE_PORT_COUNT] = {
- "Microphone In",
- "Line In",
- "Compact Disc In",
- "AUX1 In",
- "AUX2 In",
- "SPDIF In",
- "Internal Loopback"
-};
-
-// Ports.h defines
-static int sourcePortJavaSoundMapping[ALL_SOURCE_PORT_COUNT] = {
- PORT_SRC_MICROPHONE,
- PORT_SRC_LINE_IN,
- PORT_SRC_COMPACT_DISC,
- PORT_SRC_UNKNOWN,
- PORT_SRC_UNKNOWN,
- PORT_SRC_UNKNOWN,
- PORT_SRC_UNKNOWN
-};
-
-struct tag_PortControlID;
-
-typedef struct tag_PortInfo {
- int fd; // file descriptor of the pseudo device
- audio_info_t audioInfo;
- // ports
- int targetPortCount;
- int sourcePortCount;
- // indexes to sourcePorts/targetPorts
- // contains first target ports, then source ports
- int ports[ALL_TARGET_PORT_COUNT + ALL_SOURCE_PORT_COUNT];
- // controls
- int maxControlCount; // upper bound of number of controls
- int usedControlIDs; // number of items already filled in controlIDs
- struct tag_PortControlID* controlIDs; // the control IDs themselves
-} PortInfo;
-
-#define PORT_CONTROL_TYPE_PLAY 0x4000000
-#define PORT_CONTROL_TYPE_RECORD 0x8000000
-#define PORT_CONTROL_TYPE_SELECT_PORT 1
-#define PORT_CONTROL_TYPE_GAIN 2
-#define PORT_CONTROL_TYPE_BALANCE 3
-#define PORT_CONTROL_TYPE_MONITOR_GAIN 10
-#define PORT_CONTROL_TYPE_OUTPUT_MUTED 11
-#define PORT_CONTROL_TYPE_PLAYRECORD_MASK PORT_CONTROL_TYPE_PLAY | PORT_CONTROL_TYPE_RECORD
-#define PORT_CONTROL_TYPE_MASK 0xFFFFFF
-
-
-typedef struct tag_PortControlID {
- PortInfo* portInfo;
- INT32 controlType; // PORT_CONTROL_TYPE_XX
- uint_t port;
-} PortControlID;
-
-
-///// implemented functions of Ports.h
-
-INT32 PORT_GetPortMixerCount() {
- return (INT32) getAudioDeviceCount();
-}
-
-
-INT32 PORT_GetPortMixerDescription(INT32 mixerIndex, PortMixerDescription* description) {
- AudioDeviceDescription desc;
-
- if (getAudioDeviceDescriptionByIndex(mixerIndex, &desc, TRUE)) {
- strncpy(description->name, desc.name, PORT_STRING_LENGTH-1);
- description->name[PORT_STRING_LENGTH-1] = 0;
- strncpy(description->vendor, desc.vendor, PORT_STRING_LENGTH-1);
- description->vendor[PORT_STRING_LENGTH-1] = 0;
- strncpy(description->version, desc.version, PORT_STRING_LENGTH-1);
- description->version[PORT_STRING_LENGTH-1] = 0;
- /*strncpy(description->description, desc.description, PORT_STRING_LENGTH-1);*/
- strncpy(description->description, "Solaris Ports", PORT_STRING_LENGTH-1);
- description->description[PORT_STRING_LENGTH-1] = 0;
- return TRUE;
- }
- return FALSE;
-}
-
-
-void* PORT_Open(INT32 mixerIndex) {
- PortInfo* info = NULL;
- int fd = -1;
- AudioDeviceDescription desc;
- int success = FALSE;
-
- TRACE0("PORT_Open\n");
- if (getAudioDeviceDescriptionByIndex(mixerIndex, &desc, FALSE)) {
- fd = open(desc.pathctl, O_RDWR);
- }
- if (fd < 0) {
- ERROR1("Couldn't open audio device ctl for device %d!\n", mixerIndex);
- return NULL;
- }
-
- info = (PortInfo*) malloc(sizeof(PortInfo));
- if (info != NULL) {
- memset(info, 0, sizeof(PortInfo));
- info->fd = fd;
- success = TRUE;
- }
- if (!success) {
- if (fd >= 0) {
- close(fd);
- }
- PORT_Close((void*) info);
- info = NULL;
- }
- return info;
-}
-
-void PORT_Close(void* id) {
- TRACE0("PORT_Close\n");
- if (id != NULL) {
- PortInfo* info = (PortInfo*) id;
- if (info->fd >= 0) {
- close(info->fd);
- info->fd = -1;
- }
- if (info->controlIDs) {
- free(info->controlIDs);
- info->controlIDs = NULL;
- }
- free(info);
- }
-}
-
-
-
-INT32 PORT_GetPortCount(void* id) {
- int ret = 0;
- PortInfo* info = (PortInfo*) id;
- if (info != NULL) {
- if (!info->targetPortCount && !info->sourcePortCount) {
- int i;
- AUDIO_INITINFO(&info->audioInfo);
- if (ioctl(info->fd, AUDIO_GETINFO, &info->audioInfo) >= 0) {
- for (i = 0; i < ALL_TARGET_PORT_COUNT; i++) {
- if (info->audioInfo.play.avail_ports & targetPorts[i]) {
- info->ports[info->targetPortCount] = i;
- info->targetPortCount++;
- }
-#ifdef SOLARIS7_COMPATIBLE
- TRACE3("Target %d %s: avail=%d\n", i, targetPortNames[i],
- info->audioInfo.play.avail_ports & targetPorts[i]);
-#else
- TRACE4("Target %d %s: avail=%d mod=%d\n", i, targetPortNames[i],
- info->audioInfo.play.avail_ports & targetPorts[i],
- info->audioInfo.play.mod_ports & targetPorts[i]);
-#endif
- }
- for (i = 0; i < ALL_SOURCE_PORT_COUNT; i++) {
- if (info->audioInfo.record.avail_ports & sourcePorts[i]) {
- info->ports[info->targetPortCount + info->sourcePortCount] = i;
- info->sourcePortCount++;
- }
-#ifdef SOLARIS7_COMPATIBLE
- TRACE3("Source %d %s: avail=%d\n", i, sourcePortNames[i],
- info->audioInfo.record.avail_ports & sourcePorts[i]);
-#else
- TRACE4("Source %d %s: avail=%d mod=%d\n", i, sourcePortNames[i],
- info->audioInfo.record.avail_ports & sourcePorts[i],
- info->audioInfo.record.mod_ports & sourcePorts[i]);
-#endif
- }
- }
- }
- ret = info->targetPortCount + info->sourcePortCount;
- }
- return ret;
-}
-
-int isSourcePort(PortInfo* info, INT32 portIndex) {
- return (portIndex >= info->targetPortCount);
-}
-
-INT32 PORT_GetPortType(void* id, INT32 portIndex) {
- PortInfo* info = (PortInfo*) id;
- if ((portIndex >= 0) && (portIndex < PORT_GetPortCount(id))) {
- if (isSourcePort(info, portIndex)) {
- return sourcePortJavaSoundMapping[info->ports[portIndex]];
- } else {
- return targetPortJavaSoundMapping[info->ports[portIndex]];
- }
- }
- return 0;
-}
-
-// pre-condition: portIndex must have been verified!
-char* getPortName(PortInfo* info, INT32 portIndex) {
- char* ret = NULL;
-
- if (isSourcePort(info, portIndex)) {
- ret = sourcePortNames[info->ports[portIndex]];
- } else {
- ret = targetPortNames[info->ports[portIndex]];
- }
- return ret;
-}
-
-INT32 PORT_GetPortName(void* id, INT32 portIndex, char* name, INT32 len) {
- PortInfo* info = (PortInfo*) id;
- char* n;
-
- if ((portIndex >= 0) && (portIndex < PORT_GetPortCount(id))) {
- n = getPortName(info, portIndex);
- if (n) {
- strncpy(name, n, len-1);
- name[len-1] = 0;
- return TRUE;
- }
- }
- return FALSE;
-}
-
-void createPortControl(PortInfo* info, PortControlCreator* creator, INT32 portIndex,
- INT32 type, void** controlObjects, int* controlCount) {
- PortControlID* controlID;
- void* newControl = NULL;
- int controlIndex;
- char* jsType = NULL;
- int isBoolean = FALSE;
-
- TRACE0(">createPortControl\n");
-
- // fill the ControlID structure and add this control
- if (info->usedControlIDs >= info->maxControlCount) {
- ERROR1("not enough free controlIDs !! maxControlIDs = %d\n", info->maxControlCount);
- return;
- }
- controlID = &(info->controlIDs[info->usedControlIDs]);
- controlID->portInfo = info;
- controlID->controlType = type;
- controlIndex = info->ports[portIndex];
- if (isSourcePort(info, portIndex)) {
- controlID->port = sourcePorts[controlIndex];
- } else {
- controlID->port = targetPorts[controlIndex];
- }
- switch (type & PORT_CONTROL_TYPE_MASK) {
- case PORT_CONTROL_TYPE_SELECT_PORT:
- jsType = CONTROL_TYPE_SELECT; isBoolean = TRUE; break;
- case PORT_CONTROL_TYPE_GAIN:
- jsType = CONTROL_TYPE_VOLUME; break;
- case PORT_CONTROL_TYPE_BALANCE:
- jsType = CONTROL_TYPE_BALANCE; break;
- case PORT_CONTROL_TYPE_MONITOR_GAIN:
- jsType = CONTROL_TYPE_VOLUME; break;
- case PORT_CONTROL_TYPE_OUTPUT_MUTED:
- jsType = CONTROL_TYPE_MUTE; isBoolean = TRUE; break;
- }
- if (isBoolean) {
- TRACE0(" PORT_CONTROL_TYPE_BOOLEAN\n");
- newControl = (creator->newBooleanControl)(creator, controlID, jsType);
- }
- else if (jsType == CONTROL_TYPE_BALANCE) {
- TRACE0(" PORT_CONTROL_TYPE_BALANCE\n");
- newControl = (creator->newFloatControl)(creator, controlID, jsType,
- -1.0f, 1.0f, 2.0f / 65.0f, "");
- } else {
- TRACE0(" PORT_CONTROL_TYPE_FLOAT\n");
- newControl = (creator->newFloatControl)(creator, controlID, jsType,
- 0.0f, 1.0f, 1.0f / 256.0f, "");
- }
- if (newControl) {
- controlObjects[*controlCount] = newControl;
- (*controlCount)++;
- info->usedControlIDs++;
- }
- TRACE0("addCompoundControl %d controls\n", *controlCount);
- if (*controlCount) {
- // create compound control and add it to the vector
- compControl = (creator->newCompoundControl)(creator, name, controlObjects, *controlCount);
- if (compControl) {
- TRACE1(" addCompoundControl: calling addControl %p\n", compControl);
- (creator->addControl)(creator, compControl);
- }
- *controlCount = 0;
- }
- TRACE0("addAllControl\n");
- // go through all controls and add them to the vector
- for (i = 0; i < *controlCount; i++) {
- (creator->addControl)(creator, controlObjects[i]);
- }
- *controlCount = 0;
- TRACE0("PORT_GetControls(id=%p, portIndex=%d). controlIDs=%p, maxControlCount=%d\n",
- id, portIndex, info->controlIDs, info->maxControlCount);
- if ((portIndex >= 0) && (portIndex < portCount)) {
- // if the memory isn't reserved for the control structures, allocate it
- if (!info->controlIDs) {
- int maxCount = 0;
- TRACE0("getControl: allocate mem\n");
- // get a maximum number of controls:
- // each port has a select, balance, and volume control.
- maxCount = 3 * portCount;
- // then there is monitorGain and outputMuted
- maxCount += (2 * info->targetPortCount);
- info->maxControlCount = maxCount;
- info->controlIDs = (PortControlID*) malloc(sizeof(PortControlID) * maxCount);
- }
- if (!isSourcePort(info, portIndex)) {
- type = PORT_CONTROL_TYPE_PLAY;
- // add master mute control
- createPortControl(info, creator, portIndex,
- type | PORT_CONTROL_TYPE_OUTPUT_MUTED,
- controls, &controlCount);
- addAllControls(info, creator, controls, &controlCount);
-#ifdef SOLARIS7_COMPATIBLE
- selectable = info->audioInfo.play.avail_ports & targetPorts[info->ports[portIndex]];
-#else
- selectable = info->audioInfo.play.mod_ports & targetPorts[info->ports[portIndex]];
-#endif
- } else {
- type = PORT_CONTROL_TYPE_RECORD;
-#ifdef SOLARIS7_COMPATIBLE
- selectable = info->audioInfo.record.avail_ports & sourcePorts[info->ports[portIndex]];
-#else
- selectable = info->audioInfo.record.mod_ports & sourcePorts[info->ports[portIndex]];
-#endif
- }
- // add a mixer strip with volume, ...
- createPortControl(info, creator, portIndex,
- type | PORT_CONTROL_TYPE_GAIN,
- controls, &controlCount);
- // ... balance, ...
- createPortControl(info, creator, portIndex,
- type | PORT_CONTROL_TYPE_BALANCE,
- controls, &controlCount);
- // ... and select control (if not always on)...
- if (selectable) {
- createPortControl(info, creator, portIndex,
- type | PORT_CONTROL_TYPE_SELECT_PORT,
- controls, &controlCount);
- }
- // ... packaged in a compound control.
- addCompoundControl(info, creator, getPortName(info, portIndex), controls, &controlCount);
-
- if (type == PORT_CONTROL_TYPE_PLAY) {
- // add a single strip for source ports with monitor gain
- createPortControl(info, creator, portIndex,
- type | PORT_CONTROL_TYPE_MONITOR_GAIN,
- controls, &controlCount);
- // also in a compound control
- addCompoundControl(info, creator, MONITOR_GAIN_STRING, controls, &controlCount);
- }
- }
- TRACE0("< PORT_getControls\n");
-}
-
-INT32 PORT_GetIntValue(void* controlIDV) {
- PortControlID* controlID = (PortControlID*) controlIDV;
- audio_info_t audioInfo;
- audio_prinfo_t* prinfo;
-
- AUDIO_INITINFO(&audioInfo);
- if (ioctl(controlID->portInfo->fd, AUDIO_GETINFO, &audioInfo) >= 0) {
- if (controlID->controlType & PORT_CONTROL_TYPE_PLAY) {
- prinfo = &(audioInfo.play);
- } else {
- prinfo = &(audioInfo.record);
- }
- switch (controlID->controlType & PORT_CONTROL_TYPE_MASK) {
- case PORT_CONTROL_TYPE_SELECT_PORT:
- return (prinfo->port & controlID->port)?TRUE:FALSE;
- case PORT_CONTROL_TYPE_OUTPUT_MUTED:
- return (audioInfo.output_muted)?TRUE:FALSE;
- default:
- ERROR1("PORT_GetIntValue: Wrong type %d !\n", controlID->controlType & PORT_CONTROL_TYPE_MASK);
- }
- }
- ERROR0("PORT_GetIntValue: Could not ioctl!\n");
- return 0;
-}
-
-void PORT_SetIntValue(void* controlIDV, INT32 value) {
- PortControlID* controlID = (PortControlID*) controlIDV;
- audio_info_t audioInfo;
- audio_prinfo_t* prinfo;
- int setPort;
-
- if (controlID->controlType & PORT_CONTROL_TYPE_PLAY) {
- prinfo = &(audioInfo.play);
- } else {
- prinfo = &(audioInfo.record);
- }
- switch (controlID->controlType & PORT_CONTROL_TYPE_MASK) {
- case PORT_CONTROL_TYPE_SELECT_PORT:
- // first try to just add this port. if that fails, set ONLY to this port.
- AUDIO_INITINFO(&audioInfo);
- if (ioctl(controlID->portInfo->fd, AUDIO_GETINFO, &audioInfo) >= 0) {
- if (value) {
- setPort = (prinfo->port | controlID->port);
- } else {
- setPort = (prinfo->port - controlID->port);
- }
- AUDIO_INITINFO(&audioInfo);
- prinfo->port = setPort;
- if (ioctl(controlID->portInfo->fd, AUDIO_SETINFO, &audioInfo) < 0) {
- // didn't work. Either this line doesn't support to select several
- // ports at once (e.g. record), or a real error
- if (value) {
- // set to ONLY this port (and disable any other currently selected ports)
- AUDIO_INITINFO(&audioInfo);
- prinfo->port = controlID->port;
- if (ioctl(controlID->portInfo->fd, AUDIO_SETINFO, &audioInfo) < 0) {
- ERROR2("Error setting output select port %d to port %d!\n", controlID->port, controlID->port);
- }
- } else {
- // assume it's an error
- ERROR2("Error setting output select port %d to port %d!\n", controlID->port, setPort);
- }
- }
- break;
- case PORT_CONTROL_TYPE_OUTPUT_MUTED:
- AUDIO_INITINFO(&audioInfo);
- audioInfo.output_muted = (value?TRUE:FALSE);
- if (ioctl(controlID->portInfo->fd, AUDIO_SETINFO, &audioInfo) < 0) {
- ERROR2("Error setting output muted on port %d to %d!\n", controlID->port, value);
- }
- break;
- default:
- ERROR1("PORT_SetIntValue: Wrong type %d !\n", controlID->controlType & PORT_CONTROL_TYPE_MASK);
- }
- }
-}
-
-float PORT_GetFloatValue(void* controlIDV) {
- PortControlID* controlID = (PortControlID*) controlIDV;
- audio_info_t audioInfo;
- audio_prinfo_t* prinfo;
-
- AUDIO_INITINFO(&audioInfo);
- if (ioctl(controlID->portInfo->fd, AUDIO_GETINFO, &audioInfo) >= 0) {
- if (controlID->controlType & PORT_CONTROL_TYPE_PLAY) {
- prinfo = &(audioInfo.play);
- } else {
- prinfo = &(audioInfo.record);
- }
- switch (controlID->controlType & PORT_CONTROL_TYPE_MASK) {
- case PORT_CONTROL_TYPE_GAIN:
- return ((float) (prinfo->gain - AUDIO_MIN_GAIN))
- / ((float) (AUDIO_MAX_GAIN - AUDIO_MIN_GAIN));
- case PORT_CONTROL_TYPE_BALANCE:
- return ((float) ((prinfo->balance - AUDIO_LEFT_BALANCE - AUDIO_MID_BALANCE) << 1))
- / ((float) (AUDIO_RIGHT_BALANCE - AUDIO_LEFT_BALANCE));
- case PORT_CONTROL_TYPE_MONITOR_GAIN:
- return ((float) (audioInfo.monitor_gain - AUDIO_MIN_GAIN))
- / ((float) (AUDIO_MAX_GAIN - AUDIO_MIN_GAIN));
- default:
- ERROR1("PORT_GetFloatValue: Wrong type %d !\n", controlID->controlType & PORT_CONTROL_TYPE_MASK);
- }
- }
- ERROR0("PORT_GetFloatValue: Could not ioctl!\n");
- return 0.0f;
-}
-
-void PORT_SetFloatValue(void* controlIDV, float value) {
- PortControlID* controlID = (PortControlID*) controlIDV;
- audio_info_t audioInfo;
- audio_prinfo_t* prinfo;
-
- AUDIO_INITINFO(&audioInfo);
-
- if (controlID->controlType & PORT_CONTROL_TYPE_PLAY) {
- prinfo = &(audioInfo.play);
- } else {
- prinfo = &(audioInfo.record);
- }
- switch (controlID->controlType & PORT_CONTROL_TYPE_MASK) {
- case PORT_CONTROL_TYPE_GAIN:
- prinfo->gain = AUDIO_MIN_GAIN
- + (int) ((value * ((float) (AUDIO_MAX_GAIN - AUDIO_MIN_GAIN))) + 0.5f);
- break;
- case PORT_CONTROL_TYPE_BALANCE:
- prinfo->balance = AUDIO_LEFT_BALANCE + AUDIO_MID_BALANCE
- + ((int) (value * ((float) ((AUDIO_RIGHT_BALANCE - AUDIO_LEFT_BALANCE) >> 1))) + 0.5f);
- break;
- case PORT_CONTROL_TYPE_MONITOR_GAIN:
- audioInfo.monitor_gain = AUDIO_MIN_GAIN
- + (int) ((value * ((float) (AUDIO_MAX_GAIN - AUDIO_MIN_GAIN))) + 0.5f);
- break;
- default:
- ERROR1("PORT_SetFloatValue: Wrong type %d !\n", controlID->controlType & PORT_CONTROL_TYPE_MASK);
- return;
- }
- if (ioctl(controlID->portInfo->fd, AUDIO_SETINFO, &audioInfo) < 0) {
- ERROR0("PORT_SetFloatValue: Could not ioctl!\n");
- }
-}
-
-#endif // USE_PORTS
diff -r eb72d194235c -r 514c68575523 src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Utils.c
--- a/src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Utils.c Fri Mar 23 18:01:52 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,193 +0,0 @@
-/*
- * Copyright (c) 2002, 2007, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#define USE_ERROR
-#define USE_TRACE
-
-#include "PLATFORM_API_SolarisOS_Utils.h"
-
-#define MAX_AUDIO_DEVICES 20
-
-// not thread safe...
-static AudioDevicePath globalADPaths[MAX_AUDIO_DEVICES];
-static int globalADCount = -1;
-static int globalADCacheTime = -1;
-/* how many seconds do we cache devices */
-#define AD_CACHE_TIME 30
-
-// return seconds
-long getTimeInSeconds() {
- struct timeval tv;
- gettimeofday(&tv, NULL);
- return tv.tv_sec;
-}
-
-
-int getAudioDeviceCount() {
- int count = MAX_AUDIO_DEVICES;
-
- getAudioDevices(globalADPaths, &count);
- return count;
-}
-
-/* returns TRUE if the path exists at all */
-int addAudioDevice(char* path, AudioDevicePath* adPath, int* count) {
- int i;
- int found = 0;
- int fileExists = 0;
- // not thread safe...
- static struct stat statBuf;
-
- // get stats on the file
- if (stat(path, &statBuf) == 0) {
- // file exists.
- fileExists = 1;
- // If it is not yet in the adPath array, add it to the array
- for (i = 0; i < *count; i++) {
- if (adPath[i].st_ino == statBuf.st_ino
- && adPath[i].st_dev == statBuf.st_dev) {
- found = 1;
- break;
- }
- }
- if (!found) {
- adPath[*count].st_ino = statBuf.st_ino;
- adPath[*count].st_dev = statBuf.st_dev;
- strncpy(adPath[*count].path, path, MAX_NAME_LENGTH);
- adPath[*count].path[MAX_NAME_LENGTH - 1] = 0;
- (*count)++;
- TRACE1("Added audio device %s\n", path);
- }
- }
- return fileExists;
-}
-
-
-void getAudioDevices(AudioDevicePath* adPath, int* count) {
- int maxCount = *count;
- char* audiodev;
- char devsound[15];
- int i;
- long timeInSeconds = getTimeInSeconds();
-
- if (globalADCount < 0
- || (getTimeInSeconds() - globalADCacheTime) > AD_CACHE_TIME
- || (adPath != globalADPaths)) {
- *count = 0;
- // first device, if set, is AUDIODEV variable
- audiodev = getenv("AUDIODEV");
- if (audiodev != NULL && audiodev[0] != 0) {
- addAudioDevice(audiodev, adPath, count);
- }
- // then try /dev/audio
- addAudioDevice("/dev/audio", adPath, count);
- // then go through all of the /dev/sound/? devices
- for (i = 0; i < 100; i++) {
- sprintf(devsound, "/dev/sound/%d", i);
- if (!addAudioDevice(devsound, adPath, count)) {
- break;
- }
- }
- if (adPath == globalADPaths) {
- /* commit cache */
- globalADCount = *count;
- /* set cache time */
- globalADCacheTime = timeInSeconds;
- }
- } else {
- /* return cache */
- *count = globalADCount;
- }
- // that's it
-}
-
-int getAudioDeviceDescriptionByIndex(int index, AudioDeviceDescription* adDesc, int getNames) {
- int count = MAX_AUDIO_DEVICES;
- int ret = 0;
-
- getAudioDevices(globalADPaths, &count);
- if (index>=0 && index < count) {
- ret = getAudioDeviceDescription(globalADPaths[index].path, adDesc, getNames);
- }
- return ret;
-}
-
-int getAudioDeviceDescription(char* path, AudioDeviceDescription* adDesc, int getNames) {
- int fd;
- int mixerMode;
- int len;
- audio_info_t info;
- audio_device_t deviceInfo;
-
- strncpy(adDesc->path, path, MAX_NAME_LENGTH);
- adDesc->path[MAX_NAME_LENGTH] = 0;
- strcpy(adDesc->pathctl, adDesc->path);
- strcat(adDesc->pathctl, "ctl");
- strcpy(adDesc->name, adDesc->path);
- adDesc->vendor[0] = 0;
- adDesc->version[0] = 0;
- adDesc->description[0] = 0;
- adDesc->maxSimulLines = 1;
-
- // try to open the pseudo device and get more information
- fd = open(adDesc->pathctl, O_WRONLY | O_NONBLOCK);
- if (fd >= 0) {
- close(fd);
- if (getNames) {
- fd = open(adDesc->pathctl, O_RDONLY);
- if (fd >= 0) {
- if (ioctl(fd, AUDIO_GETDEV, &deviceInfo) >= 0) {
- strncpy(adDesc->vendor, deviceInfo.name, MAX_AUDIO_DEV_LEN);
- adDesc->vendor[MAX_AUDIO_DEV_LEN] = 0;
- strncpy(adDesc->version, deviceInfo.version, MAX_AUDIO_DEV_LEN);
- adDesc->version[MAX_AUDIO_DEV_LEN] = 0;
- /* add config string to the dev name
- * creates a string like "/dev/audio (onboard1)"
- */
- len = strlen(adDesc->name) + 1;
- if (MAX_NAME_LENGTH - len > 3) {
- strcat(adDesc->name, " (");
- strncat(adDesc->name, deviceInfo.config, MAX_NAME_LENGTH - len);
- strcat(adDesc->name, ")");
- }
- adDesc->name[MAX_NAME_LENGTH-1] = 0;
- }
- if (ioctl(fd, AUDIO_MIXERCTL_GET_MODE, &mixerMode) >= 0) {
- if (mixerMode == AM_MIXER_MODE) {
- TRACE1(" getAudioDeviceDescription: %s is in mixer mode\n", adDesc->path);
- adDesc->maxSimulLines = -1;
- }
- } else {
- ERROR1("ioctl AUDIO_MIXERCTL_GET_MODE failed on %s!\n", adDesc->path);
- }
- close(fd);
- } else {
- ERROR1("could not open %s!\n", adDesc->pathctl);
- }
- }
- return 1;
- }
- return 0;
-}
diff -r eb72d194235c -r 514c68575523 src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Utils.h
--- a/src/java.desktop/unix/native/libjsound/PLATFORM_API_SolarisOS_Utils.h Fri Mar 23 18:01:52 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2002, 2013, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * 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.
- */
-
-#include
-#include
-#include
-#include
-/* does not work on Solaris 2.7 */
-#include
-#include
-#include
-#ifndef __linux__
-#include
-#endif
-#include
-#include
-#include
-
-#ifndef PLATFORM_API_SOLARISOS_UTILS_H_INCLUDED
-#define PLATFORM_API_SOLARISOS_UTILS_H_INCLUDED
-
-/* defines for Solaris 2.7
- #ifndef AUDIO_AUX1_OUT
- #define AUDIO_AUX1_OUT (0x08) // output to aux1 out
- #define AUDIO_AUX2_OUT (0x10) // output to aux2 out
- #define AUDIO_SPDIF_OUT (0x20) // output to SPDIF port
- #define AUDIO_AUX1_IN (0x08) // input from aux1 in
- #define AUDIO_AUX2_IN (0x10) // input from aux2 in
- #define AUDIO_SPDIF_IN (0x20) // input from SPDIF port
- #endif
-*/
-
-/* input from Codec inter. loopback */
-#ifndef AUDIO_CODEC_LOOPB_IN
-#define AUDIO_CODEC_LOOPB_IN (0x40)
-#endif
-
-
-#define MAX_NAME_LENGTH 300
-
-typedef struct tag_AudioDevicePath {
- char path[MAX_NAME_LENGTH];
- ino_t st_ino; // inode number to detect duplicate devices
- dev_t st_dev; // device ID to detect duplicate audio devices
-} AudioDevicePath;
-
-typedef struct tag_AudioDeviceDescription {
- INT32 maxSimulLines;
- char path[MAX_NAME_LENGTH+1];
- char pathctl[MAX_NAME_LENGTH+4];
- char name[MAX_NAME_LENGTH+1];
- char vendor[MAX_NAME_LENGTH+1];
- char version[MAX_NAME_LENGTH+1];
- char description[MAX_NAME_LENGTH+1];
-} AudioDeviceDescription;
-
-int getAudioDeviceCount();
-
-/*
- * adPath is an array of AudioDevicePath structures
- * count contains initially the number of elements in adPath
- * and will be set to the returned number of paths.
- */
-void getAudioDevices(AudioDevicePath* adPath, int* count);
-
-/*
- * fills adDesc from the audio device given in path
- * returns 0 if an error occurred
- * if getNames is 0, only path and pathctl are filled
- */
-int getAudioDeviceDescription(char* path, AudioDeviceDescription* adDesc, int getNames);
-int getAudioDeviceDescriptionByIndex(int index, AudioDeviceDescription* adDesc, int getNames);
-
-
-#endif // PLATFORM_API_SOLARISOS_UTILS_H_INCLUDED
diff -r eb72d194235c -r 514c68575523 src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java
--- a/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.desktop/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java Fri Mar 23 18:44:47 2018 +0000
@@ -38,7 +38,6 @@
import java.awt.peer.WindowPeer;
import java.util.ArrayList;
-import jdk.internal.perf.PerfCounter;
import sun.awt.AWTAccessor;
import sun.awt.AWTAccessor.ComponentAccessor;
import sun.awt.Win32GraphicsDevice;
@@ -70,9 +69,6 @@
if (d3dAvailable) {
// we don't use pixel formats for the d3d pipeline
pfDisabled = true;
- PerfCounter.getD3DAvailable().set(1);
- } else {
- PerfCounter.getD3DAvailable().set(0);
}
}
diff -r eb72d194235c -r 514c68575523 src/java.desktop/windows/native/libawt/windows/awt_Component.cpp
--- a/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp Fri Mar 23 18:44:47 2018 +0000
@@ -7127,9 +7127,9 @@
{
TRY;
- return (jboolean)AwtToolkit::GetInstance().SyncCall(
+ return (jboolean)((intptr_t)AwtToolkit::GetInstance().SyncCall(
(void *(*)(void *))AwtComponent::_NativeHandlesWheelScrolling,
- env->NewGlobalRef(self));
+ env->NewGlobalRef(self)));
// global ref is deleted in _NativeHandlesWheelScrolling
CATCH_BAD_ALLOC_RET(NULL);
@@ -7148,9 +7148,9 @@
jobject selfGlobalRef = env->NewGlobalRef(self);
- return (jboolean)AwtToolkit::GetInstance().SyncCall(
+ return (jboolean)((intptr_t)AwtToolkit::GetInstance().SyncCall(
(void*(*)(void*))AwtComponent::_IsObscured,
- (void *)selfGlobalRef);
+ (void *)selfGlobalRef));
// selfGlobalRef is deleted in _IsObscured
CATCH_BAD_ALLOC_RET(NULL);
diff -r eb72d194235c -r 514c68575523 src/java.desktop/windows/native/libawt/windows/awt_Desktop.cpp
--- a/src/java.desktop/windows/native/libawt/windows/awt_Desktop.cpp Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Desktop.cpp Fri Mar 23 18:44:47 2018 +0000
@@ -92,7 +92,7 @@
JNU_ReleaseStringPlatformChars(env, fileOrUri_j, fileOrUri_c);
JNU_ReleaseStringPlatformChars(env, verb_j, verb_c);
- if ((int)retval <= 32) {
+ if ((int)((intptr_t)retval) <= 32) {
// ShellExecute failed.
LPTSTR buffer = NULL;
int len = ::FormatMessage(
diff -r eb72d194235c -r 514c68575523 src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp
--- a/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp Fri Mar 23 18:44:47 2018 +0000
@@ -1607,7 +1607,7 @@
DWORD fThread = ::GetWindowThreadProcessId(fHWnd, NULL);
if (fThread != AwtToolkit::GetInstance().MainThread()) {
// check if this thread has been already blocked
- BlockedThreadStruct *blockedThread = (BlockedThreadStruct *)sm_BlockedThreads.get((void *)fThread);
+ BlockedThreadStruct *blockedThread = (BlockedThreadStruct *)sm_BlockedThreads.get((void *)((intptr_t)fThread));
if (blocked) {
if (blockedThread == NULL) {
blockedThread = new BlockedThreadStruct;
@@ -1616,7 +1616,7 @@
0, fThread);
blockedThread->mouseHook = ::SetWindowsHookEx(WH_MOUSE, (HOOKPROC)AwtDialog::MouseHookProc_NonTT,
0, fThread);
- sm_BlockedThreads.put((void *)fThread, blockedThread);
+ sm_BlockedThreads.put((void *)((intptr_t)fThread), blockedThread);
} else {
blockedThread->framesCount++;
}
@@ -1628,7 +1628,7 @@
if ((blockedThread->framesCount) == 1) {
::UnhookWindowsHookEx(blockedThread->modalHook);
::UnhookWindowsHookEx(blockedThread->mouseHook);
- sm_BlockedThreads.remove((void *)fThread);
+ sm_BlockedThreads.remove((void *)((intptr_t)fThread));
delete blockedThread;
} else {
blockedThread->framesCount--;
diff -r eb72d194235c -r 514c68575523 src/java.desktop/windows/native/libawt/windows/awt_List.cpp
--- a/src/java.desktop/windows/native/libawt/windows/awt_List.cpp Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.desktop/windows/native/libawt/windows/awt_List.cpp Fri Mar 23 18:44:47 2018 +0000
@@ -823,9 +823,9 @@
jobject selfGlobalRef = env->NewGlobalRef(self);
- return (jint)AwtToolkit::GetInstance().SyncCall(
+ return (jint)((intptr_t)AwtToolkit::GetInstance().SyncCall(
(void *(*)(void *))AwtList::_GetMaxWidth,
- (void *)selfGlobalRef);
+ (void *)selfGlobalRef));
// selfGlobalRef is deleted in _GetMaxWidth
CATCH_BAD_ALLOC_RET(0);
@@ -1011,8 +1011,8 @@
ses->list = env->NewGlobalRef(self);
ses->index = index;
- return (jboolean)AwtToolkit::GetInstance().SyncCall(
- (void *(*)(void *))AwtList::_IsSelected, ses);
+ return (jboolean)((intptr_t)AwtToolkit::GetInstance().SyncCall(
+ (void *(*)(void *))AwtList::_IsSelected, ses));
// global ref and ses are deleted in _IsSelected
CATCH_BAD_ALLOC_RET(FALSE);
diff -r eb72d194235c -r 514c68575523 src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp
--- a/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp Fri Mar 23 18:44:47 2018 +0000
@@ -1106,7 +1106,7 @@
if (comp != NULL)
{
comp->SetInputMethod(self, useNativeCompWindow);
- comp->ImmAssociateContext((HIMC)context);
+ comp->ImmAssociateContext((HIMC)((intptr_t)context));
}
if (peer != NULL) {
@@ -3139,7 +3139,7 @@
(m_touchKbrdExeFilePath != NULL)) {
HINSTANCE retVal = ::ShellExecute(NULL, _T("open"),
m_touchKbrdExeFilePath, NULL, NULL, SW_SHOW);
- if ((int)retVal <= 32) {
+ if ((int)((intptr_t)retVal) <= 32) {
DTRACE_PRINTLN1("AwtToolkit::ShowTouchKeyboard: Failed"
", retVal='%d'", (int)retVal);
}
diff -r eb72d194235c -r 514c68575523 src/java.desktop/windows/native/libawt/windows/awt_Window.cpp
--- a/src/java.desktop/windows/native/libawt/windows/awt_Window.cpp Fri Mar 23 18:01:52 2018 +0000
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Window.cpp Fri Mar 23 18:44:47 2018 +0000
@@ -3915,8 +3915,8 @@
rfs->component = selfGlobalRef;
rfs->isMouseEventCause = isMouseEventCause;
- return (jboolean)AwtToolkit::GetInstance().SyncCall(
- (void*(*)(void*))AwtWindow::_RequestWindowFocus, rfs);
+ return (jboolean)((intptr_t)AwtToolkit::GetInstance().SyncCall(
+ (void*(*)(void*))AwtWindow::_RequestWindowFocus, rfs));
// global refs and rfs are deleted in _RequestWindowFocus
CATCH_BAD_ALLOC_RET(JNI_FALSE);
diff -r eb72d194235c -r 514c68575523 src/jdk.accessibility/windows/native/jaccessinspector/jaccessinspector.cpp
--- a/src/jdk.accessibility/windows/native/jaccessinspector/jaccessinspector.cpp Fri Mar 23 18:01:52 2018 +0000
+++ b/src/jdk.accessibility/windows/native/jaccessinspector/jaccessinspector.cpp Fri Mar 23 18:44:47 2018 +0000
@@ -1526,7 +1526,8 @@
size_t messageNumber = g_MessageHistory.GetCurrentMessageIndex() + 1;
char text [32] = {0};
if ( 0 != messageCount ) {
- ::_snprintf(text, sizeof(text), "%d of %d", messageNumber, messageCount);
+ ::_snprintf(text, sizeof(text), "%d of %d", (int)messageNumber,
+ (int) messageCount);
}
return ::SetWindowText(dlgItem, text);
}
diff -r eb72d194235c -r 514c68575523 src/jdk.accessibility/windows/native/jaccesswalker/jaccesswalker.cpp
--- a/src/jdk.accessibility/windows/native/jaccesswalker/jaccesswalker.cpp Fri Mar 23 18:01:52 2018 +0000
+++ b/src/jdk.accessibility/windows/native/jaccesswalker/jaccesswalker.cpp Fri Mar 23 18:44:47 2018 +0000
@@ -527,7 +527,7 @@
tvi.mask = TVIF_PARAM | TVIF_TEXT;
tvi.pszText = (char *) s; // Accessible name and role
tvi.cchTextMax = (int)strlen(s);
- tvi.lParam = (long) newNode; // Accessibility information
+ tvi.lParam = (LPARAM) newNode; // Accessibility information
TVINSERTSTRUCT tvis;
tvis.hParent = treeNodeParent;
@@ -544,13 +544,13 @@
char s[LINE_BUFSIZE];
sprintf( s,
"ERROR calling GetAccessibleContextInfo; vmID = %X, context = %p",
- vmID, context );
+ vmID, (void*)context );
TVITEM tvi;
tvi.mask = TVIF_PARAM | TVIF_TEXT; // text and lParam are only valid parts
tvi.pszText = (char *) s;
tvi.cchTextMax = (int)strlen(s);
- tvi.lParam = (long) newNode;
+ tvi.lParam = (LPARAM) newNode;
TVINSERTSTRUCT tvis;
tvis.hParent = treeNodeParent;
diff -r eb72d194235c -r 514c68575523 src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c
--- a/src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c Fri Mar 23 18:01:52 2018 +0000
+++ b/src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -231,7 +231,7 @@
int table_size = sizeof(error_messages) / sizeof(error_messages[0]);
int i;
- for (i=0; iGetArrayLength(env, args);
- for (i=0; iGetObjectArrayElement(env, args, i);
if (obj != NULL) {
cstr = JNU_GetStringPlatformChars(env, obj, &isCopy);
@@ -314,6 +314,15 @@
return -1;
}
}
+ } else {
+ char* newbuf = (char*)realloc(buf, size + 1);
+ if (newbuf == NULL) {
+ free(buf);
+ JNU_ThrowOutOfMemoryError(env, "realloc failed");
+ return -1;
+ }
+ buf = newbuf;
+ buf[size++] = 0;
}
if ((*env)->ExceptionOccurred(env)) {
free(buf);
diff -r eb72d194235c -r 514c68575523 src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java Fri Mar 23 18:44:47 2018 +0000
@@ -828,7 +828,7 @@
return buf.toList();
}
- boolean checkDenotable(Type t) {
+ public boolean checkDenotable(Type t) {
return denotableChecker.visit(t, null);
}
// where
diff -r eb72d194235c -r 514c68575523 src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Fri Mar 23 18:01:52 2018 +0000
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Fri Mar 23 18:44:47 2018 +0000
@@ -43,6 +43,7 @@
import com.sun.tools.javac.code.Symbol.*;
import com.sun.tools.javac.code.Type.*;
import com.sun.tools.javac.code.Types.UniqueType;
+import com.sun.tools.javac.comp.Check;
import com.sun.tools.javac.file.PathFileObject;
import com.sun.tools.javac.jvm.Pool.DynamicMethod;
import com.sun.tools.javac.jvm.Pool.Method;
@@ -101,6 +102,8 @@
/** Type utilities. */
private Types types;
+ private Check check;
+
/**
* If true, class files will be written in module-specific subdirectories
* of the CLASS_OUTPUT location.
@@ -178,6 +181,7 @@
target = Target.instance(context);
source = Source.instance(context);
types = Types.instance(context);
+ check = Check.instance(context);
fileManager = context.get(JavaFileManager.class);
signatureGen = new CWSignatureGenerator(types);
@@ -1294,10 +1298,10 @@
//where
private boolean needsLocalVariableTypeEntry(Type t) {
//a local variable needs a type-entry if its type T is generic
- //(i.e. |T| != T) and if it's not an intersection type (not supported
- //in signature attribute grammar)
- return (!types.isSameType(t, types.erasure(t)) &&
- !t.isCompound());
+ //(i.e. |T| != T) and if it's not an non-denotable type (non-denotable
+ // types are not supported in signature attribute grammar!)
+ return !types.isSameType(t, types.erasure(t)) &&
+ check.checkDenotable(t);
}
void writeStackMap(Code code) {
diff -r eb72d194235c -r 514c68575523 test/hotspot/jtreg/ProblemList.txt
--- a/test/hotspot/jtreg/ProblemList.txt Fri Mar 23 18:01:52 2018 +0000
+++ b/test/hotspot/jtreg/ProblemList.txt Fri Mar 23 18:44:47 2018 +0000
@@ -44,6 +44,7 @@
compiler/codecache/stress/OverloadCompileQueueTest.java 8166554 generic-all
compiler/codegen/Test6896617.java 8193479 generic-all
compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java 8140405 generic-all
+compiler/jvmci/compilerToVM/GetExceptionTableTest.java 8200135 generic-all
compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java 8158860 generic-all
compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java 8163894 generic-all
compiler/tiered/LevelTransitionTest.java 8067651 generic-all
diff -r eb72d194235c -r 514c68575523 test/jdk/java/awt/Frame/UnfocusableMaximizedFrameResizablity/UnfocusableMaximizedFrameResizablity.java
--- a/test/jdk/java/awt/Frame/UnfocusableMaximizedFrameResizablity/UnfocusableMaximizedFrameResizablity.java Fri Mar 23 18:01:52 2018 +0000
+++ b/test/jdk/java/awt/Frame/UnfocusableMaximizedFrameResizablity/UnfocusableMaximizedFrameResizablity.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -24,389 +24,97 @@
/*
@test
@key headful
- @bug 4980161
+ @bug 4980161 7158623
@summary Setting focusable window state to false makes the maximized frame resizable
- @author anthony.petrov@...: area=awt.toplevel
- @library ../../regtesthelpers
- @build Util
+ @compile UnfocusableMaximizedFrameResizablity.java
@run main UnfocusableMaximizedFrameResizablity
*/
-/**
- * UnfocusableMaximizedFrameResizablity.java
- *
- * summary: Tests whether a maximized unfocusable frame connot be resized by the user
- */
+import java.awt.Toolkit;
+import java.awt.Frame;
+import java.awt.Rectangle;
+import java.awt.AWTException;
+import java.awt.event.InputEvent;
+import java.awt.Robot;
-import java.awt.*;
-import java.awt.event.*;
-import test.java.awt.regtesthelpers.Util;
-
-public class UnfocusableMaximizedFrameResizablity
-{
-
- //*** test-writer defined static variables go here ***
-
+public class UnfocusableMaximizedFrameResizablity {
- private static void init()
- {
- //*** Create instructions for the user here ***
+ private static Frame frame;
+ private static Robot robot;
+ private static boolean isProgInterruption = false;
+ private static Thread mainThread = null;
+ private static int sleepTime = 300000;
- String[] instructions =
- {
- "This is an AUTOMATIC test, simply wait until it is done.",
- "The result (passed or failed) will be shown in the",
- "message window below."
- };
- Sysout.createDialog( );
- Sysout.printInstructions( instructions );
+ private static void createAndShowFrame() {
+ //The MAXIMIZED_BOTH state is not supported by the toolkit. Nothing to test.
if (!Toolkit.getDefaultToolkit().isFrameStateSupported(Frame.MAXIMIZED_BOTH)) {
- System.out.println("The MAXIMIZED_BOTH state is not supported by the toolkit. Nothing to test.");
- pass();
return;
}
- // Create the maximized unfocusable frame
- final Frame f = new Frame("Unfocusable frame");
- f.setMaximizedBounds(new Rectangle(0, 0, 300, 300));
- f.setSize(200, 200);
- f.setVisible(true);
- f.setExtendedState(Frame.MAXIMIZED_BOTH);
- f.setFocusableWindowState(false);
+ frame = new Frame("Unfocusable frame");
+ frame.setMaximizedBounds(new Rectangle(0, 0, 300, 300));
+ frame.setSize(200, 200);
+ frame.setVisible(true);
+ frame.setExtendedState(Frame.MAXIMIZED_BOTH);
+ frame.setFocusableWindowState(false);
- Robot robot = Util.createRobot();
- robot.setAutoDelay(20);
-
- Util.waitForIdle(robot);
+ try {
+ robot = new Robot();
+ } catch (AWTException e) {
+ throw new RuntimeException("Robot creation failed");
+ }
+ robot.delay(2000);
// The initial bounds of the frame
- final Rectangle bounds = f.getBounds();
- System.out.println("Initial frame bounds: " + bounds);
+ final Rectangle bounds = frame.getBounds();
// Let's move the mouse pointer to the bottom-right coner of the frame (the "size-grip")
robot.mouseMove(bounds.x + bounds.width - 2, bounds.y + bounds.height - 2);
+ robot.waitForIdle();
// ... and start resizing
- robot.mousePress( InputEvent.BUTTON1_MASK );
- Util.waitForIdle(robot);
+ robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+ robot.waitForIdle();
robot.mouseMove(bounds.x + bounds.width + 20, bounds.y + bounds.height + 15);
- Util.waitForIdle(robot);
- robot.mouseRelease( InputEvent.BUTTON1_MASK );
- Util.waitForIdle(robot);
+ robot.waitForIdle();
+
+ robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+ robot.waitForIdle();
// The bounds of the frame after the attempt of resizing is made
- final Rectangle finalBounds = f.getBounds();
- System.out.println("Final frame bounds: " + finalBounds);
+ final Rectangle finalBounds = frame.getBounds();
if (!finalBounds.equals(bounds)) {
- fail("The maximized unfocusable frame can be resized.");
- return;
+ cleanup();
+ throw new RuntimeException("The maximized unfocusable frame can be resized.");
}
-
- UnfocusableMaximizedFrameResizablity.pass();
-
- }//End init()
-
-
-
- /*****************************************************
- * Standard Test Machinery Section
- * DO NOT modify anything in this section -- it's a
- * standard chunk of code which has all of the
- * synchronisation necessary for the test harness.
- * By keeping it the same in all tests, it is easier
- * to read and understand someone else's test, as
- * well as insuring that all tests behave correctly
- * with the test harness.
- * There is a section following this for test-
- * classes
- ******************************************************/
- private static boolean theTestPassed = false;
- private static boolean testGeneratedInterrupt = false;
- private static String failureMessage = "";
-
- private static Thread mainThread = null;
-
- private static int sleepTime = 300000;
+ cleanup();
+ }
- // Not sure about what happens if multiple of this test are
- // instantiated in the same VM. Being static (and using
- // static vars), it aint gonna work. Not worrying about
- // it for now.
- public static void main( String args[] ) throws InterruptedException
- {
- mainThread = Thread.currentThread();
- try
- {
- init();
- }
- catch( TestPassedException e )
- {
- //The test passed, so just return from main and harness will
- // interepret this return as a pass
- return;
- }
- //At this point, neither test pass nor test fail has been
- // called -- either would have thrown an exception and ended the
- // test, so we know we have multiple threads.
+ private static void cleanup() {
+ frame.dispose();
+ isProgInterruption = true;
+ mainThread.interrupt();
+ }
+
+ public static void main(String args[]) throws InterruptedException {
- //Test involves other threads, so sleep and wait for them to
- // called pass() or fail()
- try
- {
- Thread.sleep( sleepTime );
- //Timed out, so fail the test
- throw new RuntimeException( "Timed out after " + sleepTime/1000 + " seconds" );
- }
- catch (InterruptedException e)
- {
- //The test harness may have interrupted the test. If so, rethrow the exception
- // so that the harness gets it and deals with it.
- if( ! testGeneratedInterrupt ) throw e;
+ mainThread = Thread.currentThread();
- //reset flag in case hit this code more than once for some reason (just safety)
- testGeneratedInterrupt = false;
-
- if ( theTestPassed == false )
- {
- throw new RuntimeException( failureMessage );
+ try {
+ createAndShowFrame();
+ mainThread.sleep(sleepTime);
+ } catch (InterruptedException e) {
+ if (!isProgInterruption) {
+ throw e;
}
}
- }//main
-
- public static synchronized void setTimeoutTo( int seconds )
- {
- sleepTime = seconds * 1000;
- }
-
- public static synchronized void pass()
- {
- Sysout.println( "The test passed." );
- Sysout.println( "The test is over, hit Ctl-C to stop Java VM" );
- //first check if this is executing in main thread
- if ( mainThread == Thread.currentThread() )
- {
- //Still in the main thread, so set the flag just for kicks,
- // and throw a test passed exception which will be caught
- // and end the test.
- theTestPassed = true;
- throw new TestPassedException();
+ if (!isProgInterruption) {
+ throw new RuntimeException("Timed out after " + sleepTime / 1000
+ + " seconds");
}
- theTestPassed = true;
- testGeneratedInterrupt = true;
- mainThread.interrupt();
- }//pass()
-
- public static synchronized void fail()
- {
- //test writer didn't specify why test failed, so give generic
- fail( "it just plain failed! :-)" );
}
-
- public static synchronized void fail( String whyFailed )
- {
- Sysout.println( "The test failed: " + whyFailed );
- Sysout.println( "The test is over, hit Ctl-C to stop Java VM" );
- //check if this called from main thread
- if ( mainThread == Thread.currentThread() )
- {
- //If main thread, fail now 'cause not sleeping
- throw new RuntimeException( whyFailed );
- }
- theTestPassed = false;
- testGeneratedInterrupt = true;
- failureMessage = whyFailed;
- mainThread.interrupt();
- }//fail()
-
-}// class UnfocusableMaximizedFrameResizablity
-
-//This exception is used to exit from any level of call nesting
-// when it's determined that the test has passed, and immediately
-// end the test.
-class TestPassedException extends RuntimeException
-{
}
-//*********** End Standard Test Machinery Section **********
-
-
-//************ Begin classes defined for the test ****************
-
-// if want to make listeners, here is the recommended place for them, then instantiate
-// them in init()
-
-/* Example of a class which may be written as part of a test
-class NewClass implements anInterface
- {
- static int newVar = 0;
-
- public void eventDispatched(AWTEvent e)
- {
- //Counting events to see if we get enough
- eventCount++;
-
- if( eventCount == 20 )
- {
- //got enough events, so pass
-
- UnfocusableMaximizedFrameResizablity.pass();
- }
- else if( tries == 20 )
- {
- //tried too many times without getting enough events so fail
-
- UnfocusableMaximizedFrameResizablity.fail();
- }
-
- }// eventDispatched()
-
- }// NewClass class
-
-*/
-
-
-//************** End classes defined for the test *******************
-
-
-
-
-/****************************************************
- Standard Test Machinery
- DO NOT modify anything below -- it's a standard
- chunk of code whose purpose is to make user
- interaction uniform, and thereby make it simpler
- to read and understand someone else's test.
- ****************************************************/
-
-/**
- This is part of the standard test machinery.
- It creates a dialog (with the instructions), and is the interface
- for sending text messages to the user.
- To print the instructions, send an array of strings to Sysout.createDialog
- WithInstructions method. Put one line of instructions per array entry.
- To display a message for the tester to see, simply call Sysout.println
- with the string to be displayed.
- This mimics System.out.println but works within the test harness as well
- as standalone.
- */
-
-class Sysout
-{
- private static TestDialog dialog;
-
- public static void createDialogWithInstructions( String[] instructions )
- {
- dialog = new TestDialog( new Frame(), "Instructions" );
- dialog.printInstructions( instructions );
- dialog.setVisible(true);
- println( "Any messages for the tester will display here." );
- }
-
- public static void createDialog( )
- {
- dialog = new TestDialog( new Frame(), "Instructions" );
- String[] defInstr = { "Instructions will appear here. ", "" } ;
- dialog.printInstructions( defInstr );
- dialog.setVisible(true);
- println( "Any messages for the tester will display here." );
- }
-
-
- public static void printInstructions( String[] instructions )
- {
- dialog.printInstructions( instructions );
- }
-
-
- public static void println( String messageIn )
- {
- dialog.displayMessage( messageIn );
- System.out.println(messageIn);
- }
-
-}// Sysout class
-
-/**
- This is part of the standard test machinery. It provides a place for the
- test instructions to be displayed, and a place for interactive messages
- to the user to be displayed.
- To have the test instructions displayed, see Sysout.
- To have a message to the user be displayed, see Sysout.
- Do not call anything in this dialog directly.
- */
-class TestDialog extends Dialog
-{
-
- TextArea instructionsText;
- TextArea messageText;
- int maxStringLength = 80;
-
- //DO NOT call this directly, go through Sysout
- public TestDialog( Frame frame, String name )
- {
- super( frame, name );
- int scrollBoth = TextArea.SCROLLBARS_BOTH;
- instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth );
- add( "North", instructionsText );
-
- messageText = new TextArea( "", 5, maxStringLength, scrollBoth );
- add("Center", messageText);
-
- pack();
-
- setVisible(true);
- }// TestDialog()
-
- //DO NOT call this directly, go through Sysout
- public void printInstructions( String[] instructions )
- {
- //Clear out any current instructions
- instructionsText.setText( "" );
-
- //Go down array of instruction strings
-
- String printStr, remainingStr;
- for( int i=0; i < instructions.length; i++ )
- {
- //chop up each into pieces maxSringLength long
- remainingStr = instructions[ i ];
- while( remainingStr.length() > 0 )
- {
- //if longer than max then chop off first max chars to print
- if( remainingStr.length() >= maxStringLength )
- {
- //Try to chop on a word boundary
- int posOfSpace = remainingStr.
- lastIndexOf( ' ', maxStringLength - 1 );
-
- if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1;
-
- printStr = remainingStr.substring( 0, posOfSpace + 1 );
- remainingStr = remainingStr.substring( posOfSpace + 1 );
- }
- //else just print
- else
- {
- printStr = remainingStr;
- remainingStr = "";
- }
-
- instructionsText.append( printStr + "\n" );
-
- }// while
-
- }// for
-
- }//printInstructions()
-
- //DO NOT call this directly, go through Sysout
- public void displayMessage( String messageIn )
- {
- messageText.append( messageIn + "\n" );
- System.out.println(messageIn);
- }
-
-}// TestDialog class
diff -r eb72d194235c -r 514c68575523 test/jdk/java/awt/event/SequencedEvent/SequencedEventTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/awt/event/SequencedEvent/SequencedEventTest.java Fri Mar 23 18:44:47 2018 +0000
@@ -0,0 +1,172 @@
+/*
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 8152974
+ * @key headful
+ * @summary AWT hang occurrs when sequenced events arrive out of sequence
+ * @run main SequencedEventTest
+ */
+import sun.awt.AppContext;
+import sun.awt.SunToolkit;
+
+import java.awt.Robot;
+import java.awt.Point;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.AWTEvent;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.InputEvent;
+import java.lang.reflect.Constructor;
+import java.util.concurrent.CountDownLatch;
+
+import javax.swing.JFrame;
+import javax.swing.JButton;
+import javax.swing.SwingUtilities;
+import javax.swing.JTextArea;
+
+public class SequencedEventTest extends JFrame implements ActionListener {
+ private JButton spamMeButton;
+ private static Robot robot;
+ private static SequencedEventTest window;
+ private static AppContext context;
+
+ public static void main(String[] args) throws Exception {
+ SwingUtilities.invokeAndWait(() -> {
+ window = new SequencedEventTest();
+ window.setVisible(true);
+ });
+
+ robot = new Robot();
+ robot.waitForIdle();
+
+ Point pt = window.spamMeButton.getLocationOnScreen();
+ Dimension d = window.spamMeButton.getSize();
+
+ robot.mouseMove(pt.x + d.width / 2, pt.y + d.height / 2);
+ robot.waitForIdle();
+ robot.mousePress(InputEvent.BUTTON1_DOWN_MASK);
+ robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK);
+ /*
+ *Cannot have robot.waitForIdle() here since it will block the test forever,
+ * in the case of failure and the test will timeout.
+ */
+
+ try {
+ /*
+ * Wait for 2 seconds, and then see if all the sequenced events are dispatched.
+ */
+ Thread.sleep(2000);
+ AWTEvent ev = Toolkit.getDefaultToolkit().getSystemEventQueue().
+ peekEvent(java.awt.event.FocusEvent.FOCUS_LAST + 1);
+
+ if (ev != null)
+ throw new RuntimeException("Test case failed!");
+ } catch (InterruptedException e) {
+ throw new RuntimeException("Test case failed." + e.getMessage());
+ }
+
+ /*
+ * In the case of failure, the cleanup job cannot be executed, since it
+ * will block the test.
+ */
+ System.out.println("Test case succeeded.");
+ context.dispose();
+ SwingUtilities.invokeAndWait(() -> window.dispose());
+ }
+
+ public SequencedEventTest() {
+ super("Test Window");
+
+ setLayout(new FlowLayout());
+ JTextArea textBlock = new JTextArea("Lorem ipsum dolor sit amet...");
+ add(textBlock);
+
+ spamMeButton = new JButton("Press me!");
+ spamMeButton.addActionListener(this);
+ add(spamMeButton);
+ setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ pack();
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ if(e.getSource() == spamMeButton) {
+ AWTEvent eventOne = getSequencedEvent();
+ AWTEvent eventFour = getSequencedEvent();
+ ThreadGroup tg = new ThreadGroup("TestThreadGroup" );
+ CountDownLatch latch = new CountDownLatch(1);
+ Thread t = new Thread(tg, () -> {
+ context = SunToolkit.createNewAppContext();
+ AWTEvent eventTwo = getSequencedEvent();
+ AWTEvent eventThree = getSequencedEvent();
+
+ Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(eventThree);
+ Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(new ActionEvent(this, 0, null));
+ Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(new ActionEvent(this, 1, null));
+ Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(eventTwo);
+
+ latch.countDown();
+ });
+
+ t.start();
+ try {
+ latch.await();
+ }catch (InterruptedException ex) {
+ throw new RuntimeException("Test case failed.");
+ }
+
+ Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(eventFour);
+ Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(new ActionEvent(this, 2, null));
+ Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(new ActionEvent(this, 3, null));
+ Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(eventOne);
+
+ try {
+ t.join();
+ } catch (InterruptedException ex) {
+ throw new RuntimeException("Test case failed.");
+ }
+ }
+ }
+
+ private AWTEvent getSequencedEvent()
+ {
+ AWTEvent wrapMe = new AWTEvent(this, AWTEvent.RESERVED_ID_MAX) {};
+
+ try {
+ /*
+ * SequencedEvent is a package private class, which cannot be instantiated
+ * by importing. So use reflection to create an instance.
+ */
+ Class seqClass = (Class) Class.forName("java.awt.SequencedEvent");
+ Constructor seqConst = seqClass.getConstructor(AWTEvent.class);
+ seqConst.setAccessible(true);;
+ return seqConst.newInstance(wrapMe);
+ } catch (Throwable err) {
+ throw new RuntimeException("Unable to instantiate SequencedEvent",err);
+ }
+ }
+}
diff -r eb72d194235c -r 514c68575523 test/jdk/java/io/ByteArrayInputStream/ReadAllReadNTransferTo.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/io/ByteArrayInputStream/ReadAllReadNTransferTo.java Fri Mar 23 18:44:47 2018 +0000
@@ -0,0 +1,85 @@
+/*
+ * 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.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Random;
+import jdk.test.lib.RandomFactory;
+
+/* @test
+ * @library /test/lib
+ * @build jdk.test.lib.RandomFactory
+ * @run main ReadAllReadNTransferTo
+ * @bug 8180451
+ * @summary Verify ByteArrayInputStream readAllBytes, readNBytes, and transferTo
+ * @key randomness
+ */
+public class ReadAllReadNTransferTo {
+ private static final int SIZE = 0x4d4d;
+
+ private static Random random = RandomFactory.getRandom();
+
+ public static void main(String... args) throws IOException {
+ byte[] buf = new byte[SIZE];
+ random.nextBytes(buf);
+ int position = random.nextInt(SIZE/2);
+ int size = random.nextInt(SIZE - position);
+
+ ByteArrayInputStream bais =
+ new ByteArrayInputStream(buf, position, size);
+ int off = random.nextInt(size / 2);
+ int len = random.nextInt(size - off);
+
+ byte[] bN = new byte[off + len];
+ if (bais.readNBytes(bN, off, len) != len) {
+ throw new RuntimeException("readNBytes return value");
+ }
+ if (!Arrays.equals(bN, off, off + len,
+ buf, position, position + len)) {
+ throw new RuntimeException("readNBytes content");
+ }
+
+ byte[] bAll = bais.readAllBytes();
+ Objects.requireNonNull(bAll, "readAllBytes return value");
+ if (bAll.length != size - len) {
+ throw new RuntimeException("readAllBytes return value length");
+ }
+ if (!Arrays.equals(bAll, 0, bAll.length,
+ buf, position + len, position + len + bAll.length)) {
+ throw new RuntimeException("readAllBytes content");
+ }
+
+ // XXX transferTo()
+ bais = new ByteArrayInputStream(buf);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(buf.length);
+ if (bais.transferTo(baos) != buf.length) {
+ throw new RuntimeException("transferTo return value length");
+ }
+ if (!Arrays.equals(buf, baos.toByteArray())) {
+ throw new RuntimeException("transferTo content");
+ }
+ }
+}
diff -r eb72d194235c -r 514c68575523 test/jdk/java/nio/Buffer/EqualsCompareTest.java
--- a/test/jdk/java/nio/Buffer/EqualsCompareTest.java Fri Mar 23 18:01:52 2018 +0000
+++ b/test/jdk/java/nio/Buffer/EqualsCompareTest.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -45,7 +45,7 @@
/*
* @test
- * @bug 8193085
+ * @bug 8193085 8199773
* @summary tests for buffer equals and compare
* @run testng EqualsCompareTest
*/
@@ -120,8 +120,9 @@
abstract T construct(int length, ByteOrder bo);
@SuppressWarnings("unchecked")
- T slice(T a, int from, int to) {
- return (T) a.position(from).limit(to).slice();
+ T slice(T a, int from, int to, boolean dupOtherwiseSlice) {
+ a = (T) a.position(from).limit(to);
+ return (T) (dupOtherwiseSlice ? a.duplicate() : a.slice());
}
@SuppressWarnings("unchecked")
@@ -607,60 +608,62 @@
BiFunction bConstructor) {
int n = arraySizeFor(bt.elementType);
- for (int s : ranges(0, n)) {
- B a = aConstructor.apply(bt, s);
- B b = bConstructor.apply(bt, s);
+ for (boolean dupOtherwiseSlice : new boolean[]{ false, true }) {
+ for (int s : ranges(0, n)) {
+ B a = aConstructor.apply(bt, s);
+ B b = bConstructor.apply(bt, s);
- for (int aFrom : ranges(0, s)) {
- for (int aTo : ranges(aFrom, s)) {
- int aLength = aTo - aFrom;
+ for (int aFrom : ranges(0, s)) {
+ for (int aTo : ranges(aFrom, s)) {
+ int aLength = aTo - aFrom;
- B as = aLength != s
- ? bt.slice(a, aFrom, aTo)
- : a;
+ B as = aLength != s
+ ? bt.slice(a, aFrom, aTo, dupOtherwiseSlice)
+ : a;
- for (int bFrom : ranges(0, s)) {
- for (int bTo : ranges(bFrom, s)) {
- int bLength = bTo - bFrom;
+ for (int bFrom : ranges(0, s)) {
+ for (int bTo : ranges(bFrom, s)) {
+ int bLength = bTo - bFrom;
+
+ B bs = bLength != s
+ ? bt.slice(b, bFrom, bTo, dupOtherwiseSlice)
+ : b;
- B bs = bLength != s
- ? bt.slice(b, bFrom, bTo)
- : b;
+ boolean eq = bt.pairWiseEquals(as, bs);
+ Assert.assertEquals(bt.equals(as, bs), eq);
+ Assert.assertEquals(bt.equals(bs, as), eq);
+ if (eq) {
+ Assert.assertEquals(bt.compare(as, bs), 0);
+ Assert.assertEquals(bt.compare(bs, as), 0);
+ }
+ else {
+ int aCb = bt.compare(as, bs);
+ int bCa = bt.compare(bs, as);
+ int v = Integer.signum(aCb) * Integer.signum(bCa);
+ Assert.assertTrue(v == -1);
+ }
+ }
+ }
- boolean eq = bt.pairWiseEquals(as, bs);
- Assert.assertEquals(bt.equals(as, bs), eq);
- Assert.assertEquals(bt.equals(bs, as), eq);
- if (eq) {
- Assert.assertEquals(bt.compare(as, bs), 0);
- Assert.assertEquals(bt.compare(bs, as), 0);
- }
- else {
- int aCb = bt.compare(as, bs);
- int bCa = bt.compare(bs, as);
- int v = Integer.signum(aCb) * Integer.signum(bCa);
+ if (aLength > 0 && !a.isReadOnly()) {
+ for (int i = aFrom; i < aTo; i++) {
+ B c = aConstructor.apply(bt, a.capacity());
+ B cs = aLength != s
+ ? bt.slice(c, aFrom, aTo, dupOtherwiseSlice)
+ : c;
+
+ // Create common prefix with a length of i - aFrom
+ bt.set(c, i, -1);
+
+ Assert.assertFalse(bt.equals(c, a));
+
+ int cCa = bt.compare(cs, as);
+ int aCc = bt.compare(as, cs);
+ int v = Integer.signum(cCa) * Integer.signum(aCc);
Assert.assertTrue(v == -1);
}
}
}
-
- if (aLength > 0 && !a.isReadOnly()) {
- for (int i = aFrom; i < aTo; i++) {
- B c = aConstructor.apply(bt, a.capacity());
- B cs = aLength != s
- ? bt.slice(c, aFrom, aTo)
- : c;
-
- // Create common prefix with a length of i - aFrom
- bt.set(c, i, -1);
-
- Assert.assertFalse(bt.equals(c, a));
-
- int cCa = bt.compare(cs, as);
- int aCc = bt.compare(as, cs);
- int v = Integer.signum(cCa) * Integer.signum(aCc);
- Assert.assertTrue(v == -1);
- }
- }
}
}
}
diff -r eb72d194235c -r 514c68575523 test/jdk/java/nio/channels/DatagramChannel/Connect.java
--- a/test/jdk/java/nio/channels/DatagramChannel/Connect.java Fri Mar 23 18:01:52 2018 +0000
+++ b/test/jdk/java/nio/channels/DatagramChannel/Connect.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -102,7 +102,7 @@
try {
dc.send(bb, bogus);
throw new RuntimeException("Allowed bogus send while connected");
- } catch (IllegalArgumentException iae) {
+ } catch (AlreadyConnectedException ace) {
// Correct behavior
}
diff -r eb72d194235c -r 514c68575523 test/jdk/java/nio/channels/DatagramChannel/ConnectExceptions.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/nio/channels/DatagramChannel/ConnectExceptions.java Fri Mar 23 18:44:47 2018 +0000
@@ -0,0 +1,88 @@
+/*
+ * 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.
+ */
+
+/* @test
+ * @bug 8198753
+ * @summary Test DatagramChannel connect exceptions
+ * @library ..
+ * @run testng ConnectExceptions
+ */
+
+import java.io.*;
+import java.net.*;
+import java.nio.*;
+import java.nio.channels.*;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+
+public class ConnectExceptions {
+ static DatagramChannel sndChannel;
+ static DatagramChannel rcvChannel;
+ static InetSocketAddress sender;
+ static InetSocketAddress receiver;
+
+ @BeforeTest
+ public static void setup() throws Exception {
+ sndChannel = DatagramChannel.open();
+ sndChannel.bind(null);
+ InetAddress address = InetAddress.getLocalHost();
+ if (address.isLoopbackAddress()) {
+ address = InetAddress.getLoopbackAddress();
+ }
+ sender = new InetSocketAddress(address,
+ sndChannel.socket().getLocalPort());
+
+ rcvChannel = DatagramChannel.open();
+ rcvChannel.bind(null);
+ receiver = new InetSocketAddress(address,
+ rcvChannel.socket().getLocalPort());
+ }
+
+ @Test(expectedExceptions = UnsupportedAddressTypeException.class)
+ public static void unsupportedAddressTypeException() throws Exception {
+ rcvChannel.connect(sender);
+ sndChannel.connect(new SocketAddress() {});
+ }
+
+ @Test(expectedExceptions = UnresolvedAddressException.class)
+ public static void unresolvedAddressException() throws Exception {
+ String host = TestUtil.UNRESOLVABLE_HOST;
+ InetSocketAddress unresolvable = new InetSocketAddress (host, 37);
+ sndChannel.connect(unresolvable);
+ }
+
+ @Test(expectedExceptions = AlreadyConnectedException.class)
+ public static void alreadyConnectedException() throws Exception {
+ sndChannel.connect(receiver);
+ InetSocketAddress random = new InetSocketAddress(0);
+ sndChannel.connect(random);
+ }
+
+ @AfterTest
+ public static void cleanup() throws Exception {
+ rcvChannel.close();
+ sndChannel.close();
+ }
+}
diff -r eb72d194235c -r 514c68575523 test/jdk/java/nio/channels/DatagramChannel/ConnectedSend.java
--- a/test/jdk/java/nio/channels/DatagramChannel/ConnectedSend.java Fri Mar 23 18:01:52 2018 +0000
+++ b/test/jdk/java/nio/channels/DatagramChannel/ConnectedSend.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -24,6 +24,8 @@
/* @test
* @bug 4849277 7183800
* @summary Test DatagramChannel send while connected
+ * @library ..
+ * @run testng ConnectedSend
* @author Mike McCloskey
*/
@@ -32,20 +34,16 @@
import java.nio.*;
import java.nio.channels.*;
import java.nio.charset.*;
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
public class ConnectedSend {
-
- public static void main(String[] args) throws Exception {
- test1();
- test2();
- }
-
// Check if DatagramChannel.send while connected can include
// address without throwing
- private static void test1() throws Exception {
-
+ @Test
+ public static void sendToConnectedAddress() throws Exception {
DatagramChannel sndChannel = DatagramChannel.open();
- sndChannel.socket().bind(null);
+ sndChannel.bind(null);
InetAddress address = InetAddress.getLocalHost();
if (address.isLoopbackAddress()) {
address = InetAddress.getLoopbackAddress();
@@ -55,7 +53,7 @@
sndChannel.socket().getLocalPort());
DatagramChannel rcvChannel = DatagramChannel.open();
- rcvChannel.socket().bind(null);
+ rcvChannel.bind(null);
InetSocketAddress receiver = new InetSocketAddress(
address,
rcvChannel.socket().getLocalPort());
@@ -71,8 +69,7 @@
rcvChannel.receive(bb);
bb.flip();
CharBuffer cb = Charset.forName("US-ASCII").newDecoder().decode(bb);
- if (!cb.toString().startsWith("h"))
- throw new RuntimeException("Test failed");
+ assertTrue(cb.toString().startsWith("h"), "Unexpected message content");
rcvChannel.close();
sndChannel.close();
@@ -81,9 +78,10 @@
// Check if the datagramsocket adaptor can send with a packet
// that has not been initialized with an address; the legacy
// datagram socket will send in this case
- private static void test2() throws Exception {
+ @Test
+ public static void sendAddressedPacket() throws Exception {
DatagramChannel sndChannel = DatagramChannel.open();
- sndChannel.socket().bind(null);
+ sndChannel.bind(null);
InetAddress address = InetAddress.getLocalHost();
if (address.isLoopbackAddress()) {
address = InetAddress.getLoopbackAddress();
@@ -93,7 +91,7 @@
sndChannel.socket().getLocalPort());
DatagramChannel rcvChannel = DatagramChannel.open();
- rcvChannel.socket().bind(null);
+ rcvChannel.bind(null);
InetSocketAddress receiver = new InetSocketAddress(
address,
rcvChannel.socket().getLocalPort());
@@ -109,13 +107,12 @@
rcvChannel.receive(bb);
bb.flip();
CharBuffer cb = Charset.forName("US-ASCII").newDecoder().decode(bb);
- if (!cb.toString().startsWith("h"))
- throw new RuntimeException("Test failed");
+ assertTrue(cb.toString().startsWith("h"), "Unexpected message content");
// Check that the pkt got set with the target address;
// This is legacy behavior
- if (!pkt.getSocketAddress().equals(receiver))
- throw new RuntimeException("Test failed");
+ assertEquals(pkt.getSocketAddress(), receiver,
+ "Unexpected address set on packet");
rcvChannel.close();
sndChannel.close();
diff -r eb72d194235c -r 514c68575523 test/jdk/java/nio/channels/DatagramChannel/SendExceptions.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/nio/channels/DatagramChannel/SendExceptions.java Fri Mar 23 18:44:47 2018 +0000
@@ -0,0 +1,89 @@
+/*
+ * 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.
+ */
+
+/* @test
+ * @bug 4675045 8198753
+ * @summary Test DatagramChannel send exceptions
+ * @library ..
+ * @run testng SendExceptions
+ */
+
+import java.io.*;
+import java.net.*;
+import java.nio.*;
+import java.nio.channels.*;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+
+public class SendExceptions {
+ static DatagramChannel sndChannel;
+ static DatagramChannel rcvChannel;
+ static InetSocketAddress sender;
+ static InetSocketAddress receiver;
+ static ByteBuffer buf = ByteBuffer.allocate(17);
+
+ @BeforeTest
+ public static void setup() throws Exception {
+ sndChannel = DatagramChannel.open();
+ sndChannel.bind(null);
+ InetAddress address = InetAddress.getLocalHost();
+ if (address.isLoopbackAddress()) {
+ address = InetAddress.getLoopbackAddress();
+ }
+ sender = new InetSocketAddress(address,
+ sndChannel.socket().getLocalPort());
+
+ rcvChannel = DatagramChannel.open();
+ rcvChannel.bind(null);
+ receiver = new InetSocketAddress(address,
+ rcvChannel.socket().getLocalPort());
+ }
+
+ @Test(expectedExceptions = UnsupportedAddressTypeException.class)
+ public static void unsupportedAddressTypeException() throws Exception {
+ rcvChannel.connect(sender);
+ sndChannel.send(buf, new SocketAddress() {});
+ }
+
+ @Test(expectedExceptions = UnresolvedAddressException.class)
+ public static void unresolvedAddressException() throws Exception {
+ String host = TestUtil.UNRESOLVABLE_HOST;
+ InetSocketAddress unresolvable = new InetSocketAddress (host, 37);
+ sndChannel.send(buf, unresolvable);
+ }
+
+ @Test(expectedExceptions = AlreadyConnectedException.class)
+ public static void alreadyConnectedException() throws Exception {
+ sndChannel.connect(receiver);
+ InetSocketAddress random = new InetSocketAddress(0);
+ sndChannel.send(buf, random);
+ }
+
+ @AfterTest
+ public static void cleanup() throws Exception {
+ rcvChannel.close();
+ sndChannel.close();
+ }
+}
diff -r eb72d194235c -r 514c68575523 test/jdk/java/nio/channels/DatagramChannel/SendToUnresolved.java
--- a/test/jdk/java/nio/channels/DatagramChannel/SendToUnresolved.java Fri Mar 23 18:01:52 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2002, 2012, 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.
- */
-
-/* @test
- * @bug 4675045
- * @summary Test DatagramChannel send to unresolved address
- * @library ..
- */
-
-import java.io.*;
-import java.net.*;
-import java.nio.*;
-import java.nio.channels.*;
-
-public class SendToUnresolved {
- public static void main(String [] argv) throws Exception {
- String host = TestUtil.UNRESOLVABLE_HOST;
- DatagramChannel dc = DatagramChannel.open();
- ByteBuffer bb = ByteBuffer.allocate(4);
- InetSocketAddress sa = new InetSocketAddress (host, 37);
- InetAddress inetaddr = sa.getAddress();
- try {
- dc.send(bb, sa);
- throw new RuntimeException("Expected exception not thrown");
- } catch (IOException | UnresolvedAddressException e) {
- // Correct result
- }
- dc.close();
- }
-}
diff -r eb72d194235c -r 514c68575523 test/jdk/java/nio/channels/Selector/CloseWhenKeyIdle.java
--- a/test/jdk/java/nio/channels/Selector/CloseWhenKeyIdle.java Fri Mar 23 18:01:52 2018 +0000
+++ b/test/jdk/java/nio/channels/Selector/CloseWhenKeyIdle.java Fri Mar 23 18:44:47 2018 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -62,22 +62,6 @@
public static void main(String[] args) throws Exception {
- // Skip test on pre-2.6 kernels until the poll SelectorProvider
- // is updated
- String osname = System.getProperty("os.name");
- if (osname.equals("Linux")) {
- String[] ver = System.getProperty("os.version").split("\\.", 0);
- if (ver.length >=2 ) {
- int major = Integer.parseInt(ver[0]);
- int minor = Integer.parseInt(ver[1]);
- if (major < 2 || (major == 2 && minor < 6)) {
- System.out.println("Test passing on pre-2.6 kernel");
- return;
- }
- }
- }
-
-
// establish loopback connection
ServerSocketChannel ssc = ServerSocketChannel.open();
diff -r eb72d194235c -r 514c68575523 test/jdk/java/util/Collection/MOAT.java
--- a/test/jdk/java/util/Collection/MOAT.java Fri Mar 23 18:01:52 2018 +0000
+++ b/test/jdk/java/util/Collection/MOAT.java Fri Mar 23 18:44:47 2018 +0000
@@ -26,7 +26,7 @@
* @bug 6207984 6272521 6192552 6269713 6197726 6260652 5073546 4137464
* 4155650 4216399 4294891 6282555 6318622 6355327 6383475 6420753
* 6431845 4802633 6570566 6570575 6570631 6570924 6691185 6691215
- * 4802647 7123424 8024709
+ * 4802647 7123424 8024709 8193128
* @summary Run many tests on many Collection and Map implementations
* @author Martin Buchholz
* @modules java.base/java.util:open
@@ -212,8 +212,11 @@
// Immutable List
testEmptyList(List.of());
+ testEmptyList(List.of().subList(0,0));
testListMutatorsAlwaysThrow(List.of());
+ testListMutatorsAlwaysThrow(List.of().subList(0,0));
testEmptyListMutatorsAlwaysThrow(List.of());
+ testEmptyListMutatorsAlwaysThrow(List.of().subList(0,0));
for (List list : Arrays.asList(
List.of(),
List.of(1),
@@ -230,6 +233,17 @@
testCollection(list);
testImmutableList(list);
testListMutatorsAlwaysThrow(list);
+ if (list.size() >= 1) {
+ // test subLists
+ List headList = list.subList(0, list.size() - 1);
+ List