Added audio cache for wav tracks

.gitignore

@@ -28,3 +28,6 @@ classes
 media-server-docs/sources-mobicents/src
 media-server-docs/sources-telscale/src
 client/jsr-309/tck/tck-run
+
+/**/*.iml
+.idea

bootstrap/src/main/config/mediaserver.xml

@@ -54,7 +54,12 @@
 	<resources>
 		<localConnection poolSize="100" />
 		<remoteConnection poolSize="50" />
-		<player poolSize="50" />
+		<player poolSize="50">
+			<cache>
+				<cacheSize>100</cacheSize>
+				<cacheEnabled>false</cacheEnabled>
+			</cache>
+		</player>
 		<recorder poolSize="50" />
 		<dtmfDetector poolSize="50" dbi="-35" />
 		<dtmfGenerator poolSize="50" toneVolume="-20" toneDuration="80" />

bootstrap/src/main/java/org/mobicents/media/server/bootstrap/configuration/XmlConfigurationLoader.java

@@ -27,6 +27,7 @@
 import org.apache.commons.configuration2.XMLConfiguration;
 import org.apache.commons.configuration2.builder.fluent.Configurations;
 import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
 import org.apache.commons.configuration2.tree.ImmutableNode;
 import org.apache.log4j.Logger;
 import org.mobicents.media.core.configuration.DtlsConfiguration;
@@ -136,6 +137,7 @@ private static void configureResource(HierarchicalConfiguration<ImmutableNode> s
         dst.setDtmfGeneratorToneDuration(src.getInt("dtmfGenerator[@toneDuration]", ResourcesConfiguration.DTMF_GENERATOR_TONE_DURATION));
         dst.setSignalDetectorCount(src.getInt("signalDetector[@poolSize]", ResourcesConfiguration.SIGNAL_DETECTOR_COUNT));
         dst.setSignalGeneratorCount(src.getInt("signalGenerator[@poolSize]", ResourcesConfiguration.SIGNAL_GENERATOR_COUNT));
+        configurePlayer(src, dst);
     }
 
     private static void configureDtls(HierarchicalConfiguration<ImmutableNode> src, DtlsConfiguration dst){
@@ -147,4 +149,21 @@ private static void configureDtls(HierarchicalConfiguration<ImmutableNode> src,
         dst.setAlgorithmCertificate(src.getString("certificate[@algorithm]", DtlsConfiguration.ALGORITHM_CERTIFICATE));
     }
 
+    private static void configurePlayer(HierarchicalConfiguration<ImmutableNode> src, ResourcesConfiguration dst) {
+        HierarchicalConfiguration<ImmutableNode> player = src.configurationAt("player");
+        dst.setPlayerCount(player.getInt("[@poolSize]", ResourcesConfiguration.PLAYER_COUNT));
+
+        HierarchicalConfiguration<ImmutableNode> cache;
+        try {
+            cache = player.configurationAt("cache");
+        } catch (ConfigurationRuntimeException exception) {
+            log.info("No cache was specified for player");
+            return;
+        }
+        dst.setPlayerCache(
+                cache.getBoolean("cacheEnabled", ResourcesConfiguration.PLAYER_CACHE_ENABLED),
+                cache.getInt("cacheSize", ResourcesConfiguration.PLAYER_CACHE_SIZE)
+        );
+
+    }
 }

bootstrap/src/main/java/org/mobicents/media/server/bootstrap/ioc/BootstrapModule.java

@@ -22,6 +22,7 @@
 package org.mobicents.media.server.bootstrap.ioc;
 
 import org.mobicents.media.core.configuration.MediaServerConfiguration;
+import org.mobicents.media.server.bootstrap.ioc.provider.DirectRemoteStreamProvider;
 import org.mobicents.media.server.bootstrap.ioc.provider.AudioPlayerFactoryProvider;
 import org.mobicents.media.server.bootstrap.ioc.provider.AudioPlayerPoolProvider;
 import org.mobicents.media.server.bootstrap.ioc.provider.AudioRecorderFactoryProvider;
@@ -75,6 +76,8 @@
 import org.mobicents.media.server.scheduler.Scheduler;
 import org.mobicents.media.server.spi.ServerManager;
 import org.mobicents.media.server.spi.dsp.DspFactory;
+import org.mobicents.media.server.bootstrap.ioc.provider.CachedRemoteStreamProvider;
+import org.mobicents.media.server.impl.resource.mediaplayer.audio.RemoteStreamProvider;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Singleton;
@@ -120,6 +123,12 @@ protected void configure() {
         bind(EndpointInstallerListType.INSTANCE).toProvider(EndpointInstallerListProvider.class).in(Singleton.class);
         bind(ServerManager.class).toProvider(MgcpControllerProvider.class).in(Singleton.class);
         bind(DtlsSrtpServerProvider.class).toProvider(DtlsSrtpServerProviderProvider.class).in(Singleton.class);
+        Class remoteStreamProvider;
+        if (this.config.getResourcesConfiguration().getPlayerCacheEnabled()) {
+            remoteStreamProvider = CachedRemoteStreamProvider.class;
+        } else {
+            remoteStreamProvider = DirectRemoteStreamProvider.class;
+        }
+        bind(RemoteStreamProvider.class).toProvider(remoteStreamProvider).in(Singleton.class);
     }
-
 }

bootstrap/src/main/java/org/mobicents/media/server/bootstrap/ioc/provider/AudioPlayerFactoryProvider.java

@@ -21,6 +21,7 @@
 
 package org.mobicents.media.server.bootstrap.ioc.provider;
 
+import org.mobicents.media.server.impl.resource.mediaplayer.audio.RemoteStreamProvider;
 import org.mobicents.media.server.impl.resource.mediaplayer.audio.AudioPlayerFactory;
 import org.mobicents.media.server.impl.resource.mediaplayer.audio.AudioPlayerImpl;
 import org.mobicents.media.server.scheduler.PriorityQueueScheduler;
@@ -39,16 +40,18 @@ public class AudioPlayerFactoryProvider implements Provider<AudioPlayerFactory>
 
     private final PriorityQueueScheduler mediaScheduler;
     private final DspFactory dspFactory;
+    private final RemoteStreamProvider remoteStreamProvider;
 
     @Inject
-    public AudioPlayerFactoryProvider(PriorityQueueScheduler mediaScheduler, DspFactory dspFactory) {
+    public AudioPlayerFactoryProvider(PriorityQueueScheduler mediaScheduler, DspFactory dspFactory, RemoteStreamProvider remoteStreamProvider) {
         this.mediaScheduler = mediaScheduler;
         this.dspFactory = dspFactory;
+        this.remoteStreamProvider = remoteStreamProvider;
     }
 
     @Override
     public AudioPlayerFactory get() {
-        return new AudioPlayerFactory(mediaScheduler, dspFactory);
+        return new AudioPlayerFactory(mediaScheduler, dspFactory, remoteStreamProvider);
     }
 
     public static final class AudioPlayerFactoryType extends TypeLiteral<PooledObjectFactory<AudioPlayerImpl>> {

bootstrap/src/main/java/org/mobicents/media/server/bootstrap/ioc/provider/CachedRemoteStreamProvider.java

@@ -0,0 +1,23 @@
+package org.mobicents.media.server.bootstrap.ioc.provider;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import org.mobicents.media.core.configuration.MediaServerConfiguration;
+
+/**
+ * Created by achikin on 6/3/16.
+ */
+public class CachedRemoteStreamProvider implements Provider<org.mobicents.media.server.impl.resource.mediaplayer.audio.CachedRemoteStreamProvider> {
+
+    private static org.mobicents.media.server.impl.resource.mediaplayer.audio.CachedRemoteStreamProvider instance;
+
+    @Inject
+    public CachedRemoteStreamProvider(MediaServerConfiguration config) {
+        instance = new org.mobicents.media.server.impl.resource.mediaplayer.audio.CachedRemoteStreamProvider(config.getResourcesConfiguration().getPlayerCacheSize());
+    }
+
+    @Override
+    public org.mobicents.media.server.impl.resource.mediaplayer.audio.CachedRemoteStreamProvider get() {
+        return instance;
+    }
+}

bootstrap/src/main/java/org/mobicents/media/server/bootstrap/ioc/provider/DirectRemoteStreamProvider.java

@@ -0,0 +1,20 @@
+package org.mobicents.media.server.bootstrap.ioc.provider;
+
+import com.google.inject.Provider;
+
+/**
+ * Created by achikin on 6/7/16.
+ */
+public class DirectRemoteStreamProvider implements Provider<org.mobicents.media.server.impl.resource.mediaplayer.audio.DirectRemoteStreamProvider> {
+
+    private org.mobicents.media.server.impl.resource.mediaplayer.audio.DirectRemoteStreamProvider instance;
+
+    public DirectRemoteStreamProvider() {
+        instance = new org.mobicents.media.server.impl.resource.mediaplayer.audio.DirectRemoteStreamProvider();
+    }
+
+    @Override
+    public org.mobicents.media.server.impl.resource.mediaplayer.audio.DirectRemoteStreamProvider get() {
+        return instance;
+    }
+}

bootstrap/src/test/java/org/mobicents/media/server/bootstrap/configuration/XmlConfigurationLoaderTest.java

@@ -93,7 +93,6 @@ public void testLoadConfiguration() throws Exception {
         ResourcesConfiguration resources = config.getResourcesConfiguration();
         Assert.assertEquals(200, resources.getLocalConnectionCount());
         Assert.assertEquals(100, resources.getRemoteConnectionCount());
-        Assert.assertEquals(100, resources.getPlayerCount());
         Assert.assertEquals(100, resources.getRecorderCount());
         Assert.assertEquals(100, resources.getDtmfDetectorCount());
         Assert.assertEquals(-25, resources.getDtmfDetectorDbi());
@@ -115,6 +114,10 @@ public void testLoadConfiguration() throws Exception {
         Assert.assertEquals(DtlsConfiguration.KEY_PATH, dtls.getKeyPath());
         Assert.assertEquals(SignatureAlgorithm.ecdsa, dtls.getAlgorithmCertificate().getSignatureAlgorithm());
         Assert.assertEquals(ClientCertificateType.ecdsa_sign, dtls.getAlgorithmCertificate().getClientCertificate());
+
+        Assert.assertEquals(100, resources.getPlayerCount());
+        Assert.assertEquals(100, resources.getPlayerCacheSize());
+        Assert.assertEquals(true, resources.getPlayerCacheEnabled());
     }
 
     /**

bootstrap/src/test/resources/mediaserver.xml

@@ -48,7 +48,12 @@
 	<resources>
 		<localConnection poolSize="200" />
 		<remoteConnection poolSize="100" />
-		<player poolSize="100" />
+		<player poolSize="100">
+			<cache>
+				<cacheSize>100</cacheSize>
+				<cacheEnabled>true</cacheEnabled>
+			</cache>
+		</player>
 		<recorder poolSize="100" />
 		<dtmfDetector poolSize="100" dbi="-25" />
 		<dtmfGenerator poolSize="100" toneVolume="-25" toneDuration="100" />

client/pom.xml

@@ -14,7 +14,7 @@
     <name>Client</name>
 
     <modules>
-        <module>jsr-309</module>
+        <!--<module>jsr-309</module>-->
         <module>mgcp</module>
     </modules>
 

controls/mgcp/src/test/java/org/mobicents/media/server/mgcp/endpoint/BridgeEndpointTest.java

@@ -39,6 +39,7 @@
 import org.mobicents.media.server.impl.resource.dtmf.DtmfDetectorPool;
 import org.mobicents.media.server.impl.resource.dtmf.DtmfGeneratorFactory;
 import org.mobicents.media.server.impl.resource.dtmf.DtmfGeneratorPool;
+import org.mobicents.media.server.impl.resource.mediaplayer.audio.CachedRemoteStreamProvider;
 import org.mobicents.media.server.impl.resource.mediaplayer.audio.AudioPlayerFactory;
 import org.mobicents.media.server.impl.resource.mediaplayer.audio.AudioPlayerPool;
 import org.mobicents.media.server.impl.resource.phone.PhoneSignalDetectorFactory;
@@ -49,7 +50,6 @@
 import org.mobicents.media.server.mgcp.connection.LocalConnectionPool;
 import org.mobicents.media.server.mgcp.connection.RtpConnectionFactory;
 import org.mobicents.media.server.mgcp.connection.RtpConnectionPool;
-import org.mobicents.media.server.mgcp.endpoint.BridgeEndpoint;
 import org.mobicents.media.server.mgcp.endpoint.connection.RTPEnvironment;
 import org.mobicents.media.server.mgcp.resources.ResourcesPool;
 import org.mobicents.media.server.spi.Connection;
@@ -141,7 +141,7 @@ public void setUp() throws ResourceUnavailableException, TooManyConnectionsExcep
         this.rtpConnectionPool = new RtpConnectionPool(0, rtpConnectionFactory);
         this.localConnectionFactory = new LocalConnectionFactory(channelsManager);
         this.localConnectionPool = new LocalConnectionPool(0, localConnectionFactory);
-        this.playerFactory = new AudioPlayerFactory(mediaScheduler, dspFactory);
+        this.playerFactory = new AudioPlayerFactory(mediaScheduler, dspFactory, new CachedRemoteStreamProvider(100));
         this.playerPool = new AudioPlayerPool(0, playerFactory);
         this.recorderFactory = new AudioRecorderFactory(mediaScheduler);
         this.recorderPool = new AudioRecorderPool(0, recorderFactory);

controls/mgcp/src/test/java/org/mobicents/media/server/mgcp/endpoint/LocalMediaGroupTest.java

@@ -46,6 +46,7 @@
 import org.mobicents.media.server.impl.resource.dtmf.DtmfGeneratorFactory;
 import org.mobicents.media.server.impl.resource.dtmf.DtmfGeneratorPool;
 import org.mobicents.media.server.impl.resource.dtmf.GeneratorImpl;
+import org.mobicents.media.server.impl.resource.mediaplayer.audio.CachedRemoteStreamProvider;
 import org.mobicents.media.server.impl.resource.mediaplayer.audio.AudioPlayerFactory;
 import org.mobicents.media.server.impl.resource.mediaplayer.audio.AudioPlayerPool;
 import org.mobicents.media.server.impl.resource.phone.PhoneSignalDetectorFactory;
@@ -61,9 +62,6 @@
 import org.mobicents.media.server.mgcp.connection.LocalConnectionPool;
 import org.mobicents.media.server.mgcp.connection.RtpConnectionFactory;
 import org.mobicents.media.server.mgcp.connection.RtpConnectionPool;
-import org.mobicents.media.server.mgcp.endpoint.BaseMixerEndpointImpl;
-import org.mobicents.media.server.mgcp.endpoint.BridgeEndpoint;
-import org.mobicents.media.server.mgcp.endpoint.IvrEndpoint;
 import org.mobicents.media.server.mgcp.resources.ResourcesPool;
 import org.mobicents.media.server.scheduler.Clock;
 import org.mobicents.media.server.scheduler.PriorityQueueScheduler;
@@ -156,7 +154,7 @@ public void setUp() throws ResourceUnavailableException, IOException {
         this.rtpConnectionPool = new RtpConnectionPool(0, rtpConnectionFactory);
         this.localConnectionFactory = new LocalConnectionFactory(channelsManager);
         this.localConnectionPool = new LocalConnectionPool(0, localConnectionFactory);
-        this.playerFactory = new AudioPlayerFactory(mediaScheduler, dspFactory);
+        this.playerFactory = new AudioPlayerFactory(mediaScheduler, dspFactory, new CachedRemoteStreamProvider(100));
         this.playerPool = new AudioPlayerPool(0, playerFactory);
         this.recorderFactory = new AudioRecorderFactory(mediaScheduler);
         this.recorderPool = new AudioRecorderPool(0, recorderFactory);

controls/mgcp/src/test/java/org/mobicents/media/server/mgcp/endpoint/MediaGroupTest.java

@@ -46,6 +46,7 @@
 import org.mobicents.media.server.impl.resource.dtmf.DtmfGeneratorFactory;
 import org.mobicents.media.server.impl.resource.dtmf.DtmfGeneratorPool;
 import org.mobicents.media.server.impl.resource.dtmf.GeneratorImpl;
+import org.mobicents.media.server.impl.resource.mediaplayer.audio.CachedRemoteStreamProvider;
 import org.mobicents.media.server.impl.resource.mediaplayer.audio.AudioPlayerFactory;
 import org.mobicents.media.server.impl.resource.mediaplayer.audio.AudioPlayerPool;
 import org.mobicents.media.server.impl.resource.phone.PhoneSignalDetectorFactory;
@@ -61,8 +62,6 @@
 import org.mobicents.media.server.mgcp.connection.LocalConnectionPool;
 import org.mobicents.media.server.mgcp.connection.RtpConnectionFactory;
 import org.mobicents.media.server.mgcp.connection.RtpConnectionPool;
-import org.mobicents.media.server.mgcp.endpoint.BaseMixerEndpointImpl;
-import org.mobicents.media.server.mgcp.endpoint.IvrEndpoint;
 import org.mobicents.media.server.mgcp.resources.ResourcesPool;
 import org.mobicents.media.server.scheduler.Clock;
 import org.mobicents.media.server.scheduler.Scheduler;
@@ -155,7 +154,7 @@ public void setUp() throws ResourceUnavailableException, IOException, Interrupte
         this.rtpConnectionPool = new RtpConnectionPool(0, rtpConnectionFactory);
         this.localConnectionFactory = new LocalConnectionFactory(channelsManager);
         this.localConnectionPool = new LocalConnectionPool(0, localConnectionFactory);
-        this.playerFactory = new AudioPlayerFactory(mediaScheduler, dspFactory);
+        this.playerFactory = new AudioPlayerFactory(mediaScheduler, dspFactory, new CachedRemoteStreamProvider(100));
         this.playerPool = new AudioPlayerPool(0, playerFactory);
         this.recorderFactory = new AudioRecorderFactory(mediaScheduler);
         this.recorderPool = new AudioRecorderPool(0, recorderFactory);

controls/mgcp/src/test/java/org/mobicents/media/server/mgcp/endpoint/connection/BaseConnectionFSMTest1.java

@@ -44,6 +44,7 @@
 import org.mobicents.media.server.impl.resource.dtmf.DtmfDetectorPool;
 import org.mobicents.media.server.impl.resource.dtmf.DtmfGeneratorFactory;
 import org.mobicents.media.server.impl.resource.dtmf.DtmfGeneratorPool;
+import org.mobicents.media.server.impl.resource.mediaplayer.audio.CachedRemoteStreamProvider;
 import org.mobicents.media.server.impl.resource.mediaplayer.audio.AudioPlayerFactory;
 import org.mobicents.media.server.impl.resource.mediaplayer.audio.AudioPlayerPool;
 import org.mobicents.media.server.impl.resource.phone.PhoneSignalDetectorFactory;
@@ -139,7 +140,7 @@ public void setUp() throws ResourceUnavailableException, IOException, TooManyCon
         this.rtpConnectionPool = new RtpConnectionPool(0, rtpConnectionFactory);
         this.localConnectionFactory = new LocalConnectionFactory(channelsManager);
         this.localConnectionPool = new LocalConnectionPool(0, localConnectionFactory);
-        this.playerFactory = new AudioPlayerFactory(mediaScheduler, dspFactory);
+        this.playerFactory = new AudioPlayerFactory(mediaScheduler, dspFactory, new CachedRemoteStreamProvider(100));
         this.playerPool = new AudioPlayerPool(0, playerFactory);
         this.recorderFactory = new AudioRecorderFactory(mediaScheduler);
         this.recorderPool = new AudioRecorderPool(0, recorderFactory);

controls/mgcp/src/test/java/org/mobicents/media/server/mgcp/endpoint/connection/BaseConnectionFSM_FR_Test.java

@@ -44,6 +44,7 @@
 import org.mobicents.media.server.impl.resource.dtmf.DtmfDetectorPool;
 import org.mobicents.media.server.impl.resource.dtmf.DtmfGeneratorFactory;
 import org.mobicents.media.server.impl.resource.dtmf.DtmfGeneratorPool;
+import org.mobicents.media.server.impl.resource.mediaplayer.audio.CachedRemoteStreamProvider;
 import org.mobicents.media.server.impl.resource.mediaplayer.audio.AudioPlayerFactory;
 import org.mobicents.media.server.impl.resource.mediaplayer.audio.AudioPlayerPool;
 import org.mobicents.media.server.impl.resource.phone.PhoneSignalDetectorFactory;
@@ -142,7 +143,7 @@ public void setUp() throws ResourceUnavailableException, IOException {
         this.rtpConnectionPool = new RtpConnectionPool(0, rtpConnectionFactory);
         this.localConnectionFactory = new LocalConnectionFactory(channelsManager);
         this.localConnectionPool = new LocalConnectionPool(0, localConnectionFactory);
-        this.playerFactory = new AudioPlayerFactory(mediaScheduler, dspFactory);
+        this.playerFactory = new AudioPlayerFactory(mediaScheduler, dspFactory, new CachedRemoteStreamProvider(100));
         this.playerPool = new AudioPlayerPool(0, playerFactory);
         this.recorderFactory = new AudioRecorderFactory(mediaScheduler);
         this.recorderPool = new AudioRecorderPool(0, recorderFactory);

controls/mgcp/src/test/java/org/mobicents/media/server/mgcp/endpoint/connection/BaseConnectionTest.java

@@ -44,6 +44,7 @@
 import org.mobicents.media.server.impl.resource.dtmf.DtmfDetectorPool;
 import org.mobicents.media.server.impl.resource.dtmf.DtmfGeneratorFactory;
 import org.mobicents.media.server.impl.resource.dtmf.DtmfGeneratorPool;
+import org.mobicents.media.server.impl.resource.mediaplayer.audio.CachedRemoteStreamProvider;
 import org.mobicents.media.server.impl.resource.mediaplayer.audio.AudioPlayerFactory;
 import org.mobicents.media.server.impl.resource.mediaplayer.audio.AudioPlayerPool;
 import org.mobicents.media.server.impl.resource.phone.PhoneSignalDetectorFactory;
@@ -109,7 +110,7 @@ public class BaseConnectionTest implements ConnectionListener {
     private PhoneSignalDetectorPool signalDetectorPool;
     private PhoneSignalGeneratorFactory signalGeneratorFactory;
     private PhoneSignalGeneratorPool signalGeneratorPool;
-    
+
     //Dtls Server Provider
     protected ProtocolVersion minVersion = ProtocolVersion.DTLSv10;
     protected ProtocolVersion maxVersion = ProtocolVersion.DTLSv12;
@@ -126,6 +127,7 @@ public class BaseConnectionTest implements ConnectionListener {
     @Before
     public void setUp() throws ResourceUnavailableException, IOException, TooManyConnectionsException {
         //use default clock
+
         clock = new WallClock();
 
         //create single thread scheduler 
@@ -141,7 +143,7 @@ public void setUp() throws ResourceUnavailableException, IOException, TooManyCon
         this.rtpConnectionPool = new RtpConnectionPool(0, rtpConnectionFactory);
         this.localConnectionFactory = new LocalConnectionFactory(channelsManager);
         this.localConnectionPool = new LocalConnectionPool(0, localConnectionFactory);
-        this.playerFactory = new AudioPlayerFactory(mediaScheduler, dspFactory);
+        this.playerFactory = new AudioPlayerFactory(mediaScheduler, dspFactory, new CachedRemoteStreamProvider(100));
         this.playerPool = new AudioPlayerPool(0, playerFactory);
         this.recorderFactory = new AudioRecorderFactory(mediaScheduler);
         this.recorderPool = new AudioRecorderPool(0, recorderFactory);