From fcb78cba3f049a660316952523cc5c799d60bfe5 Mon Sep 17 00:00:00 2001
From: Lyubomir Marinov <lyubomir.marinov@jitsi.org>
Date: Wed, 20 Jun 2012 02:01:01 +0000
Subject: [PATCH] Commits an initial version of the libjitsi library which
 should be fully functional with respect to neomedia/MediaService and should
 be usable with and without OSGi.

---
 .../windows/msofficecomm/NoStdCPlusPlus.cxx   |  11 ------
 src/native/windows/msofficecomm/build-x64.sh  |  37 ------------------
 src/native/windows/msofficecomm/build-x86.sh  |  37 ------------------
 src/native/windows/msofficecomm/msgrua.tlb    | Bin 31476 -> 0 bytes
 .../neomedia/device/DeviceConfiguration.java  |   6 +--
 .../protocol/portaudio/PortAudioStream.java   |  33 +++++++++++-----
 6 files changed, 27 insertions(+), 97 deletions(-)
 delete mode 100644 src/native/windows/msofficecomm/NoStdCPlusPlus.cxx
 delete mode 100755 src/native/windows/msofficecomm/build-x64.sh
 delete mode 100755 src/native/windows/msofficecomm/build-x86.sh
 delete mode 100644 src/native/windows/msofficecomm/msgrua.tlb

diff --git a/src/native/windows/msofficecomm/NoStdCPlusPlus.cxx b/src/native/windows/msofficecomm/NoStdCPlusPlus.cxx
deleted file mode 100644
index 0662baf93..000000000
--- a/src/native/windows/msofficecomm/NoStdCPlusPlus.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-#include <stdlib.h>
-
-void * operator new (size_t size) { return ::malloc(size); }
-void operator delete (void *ptr) { ::free(ptr); }
-void *__cxa_pure_virtual = NULL;
diff --git a/src/native/windows/msofficecomm/build-x64.sh b/src/native/windows/msofficecomm/build-x64.sh
deleted file mode 100755
index b6292a3ef..000000000
--- a/src/native/windows/msofficecomm/build-x64.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-CC=x86_64-w64-mingw32-gcc
-JAVA_HOME=$HOME/Downloads/jdk-7u4-windows-i586
-OCSDK_HOME=$HOME/Downloads/OCSDK
-WINVER=0x0501
-
-BASE_DIR=`dirname $0`
-if [ "x${BASE_DIR}" = "x" ]; then
-    BASE_DIR=.
-else
-    BASE_DIR=`cd ${BASE_DIR}/../../../../ && pwd`
-fi
-SRC_DIR=${BASE_DIR}/src/native/windows/msofficecomm
-STRIP=`echo ${CC} | sed 's/gcc/strip/'`
-TARGET=${BASE_DIR}/lib/native/windows-64/jmsofficecomm.dll
-
-for CXX_FILE in ${SRC_DIR}/*.cxx; do
-    ${CC} \
-        -c \
-        -D_JNI_IMPLEMENTATION_ -D_UNICODE -DUNICODE -D_WIN32_WINNT=${WINVER} -DWINVER=${WINVER} \
-        -fno-exceptions -fno-rtti \
-        -I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32 -I${OCSDK_HOME} \
-        -O2 \
-        -Wall \
-        -x 'c++' \
-        ${CXX_FILE} \
-        -o ${SRC_DIR}/`basename ${CXX_FILE} .cxx`.o
-done
-${CC} \
-        -shared \
-        -Wl,--kill-at \
-        ${SRC_DIR}/*.o \
-        ${SRC_DIR}/*.res \
-        -o ${TARGET} \
-        -lole32 -loleaut32 -luuid
-${STRIP} -x ${TARGET}
diff --git a/src/native/windows/msofficecomm/build-x86.sh b/src/native/windows/msofficecomm/build-x86.sh
deleted file mode 100755
index 584c711a3..000000000
--- a/src/native/windows/msofficecomm/build-x86.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-CC=i686-w64-mingw32-gcc
-JAVA_HOME=$HOME/Downloads/jdk-7u4-windows-i586
-OCSDK_HOME=$HOME/Downloads/OCSDK
-WINVER=0x0501
-
-BASE_DIR=`dirname $0`
-if [ "x${BASE_DIR}" = "x" ]; then
-    BASE_DIR=.
-else
-    BASE_DIR=`cd ${BASE_DIR}/../../../../ && pwd`
-fi
-SRC_DIR=${BASE_DIR}/src/native/windows/msofficecomm
-STRIP=`echo ${CC} | sed 's/gcc/strip/'`
-TARGET=${BASE_DIR}/lib/native/windows/jmsofficecomm.dll
-
-for CXX_FILE in ${SRC_DIR}/*.cxx; do
-    ${CC} \
-        -c \
-        -D_JNI_IMPLEMENTATION_ -D_UNICODE -DUNICODE -D_WIN32_WINNT=${WINVER} -DWINVER=${WINVER} \
-        -fno-exceptions -fno-rtti \
-        -I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32 -I${OCSDK_HOME} \
-        -O2 \
-        -Wall \
-        -x 'c++' \
-        ${CXX_FILE} \
-        -o ${SRC_DIR}/`basename ${CXX_FILE} .cxx`.o
-done
-${CC} \
-        -shared \
-        -Wl,--kill-at \
-        ${SRC_DIR}/*.o \
-        ${SRC_DIR}/*.res \
-        -o ${TARGET} \
-        -lole32 -loleaut32 -luuid
-${STRIP} -x ${TARGET}
diff --git a/src/native/windows/msofficecomm/msgrua.tlb b/src/native/windows/msofficecomm/msgrua.tlb
deleted file mode 100644
index 86e3ef94f2bff17c6ebb08c5b2aa374f231e6a92..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 31476
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
J4B%D3{{zi_n5_T+

diff --git a/src/net/java/sip/communicator/impl/neomedia/device/DeviceConfiguration.java b/src/net/java/sip/communicator/impl/neomedia/device/DeviceConfiguration.java
index 07576ddcb..c78854f2f 100644
--- a/src/net/java/sip/communicator/impl/neomedia/device/DeviceConfiguration.java
+++ b/src/net/java/sip/communicator/impl/neomedia/device/DeviceConfiguration.java
@@ -76,13 +76,13 @@ public class DeviceConfiguration
      * The default value to be used for the {@link #PROP_AUDIO_DENOISE} property
      * when it does not have a value.
      */
-    private static final boolean DEFAULT_AUDIO_DENOISE = true;
+    public static final boolean DEFAULT_AUDIO_DENOISE = true;
 
     /**
      * The default value to be used for the {@link #PROP_AUDIO_ECHOCANCEL}
      * property when it does not have a value.
      */
-    private static final boolean DEFAULT_AUDIO_ECHOCANCEL = true;
+    public static final boolean DEFAULT_AUDIO_ECHOCANCEL = true;
 
     /**
      * The default value to be used for the
@@ -92,7 +92,7 @@ public class DeviceConfiguration
      * reverberation time is in the order of 300 ms, so a filter length of 100
      * ms is a good choice (800 samples at 8000 Hz sampling rate).
      */
-    private static final long DEFAULT_AUDIO_ECHOCANCEL_FILTER_LENGTH_IN_MILLIS
+    public static final long DEFAULT_AUDIO_ECHOCANCEL_FILTER_LENGTH_IN_MILLIS
         = 100;
 
     /**
diff --git a/src/net/java/sip/communicator/impl/neomedia/jmfext/media/protocol/portaudio/PortAudioStream.java b/src/net/java/sip/communicator/impl/neomedia/jmfext/media/protocol/portaudio/PortAudioStream.java
index 861cae5f6..ea6195ecc 100644
--- a/src/net/java/sip/communicator/impl/neomedia/jmfext/media/protocol/portaudio/PortAudioStream.java
+++ b/src/net/java/sip/communicator/impl/neomedia/jmfext/media/protocol/portaudio/PortAudioStream.java
@@ -353,18 +353,33 @@ synchronized void setDeviceIndex(int deviceIndex)
                             Format.NOT_SPECIFIED /* frameRate */,
                             Format.byteArray);
 
-            DeviceConfiguration deviceConfig
-                = NeomediaActivator
-                    .getMediaServiceImpl()
-                        .getDeviceConfiguration();
+            MediaServiceImpl mediaServiceImpl
+                = NeomediaActivator.getMediaServiceImpl();
+            boolean denoise = DeviceConfiguration.DEFAULT_AUDIO_DENOISE;
+            boolean echoCancel = DeviceConfiguration.DEFAULT_AUDIO_ECHOCANCEL;
+            long echoCancelFilterLengthInMillis
+                = DeviceConfiguration
+                    .DEFAULT_AUDIO_ECHOCANCEL_FILTER_LENGTH_IN_MILLIS;
+
+            if (mediaServiceImpl != null)
+            {
+                DeviceConfiguration devCfg
+                    = mediaServiceImpl.getDeviceConfiguration();
 
-            PortAudio.setDenoise(
-                    stream,
-                    audioQualityImprovement && deviceConfig.isDenoise());
+                if (devCfg != null)
+                {
+                    denoise = devCfg.isDenoise();
+                    echoCancel = devCfg.isEchoCancel();
+                    echoCancelFilterLengthInMillis
+                        = devCfg.getEchoCancelFilterLengthInMillis();
+                }
+            }
+
+            PortAudio.setDenoise(stream, audioQualityImprovement && denoise);
             PortAudio.setEchoFilterLengthInMillis(
                     stream,
-                    (audioQualityImprovement && deviceConfig.isEchoCancel())
-                        ? deviceConfig.getEchoCancelFilterLengthInMillis()
+                    (audioQualityImprovement && echoCancel)
+                        ? echoCancelFilterLengthInMillis
                         : 0);
         }
     }