From 2cf11bb58d7322254d0b2ade8e08f220d22adbdf Mon Sep 17 00:00:00 2001 From: Sergey Bylokhov Date: Tue, 4 Oct 2016 12:18:05 +0100 Subject: [PATCH] 8167028: SunCodec.java can be removed Reviewed-by: prr, amenkov --- .../com/sun/media/sound/AlawCodec.java | 26 +++---- .../sound/AudioFloatFormatConverter.java | 5 +- .../com/sun/media/sound/PCMtoPCMCodec.java | 28 +++----- .../classes/com/sun/media/sound/SunCodec.java | 71 ------------------- .../com/sun/media/sound/UlawCodec.java | 27 +++---- .../sampled/spi/FormatConversionProvider.java | 59 ++++----------- 6 files changed, 57 insertions(+), 159 deletions(-) delete mode 100644 jdk/src/java.desktop/share/classes/com/sun/media/sound/SunCodec.java diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AlawCodec.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AlawCodec.java index 30dd2e8d726..a585a2b93ce 100644 --- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AlawCodec.java +++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AlawCodec.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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 @@ -30,25 +30,26 @@ import java.util.Objects; import java.util.Vector; import javax.sound.sampled.AudioFormat; +import javax.sound.sampled.AudioFormat.Encoding; import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.AudioSystem; +import javax.sound.sampled.spi.FormatConversionProvider; /** * A-law encodes linear data, and decodes a-law data to linear data. * * @author Kara Kytle */ -public final class AlawCodec extends SunCodec { +public final class AlawCodec extends FormatConversionProvider { /* Tables used for A-law decoding */ private static final byte[] ALAW_TABH = new byte[256]; private static final byte[] ALAW_TABL = new byte[256]; - private static final AudioFormat.Encoding[] alawEncodings = { AudioFormat.Encoding.ALAW, AudioFormat.Encoding.PCM_SIGNED }; - - private static final short seg_end [] = {0xFF, 0x1FF, 0x3FF, - 0x7FF, 0xFFF, 0x1FFF, 0x3FFF, 0x7FFF}; + private static final short seg_end[] = { + 0xFF, 0x1FF, 0x3FF, 0x7FF, 0xFFF, 0x1FFF, 0x3FFF, 0x7FFF + }; /** * Initializes the decode tables. @@ -73,13 +74,14 @@ public final class AlawCodec extends SunCodec { } } + @Override + public AudioFormat.Encoding[] getSourceEncodings() { + return new Encoding[]{Encoding.ALAW, Encoding.PCM_SIGNED}; + } - /** - * Constructs a new ALAW codec object. - */ - public AlawCodec() { - - super(alawEncodings, alawEncodings); + @Override + public AudioFormat.Encoding[] getTargetEncodings() { + return getSourceEncodings(); } @Override diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java index d28729fd7c5..6dbbb338450 100644 --- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java +++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 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 @@ -562,8 +562,7 @@ public final class AudioFloatFormatConverter extends FormatConversionProvider { @Override public Encoding[] getTargetEncodings() { - return new Encoding[] { Encoding.PCM_SIGNED, Encoding.PCM_UNSIGNED, - Encoding.PCM_FLOAT }; + return getSourceEncodings(); } @Override diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/PCMtoPCMCodec.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/PCMtoPCMCodec.java index edb26d5c9a5..f623d7db60e 100644 --- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/PCMtoPCMCodec.java +++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/PCMtoPCMCodec.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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 @@ -30,32 +30,26 @@ import java.util.Objects; import java.util.Vector; import javax.sound.sampled.AudioFormat; +import javax.sound.sampled.AudioFormat.Encoding; import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.AudioSystem; +import javax.sound.sampled.spi.FormatConversionProvider; /** * Converts among signed/unsigned and little/big endianness of sampled. * * @author Jan Borgersen */ -public final class PCMtoPCMCodec extends SunCodec { +public final class PCMtoPCMCodec extends FormatConversionProvider { - private static final AudioFormat.Encoding[] inputEncodings = { - AudioFormat.Encoding.PCM_SIGNED, - AudioFormat.Encoding.PCM_UNSIGNED, - }; + @Override + public AudioFormat.Encoding[] getSourceEncodings() { + return new Encoding[]{Encoding.PCM_SIGNED, Encoding.PCM_UNSIGNED}; + } - private static final AudioFormat.Encoding[] outputEncodings = { - AudioFormat.Encoding.PCM_SIGNED, - AudioFormat.Encoding.PCM_UNSIGNED, - }; - - /** - * Constructs a new PCMtoPCM codec object. - */ - public PCMtoPCMCodec() { - - super( inputEncodings, outputEncodings); + @Override + public AudioFormat.Encoding[] getTargetEncodings() { + return getSourceEncodings(); } @Override diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SunCodec.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SunCodec.java deleted file mode 100644 index a878d123e15..00000000000 --- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SunCodec.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 1999, 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. - */ - -package com.sun.media.sound; - -import javax.sound.sampled.AudioFormat; -import javax.sound.sampled.spi.FormatConversionProvider; - -/** - * A codec can encode and/or decode audio data. It provides an - * AudioInputStream from which processed data may be read. - *

- * Its input format represents the format of the incoming - * audio data, or the format of the data in the underlying stream. - *

- * Its output format represents the format of the processed, outgoing - * audio data. This is the format of the data which may be read from - * the filtered stream. - * - * @author Kara Kytle - */ -abstract class SunCodec extends FormatConversionProvider { - - private final AudioFormat.Encoding[] inputEncodings; - private final AudioFormat.Encoding[] outputEncodings; - - /** - * Constructs a new codec object. - */ - SunCodec(final AudioFormat.Encoding[] inputEncodings, - final AudioFormat.Encoding[] outputEncodings) { - this.inputEncodings = inputEncodings; - this.outputEncodings = outputEncodings; - } - - @Override - public final AudioFormat.Encoding[] getSourceEncodings() { - AudioFormat.Encoding[] encodings = new AudioFormat.Encoding[inputEncodings.length]; - System.arraycopy(inputEncodings, 0, encodings, 0, inputEncodings.length); - return encodings; - } - - @Override - public final AudioFormat.Encoding[] getTargetEncodings() { - AudioFormat.Encoding[] encodings = new AudioFormat.Encoding[outputEncodings.length]; - System.arraycopy(outputEncodings, 0, encodings, 0, outputEncodings.length); - return encodings; - } -} diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/UlawCodec.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/UlawCodec.java index 3d39395da9c..77564e86c27 100644 --- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/UlawCodec.java +++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/UlawCodec.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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 @@ -30,26 +30,26 @@ import java.util.Objects; import java.util.Vector; import javax.sound.sampled.AudioFormat; +import javax.sound.sampled.AudioFormat.Encoding; import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.AudioSystem; +import javax.sound.sampled.spi.FormatConversionProvider; /** * U-law encodes linear data, and decodes u-law data to linear data. * * @author Kara Kytle */ -public final class UlawCodec extends SunCodec { +public final class UlawCodec extends FormatConversionProvider { /* Tables used for U-law decoding */ private static final byte[] ULAW_TABH = new byte[256]; private static final byte[] ULAW_TABL = new byte[256]; - private static final AudioFormat.Encoding[] ulawEncodings = {AudioFormat.Encoding.ULAW, - AudioFormat.Encoding.PCM_SIGNED}; - - private static final short seg_end [] = {0xFF, 0x1FF, 0x3FF, - 0x7FF, 0xFFF, 0x1FFF, 0x3FFF, 0x7FFF}; + private static final short seg_end[] = { + 0xFF, 0x1FF, 0x3FF, 0x7FF, 0xFFF, 0x1FFF, 0x3FFF, 0x7FFF + }; /** * Initializes the decode tables. @@ -69,11 +69,14 @@ public final class UlawCodec extends SunCodec { } } - /** - * Constructs a new ULAW codec object. - */ - public UlawCodec() { - super(ulawEncodings, ulawEncodings); + @Override + public AudioFormat.Encoding[] getSourceEncodings() { + return new Encoding[]{Encoding.ULAW, Encoding.PCM_SIGNED}; + } + + @Override + public AudioFormat.Encoding[] getTargetEncodings() { + return getSourceEncodings(); } @Override diff --git a/jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/FormatConversionProvider.java b/jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/FormatConversionProvider.java index 565db2d4a66..9860ad3d476 100644 --- a/jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/FormatConversionProvider.java +++ b/jdk/src/java.desktop/share/classes/javax/sound/sampled/spi/FormatConversionProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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 @@ -25,7 +25,7 @@ package javax.sound.sampled.spi; -import java.util.Objects; +import java.util.stream.Stream; import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioInputStream; @@ -81,16 +81,8 @@ public abstract class FormatConversionProvider { * {@code false} * @throws NullPointerException if {@code sourceEncoding} is {@code null} */ - public boolean isSourceEncodingSupported(Encoding sourceEncoding) { - Objects.requireNonNull(sourceEncoding); - Encoding sourceEncodings[] = getSourceEncodings(); - - for(int i=0; i