From bae8206bd0935cb099d1189c26a97045e124d9de Mon Sep 17 00:00:00 2001
From: Lyubomir Marinov <lyubomir.marinov@jitsi.org>
Date: Fri, 3 Jan 2014 11:11:41 +0200
Subject: [PATCH] Applies formatting.
---
.../jitsi/impl/neomedia/MediaServiceImpl.java | 21 ++++----
.../codec/audio/g729/JavaDecoder.java | 53 +++++++++----------
.../device/AudioMixerMediaDevice.java | 9 ++--
.../media/protocol/wasapi/WASAPIStream.java | 6 +++
.../renderer/audio/AbstractAudioRenderer.java | 6 +++
.../media/renderer/audio/WASAPIRenderer.java | 2 +
6 files changed, 55 insertions(+), 42 deletions(-)
diff --git a/src/org/jitsi/impl/neomedia/MediaServiceImpl.java b/src/org/jitsi/impl/neomedia/MediaServiceImpl.java
index 478678b6..0da2349b 100755
--- a/src/org/jitsi/impl/neomedia/MediaServiceImpl.java
+++ b/src/org/jitsi/impl/neomedia/MediaServiceImpl.java
@@ -248,7 +248,6 @@ public MediaServiceImpl()
currentEncodingConfiguration
= new EncodingConfigurationConfigImpl(ENCODING_CONFIG_PROP_PREFIX);
-
/*
* Perform one-time initialization after initializing the first instance
* of MediaServiceImpl.
@@ -1515,11 +1514,10 @@ private static void postInitializeOnce(MediaServiceImpl mediaServiceImpl)
private static void setupFMJ()
{
/*
- * FMJ now uses java.util.logging.Logger, but only logs if
- * "allowLogging" is set in it's registry. Since the levels can be
- * configured through properties for the net.sf.fmj.media.Log class,
- * we always enable this (as opposed to only enabling it when
- * <tt>this.logger</tt> has debug enabled).
+ * FMJ now uses java.util.logging.Logger, but only logs if allowLogging
+ * is set in its registry. Since the levels can be configured through
+ * properties for the net.sf.fmj.media.Log class, we always enable this
+ * (as opposed to only enabling it when this.logger has debug enabled).
*/
Registry.set("allowLogging", true);
@@ -1544,7 +1542,7 @@ private static void setupFMJ()
{
String scHomeDirName
= System.getProperty(
- ConfigurationService.PNAME_SC_HOME_DIR_NAME);
+ ConfigurationService.PNAME_SC_HOME_DIR_NAME);
if (scHomeDirName != null)
{
@@ -1552,8 +1550,8 @@ private static void setupFMJ()
/* Write FMJ's log in Jitsi's log directory. */
Registry.set(
- "secure.logDir",
- new File(scHomeDir, "log").getPath());
+ "secure.logDir",
+ new File(scHomeDir, "log").getPath());
/* Write FMJ's registry in Jitsi's user data directory. */
String jmfRegistryFilename
@@ -1562,8 +1560,9 @@ private static void setupFMJ()
if (System.getProperty(jmfRegistryFilename) == null)
{
System.setProperty(
- jmfRegistryFilename,
- new File(scHomeDir, ".fmj.registry").getAbsolutePath());
+ jmfRegistryFilename,
+ new File(scHomeDir, ".fmj.registry")
+ .getAbsolutePath());
}
}
}
diff --git a/src/org/jitsi/impl/neomedia/codec/audio/g729/JavaDecoder.java b/src/org/jitsi/impl/neomedia/codec/audio/g729/JavaDecoder.java
index 6b5a33c5..99d8083f 100644
--- a/src/org/jitsi/impl/neomedia/codec/audio/g729/JavaDecoder.java
+++ b/src/org/jitsi/impl/neomedia/codec/audio/g729/JavaDecoder.java
@@ -15,7 +15,8 @@
import org.jitsi.impl.neomedia.codec.*;
/**
- * @author Lubomir Marinov
+ *
+ * @author Lyubomir Marinov
*/
public class JavaDecoder
extends AbstractCodec2
@@ -123,50 +124,46 @@ protected void doOpen()
* Implements AbstractCodecExt#doProcess(Buffer, Buffer).
*/
@Override
- protected int doProcess(Buffer inputBuffer, Buffer outputBuffer)
+ protected int doProcess(Buffer inBuffer, Buffer outBuffer)
{
- byte[] input = (byte[]) inputBuffer.getData();
-
- int inputLength = inputBuffer.getLength();
+ int inLength = inBuffer.getLength();
- if (inputLength < INPUT_FRAME_SIZE_IN_BYTES)
+ if (inLength < INPUT_FRAME_SIZE_IN_BYTES)
{
- discardOutputBuffer(outputBuffer);
+ discardOutputBuffer(outBuffer);
return BUFFER_PROCESSED_OK | OUTPUT_BUFFER_NOT_FILLED;
}
- int inputOffset = inputBuffer.getOffset();
+ byte[] in = (byte[]) inBuffer.getData();
+ int inOffset = inBuffer.getOffset();
- depacketize(input, inputOffset, serial);
- inputLength -= INPUT_FRAME_SIZE_IN_BYTES;
- inputBuffer.setLength(inputLength);
- inputOffset += INPUT_FRAME_SIZE_IN_BYTES;
- inputBuffer.setOffset(inputOffset);
+ depacketize(in, inOffset, serial);
+ inLength -= INPUT_FRAME_SIZE_IN_BYTES;
+ inBuffer.setLength(inLength);
+ inOffset += INPUT_FRAME_SIZE_IN_BYTES;
+ inBuffer.setOffset(inOffset);
decoder.process(serial, sp16);
- byte[] output
+ byte[] out
= validateByteArraySize(
- outputBuffer,
- outputBuffer.getOffset() + OUTPUT_FRAME_SIZE_IN_BYTES,
+ outBuffer,
+ outBuffer.getOffset() + OUTPUT_FRAME_SIZE_IN_BYTES,
true);
- writeShorts(sp16, output, outputBuffer.getOffset());
- outputBuffer.setLength(OUTPUT_FRAME_SIZE_IN_BYTES);
+ writeShorts(sp16, out, outBuffer.getOffset());
+ outBuffer.setLength(OUTPUT_FRAME_SIZE_IN_BYTES);
- int processResult = BUFFER_PROCESSED_OK;
+ int ret = BUFFER_PROCESSED_OK;
- if (inputLength > 0)
- processResult |= INPUT_BUFFER_NOT_CONSUMED;
- return processResult;
+ if (inLength > 0)
+ ret |= INPUT_BUFFER_NOT_CONSUMED;
+ return ret;
}
- private static void writeShorts(
- short[] input,
- byte[] output,
- int outputOffset)
+ private static void writeShorts(short[] in, byte[] out, int outOffset)
{
- for (int i=0, o=outputOffset; i<input.length; i++, o+=2)
- ArrayIOUtils.writeShort(input[i], output, o);
+ for (int i = 0, o = outOffset; i < in.length; i++, o += 2)
+ ArrayIOUtils.writeShort(in[i], out, o);
}
}
diff --git a/src/org/jitsi/impl/neomedia/device/AudioMixerMediaDevice.java b/src/org/jitsi/impl/neomedia/device/AudioMixerMediaDevice.java
index c82f9b52..fe1d6679 100644
--- a/src/org/jitsi/impl/neomedia/device/AudioMixerMediaDevice.java
+++ b/src/org/jitsi/impl/neomedia/device/AudioMixerMediaDevice.java
@@ -276,8 +276,10 @@ private void fireLocalUserAudioLevelChanged(int level)
= localUserAudioLevelListeners.size();
for(int i = 0; i < localUserAudioLevelListenerCount; i++)
+ {
localUserAudioLevelListeners.get(i).listener.audioLevelChanged(
level);
+ }
}
/**
@@ -310,9 +312,10 @@ protected void connect(
}
@Override
- protected void read( PushBufferStream stream,
- Buffer buffer,
- DataSource dataSource)
+ protected void read(
+ PushBufferStream stream,
+ Buffer buffer,
+ DataSource dataSource)
throws IOException
{
super.read(stream, buffer, dataSource);
diff --git a/src/org/jitsi/impl/neomedia/jmfext/media/protocol/wasapi/WASAPIStream.java b/src/org/jitsi/impl/neomedia/jmfext/media/protocol/wasapi/WASAPIStream.java
index 15566b93..6fb09e8a 100644
--- a/src/org/jitsi/impl/neomedia/jmfext/media/protocol/wasapi/WASAPIStream.java
+++ b/src/org/jitsi/impl/neomedia/jmfext/media/protocol/wasapi/WASAPIStream.java
@@ -831,7 +831,9 @@ private synchronized void connect()
catch (Throwable t)
{
if (t instanceof ThreadDeath)
+ {
throw (ThreadDeath) t;
+ }
else
{
logger.error(
@@ -839,7 +841,9 @@ private synchronized void connect()
+ " to an audio endpoint device.",
t);
if (t instanceof IOException)
+ {
throw (IOException) t;
+ }
else
{
IOException ioe = new IOException();
@@ -2329,7 +2333,9 @@ public void read(Buffer buffer)
Codec resampler = this.resampler;
if (resampler == null)
+ {
doRead(buffer);
+ }
else
{
Buffer resamplerBuffer = this.resamplerBuffer;
diff --git a/src/org/jitsi/impl/neomedia/jmfext/media/renderer/audio/AbstractAudioRenderer.java b/src/org/jitsi/impl/neomedia/jmfext/media/renderer/audio/AbstractAudioRenderer.java
index f3a51986..09b5514b 100644
--- a/src/org/jitsi/impl/neomedia/jmfext/media/renderer/audio/AbstractAudioRenderer.java
+++ b/src/org/jitsi/impl/neomedia/jmfext/media/renderer/audio/AbstractAudioRenderer.java
@@ -31,6 +31,12 @@
public abstract class AbstractAudioRenderer<T extends AudioSystem>
extends AbstractRenderer<AudioFormat>
{
+ /**
+ * The byte order of the running Java virtual machine expressed in the
+ * <tt>endian</tt> term of {@link AudioFormat}.
+ */
+ public static final int JAVA_AUDIO_FORMAT_ENDIAN = AudioFormat.BIG_ENDIAN;
+
/**
* The native byte order of the hardware upon which this Java virtual
* machine is running expressed in the <tt>endian</tt> term of
diff --git a/src/org/jitsi/impl/neomedia/jmfext/media/renderer/audio/WASAPIRenderer.java b/src/org/jitsi/impl/neomedia/jmfext/media/renderer/audio/WASAPIRenderer.java
index a708e57e..b42f5861 100644
--- a/src/org/jitsi/impl/neomedia/jmfext/media/renderer/audio/WASAPIRenderer.java
+++ b/src/org/jitsi/impl/neomedia/jmfext/media/renderer/audio/WASAPIRenderer.java
@@ -1446,7 +1446,9 @@ private void runInEventHandleCmd(Runnable eventHandleCmd)
written = toWrite;
}
else
+ {
written = 0;
+ }
}
if (written != 0)
{
--
GitLab