Revision: 17293
Author: [email protected]
Date: Fri Mar 11 04:09:43 2011
Log: Fix compilation errors
http://code.google.com/p/mobicents/source/detail?r=17293

Modified:
 /trunk/servers/media/io/local
/trunk/servers/media/io/local/src/main/java/org/mobicents/media/server/io/local/PipeImpl.java /trunk/servers/media/io/network/src/main/java/org/mobicents/media/server/io/network/UdpPeriphery.java /trunk/servers/media/io/rtp/src/main/java/org/mobicents/media/server/impl/rtp/RTPChannel.java
 /trunk/servers/media/resources/mediaplayer
/trunk/servers/media/resources/mediaplayer/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/MediaPlayerImpl.java /trunk/servers/media/resources/mediaplayer/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/audio/AudioPlayerFactory.java /trunk/servers/media/resources/mediaplayer/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/audio/AudioPlayerImpl.java /trunk/servers/media/resources/mediaplayer/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/video/VideoPlayerFactory.java /trunk/servers/media/resources/mediaplayer/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/video/VideoPlayerImpl.java /trunk/servers/media/resources/recorder/src/main/java/org/mobicents/media/server/impl/resource/audio/RecorderImpl.java /trunk/servers/media/resources/telephony/dtmf/src/main/java/org/mobicents/media/server/impl/resource/dtmf/DetectorImpl.java /trunk/servers/media/resources/telephony/dtmf/src/main/java/org/mobicents/media/server/impl/resource/dtmf/GeneratorImpl.java

=======================================
--- /trunk/servers/media/io/local/src/main/java/org/mobicents/media/server/io/local/PipeImpl.java Wed Jan 26 05:56:16 2011 +++ /trunk/servers/media/io/local/src/main/java/org/mobicents/media/server/io/local/PipeImpl.java Fri Mar 11 04:09:43 2011
@@ -39,5 +39,17 @@
     public void disconnect(int termination) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
+
+    public void disconnect() {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    public void start() {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    public void stop() {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }

 }
=======================================
--- /trunk/servers/media/io/network/src/main/java/org/mobicents/media/server/io/network/UdpPeriphery.java Tue Mar 8 03:40:41 2011 +++ /trunk/servers/media/io/network/src/main/java/org/mobicents/media/server/io/network/UdpPeriphery.java Fri Mar 11 04:09:43 2011
@@ -36,11 +36,9 @@
  *
  * @author kulikov
  */
-public class UdpPeriphery implements Task {
+public class UdpPeriphery extends Task {
     private final static int PORT_ANY = -1;

-    private Scheduler scheduler;
-
     /** Channel selector */
     private Selector selector;

@@ -50,14 +48,13 @@
     //port manager
     private PortManager portManager = new PortManager();

-    private volatile long deadline;
-
     /**
      * Creates UDP periphery.
      *
      * @throws IOException
      */
     public UdpPeriphery(Scheduler scheduler) throws IOException {
+        super(scheduler);
         this.scheduler = scheduler;
         this.selector = SelectorProvider.provider().openSelector();
     }
@@ -148,14 +145,6 @@
     public long getPriority() {
         return 0;
     }
-
-    public long getDeadLine() {
-        return this.deadline;
-    }
-
-    public void setDeadLine(long d) {
-        this.deadline = d;
-    }

     public long getDuration() {
         return 10000000L;
@@ -190,7 +179,7 @@
         } catch (IOException e) {
             return 0;
         } finally {
-            this.deadline = scheduler.getClock().getTime() + 1000000L;
+            setDeadLine(scheduler.getClock().getTime() + 1000000L);
             scheduler.submit(this);
         }

=======================================
--- /trunk/servers/media/io/rtp/src/main/java/org/mobicents/media/server/impl/rtp/RTPChannel.java Mon Feb 7 07:31:58 2011 +++ /trunk/servers/media/io/rtp/src/main/java/org/mobicents/media/server/impl/rtp/RTPChannel.java Fri Mar 11 04:09:43 2011
@@ -29,8 +29,9 @@
 import org.mobicents.media.server.impl.AbstractSource;
 import org.mobicents.media.server.impl.rtp.sdp.RTPFormat;
 import org.mobicents.media.server.io.network.ProtocolHandler;
+import org.mobicents.media.server.scheduler.Scheduler;
 import org.mobicents.media.server.scheduler.Task;
-import org.mobicents.media.server.spi.format.Format;
+import org.mobicents.media.server.spi.format.Formats;
 import org.mobicents.media.server.spi.memory.Frame;

 /**
@@ -75,6 +76,8 @@
     private JitterBuffer rxBuffer;
     private ConcurrentLinkedQueue<Frame> txBuffer;

+    private Formats formats = new Formats();
+
     /**
      * Create RTP channel instance.
      *
@@ -97,12 +100,10 @@
         rtpClock = new RtpClock(rtpManager.getClock());

         //receiver
-        input = new Input();
-        input.setScheduler(rtpManager.scheduler);
+        input = new Input(rtpManager.scheduler);

         //transmittor
-        output = new Output();
-        output.setScheduler(rtpManager.scheduler);
+        output = new Output(rtpManager.scheduler);

         rxBuffer = new JitterBuffer(rtpClock, jitter);
         rxBuffer.setListener(input);
@@ -204,8 +205,8 @@
      */
     private class RTPHandler implements ProtocolHandler {
         //The schedulable task for read operation
-        private RxTask rx = new RxTask();
-        private TxTask tx = new TxTask();
+        private RxTask rx = new RxTask(rtpManager.scheduler);
+        private TxTask tx = new TxTask(rtpManager.scheduler);

         /**
          * (Non Java-doc.)
@@ -270,8 +271,8 @@
         /**
          * Creates new receiver.
          */
-        protected Input() {
-            super("input");
+        protected Input(Scheduler scheduler) {
+            super("input", scheduler);
         }

         protected int getPacketsLost() {
@@ -300,8 +301,8 @@
          *
          * @see org.mobicents.media.MediaSource#getFormats()
          */
-        public Format[] getFormats() {
-            return rtpFormats.getFormats();
+        public Formats getNativeFormats() {
+            return formats;
         }

         /**
@@ -324,8 +325,8 @@
         /**
          * Creates new transmittor
          */
-        protected Output() {
-            super("Output");
+        protected Output(Scheduler scheduler) {
+            super("Output", scheduler);
         }

         @Override
@@ -338,8 +339,8 @@
          *
          * @see org.mobicents.media.MediaSink#getFormats()
          */
-        public Format[] getFormats() {
-            return rtpFormats.getFormats();
+        public Formats getNativeFormats() {
+            return formats;
         }
     }

@@ -347,59 +348,22 @@
      * Implements schedulabe rx job.
      *
      */
-    private class RxTask implements Task {
-
-        private long priority;
-        private volatile long deadLine;
-        private long duration;
-        private boolean isActive = true;
+    private class RxTask extends Task {

         //RTP packet representation
         private RtpPacket rtpPacket = new RtpPacket(8192, true);

+        private RxTask(Scheduler scheduler) {
+            super(scheduler);
+        }
+
         /**
          * (Non Java-doc.)
          *
          * @see org.mobicents.media.server.scheduler.Task#getPriority()
          */
         public long getPriority() {
-            return priority;
-        }
-
-        /**
-         * (Non Java-doc.)
-         *
-         * @see org.mobicents.media.server.scheduler.Task#setPriority(long)
-         */
-        public void setPriority(long priority) {
-            this.priority = priority;
-        }
-
-        /**
-         * (Non Java-doc.)
-         *
-         * @see org.mobicents.media.server.scheduler.Task#isActive()
-         */
-        public boolean isActive() {
-            return this.isActive;
-        }
-
-        /**
-         * (Non Java-doc.)
-         *
-         * @see org.mobicents.media.server.scheduler.Task#getDeadLine()
-         */
-        public long getDeadLine() {
-            return deadLine;
-        }
-
-        /**
-         * (Non Java-doc.)
-         *
-         * @see org.mobicents.media.server.scheduler.Task#setDeadLine(long)
-         */
-        public void setDeadLine(long d) {
-            this.deadLine = d;
+            return 0;
         }

         /**
@@ -408,7 +372,7 @@
          * @see org.mobicents.media.server.scheduler.Task#getDuration()
          */
         public long getDuration() {
-            return duration;
+            return 0;
         }

         /**
@@ -416,7 +380,7 @@
          *
          * @see org.mobicents.media.server.scheduler.Task#perform()
          */
-        public synchronized long perform() {
+        public long perform() {
             try {
                 //clean buffer before read
                 rtpPacket.getBuffer().clear();
@@ -436,73 +400,29 @@
             }
             return 0;
         }
-
-        /**
-         * (Non Java-doc.)
-         *
-         * @see org.mobicents.media.server.scheduler.Task#cancel()
-         */
-        public void cancel() {
-            this.isActive = false;
-        }

     }

     /**
      * Writter job.
      */
-    private class TxTask implements Task {
-
-        private long priority;
-        private long deadLine;
-        private long duration;
-        private boolean isActive = true;
+    private class TxTask extends Task {
+

         private RtpPacket rtpPacket = new RtpPacket(8192, true);
         private RTPFormat fmt;

+        private TxTask(Scheduler scheduler) {
+            super(scheduler);
+        }
+
         /**
          * (Non Java-doc.)
          *
          * @see org.mobicents.media.server.scheduler.Task#getPriority()
          */
         public long getPriority() {
-            return priority;
-        }
-
-        /**
-         * (Non Java-doc.)
-         *
-         * @see org.mobicents.media.server.scheduler.Task#setPriority(long)
-         */
-        public void setPriority(long priority) {
-            this.priority = priority;
-        }
-
-        /**
-         * (Non Java-doc.)
-         *
-         * @see org.mobicents.media.server.scheduler.Task#isActive()
-         */
-        public boolean isActive() {
-            return this.isActive;
-        }
-
-        /**
-         * (Non Java-doc.)
-         *
-         * @see org.mobicents.media.server.scheduler.Task#getDeadLine()
-         */        public long getDeadLine() {
-            return deadLine;
-        }
-
-        /**
-         * (Non Java-doc.)
-         *
-         * @see org.mobicents.media.server.scheduler.Task#setDeadLine(long)
-         */
-        public void setDeadLine(long d) {
-            this.deadLine = d;
+            return 0;
         }

         /**
@@ -511,7 +431,7 @@
          * @see org.mobicents.media.server.scheduler.Task#getDuration()
          */
         public long getDuration() {
-            return duration;
+            return 0;
         }

         /**
@@ -566,15 +486,6 @@
             }
             return 0;
         }
-
-        /**
-         * (Non Java-doc.)
-         *
-         * @see org.mobicents.media.server.scheduler.Task#cancel()
-         */
-        public void cancel() {
-            this.isActive = false;
-        }

     }

=======================================
--- /trunk/servers/media/resources/mediaplayer/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/MediaPlayerImpl.java Wed Feb 2 05:01:45 2011 +++ /trunk/servers/media/resources/mediaplayer/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/MediaPlayerImpl.java Fri Mar 11 04:09:43 2011
@@ -56,7 +56,7 @@
public MediaPlayerImpl(String name, AudioPlayerFactory audioPlayerFactory, VideoPlayerFactory videoPlayerFactory) throws ResourceUnavailableException {
         super(name);
         //create audio processing engine
-        engines.put(MediaType.AUDIO, new AudioPlayerImpl("", null, null));
+ engines.put(MediaType.AUDIO, new AudioPlayerImpl("", null, null, null));
         engines.put(MediaType.VIDEO, null);
     }

=======================================
--- /trunk/servers/media/resources/mediaplayer/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/audio/AudioPlayerFactory.java Wed Feb 2 05:01:45 2011 +++ /trunk/servers/media/resources/mediaplayer/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/audio/AudioPlayerFactory.java Fri Mar 11 04:09:43 2011
@@ -77,7 +77,7 @@

     public AudioPlayerImpl newInstance(Endpoint endpoint)
             throws ResourceUnavailableException {
-        AudioPlayerImpl p = new AudioPlayerImpl(name, audioMediaDirectory,
+ AudioPlayerImpl p = new AudioPlayerImpl(name, null, audioMediaDirectory,
                 voiceCache);
 //        p.setEndpoint(endpoint);
         return p;
=======================================
--- /trunk/servers/media/resources/mediaplayer/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/audio/AudioPlayerImpl.java Wed Feb 2 05:01:45 2011 +++ /trunk/servers/media/resources/mediaplayer/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/audio/AudioPlayerImpl.java Fri Mar 11 04:09:43 2011
@@ -29,11 +29,13 @@
import org.mobicents.media.server.impl.resource.mediaplayer.audio.tts.TtsTrackImpl; import org.mobicents.media.server.impl.resource.mediaplayer.audio.tts.VoicesCache; import org.mobicents.media.server.impl.resource.mediaplayer.audio.wav.WavTrackImpl;
+import org.mobicents.media.server.scheduler.Scheduler;
 import org.mobicents.media.server.spi.ResourceUnavailableException;
 import org.mobicents.media.server.spi.dsp.Codec;
 import org.mobicents.media.server.spi.format.AudioFormat;
 import org.mobicents.media.server.spi.format.Format;
 import org.mobicents.media.server.spi.format.FormatFactory;
+import org.mobicents.media.server.spi.format.Formats;
 import org.mobicents.media.server.spi.player.Player;
 import org.mobicents.media.server.spi.player.PlayerListener;
 import org.mobicents.media.server.spi.listener.Listeners;
@@ -86,8 +88,8 @@
      *            source of synchronization.
      * @param audioMediaDirectory
      */
- public AudioPlayerImpl(String name, String audioMediaDirectory, VoicesCache vc) {
-        super(name);
+ public AudioPlayerImpl(String name, Scheduler scheduler, String audioMediaDirectory, VoicesCache vc) {
+        super(name, scheduler);
         this.audioMediaDirectory = audioMediaDirectory;
         this.voicesCache = vc;

@@ -244,7 +246,7 @@
         return null;
     }

-    public Format[] getFormats() {
+    public Formats getNativeFormats() {
         return null;
     }

@@ -268,7 +270,7 @@
         track = new TtsTrackImpl(text, voiceName, this.voicesCache);
         Format fileFormat = track.getFormat();
         codec = null;
-        if (!fileFormat.matches(this.getFormat())) {
+/*        if (!fileFormat.matches(this.getFormat())) {
             // we need transcode. let's see if this possible
             //codec = this.selectCodec(fileFormat);
             if (codec == null) {
@@ -276,6 +278,8 @@
//throw new ResourceUnavailableException("Format is not supported: " + fileFormat);
             }
         }
+ *
+ */
     }

     @Override
=======================================
--- /trunk/servers/media/resources/mediaplayer/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/video/VideoPlayerFactory.java Wed Feb 2 05:01:45 2011 +++ /trunk/servers/media/resources/mediaplayer/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/video/VideoPlayerFactory.java Fri Mar 11 04:09:43 2011
@@ -54,7 +54,7 @@

        public VideoPlayerImpl newInstance(Endpoint endpoint)
                        throws ResourceUnavailableException {
-               VideoPlayerImpl p = new VideoPlayerImpl(name, 
videoMediaDirectory);
+               VideoPlayerImpl p = new VideoPlayerImpl(name, null, 
videoMediaDirectory);
                return p;
        }
 }
=======================================
--- /trunk/servers/media/resources/mediaplayer/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/video/VideoPlayerImpl.java Wed Feb 2 05:01:45 2011 +++ /trunk/servers/media/resources/mediaplayer/src/main/java/org/mobicents/media/server/impl/resource/mediaplayer/video/VideoPlayerImpl.java Fri Mar 11 04:09:43 2011
@@ -22,8 +22,10 @@

 import org.mobicents.media.server.impl.AbstractSource;
 import org.mobicents.media.server.impl.resource.mediaplayer.Track;
+import org.mobicents.media.server.scheduler.Scheduler;
 import org.mobicents.media.server.spi.ResourceUnavailableException;
 import org.mobicents.media.server.spi.format.Format;
+import org.mobicents.media.server.spi.format.Formats;
 import org.mobicents.media.server.spi.memory.Frame;
 import org.mobicents.media.server.spi.resource.Player;

@@ -47,8 +49,8 @@
      * @param timer source of synchronization.
      * @param videoMediaDirectory
      */
-    public VideoPlayerImpl(String name, String videoMediaDirectory) {
-        super(name);
+ public VideoPlayerImpl(String name, Scheduler scheduler, String videoMediaDirectory) {
+        super(name, scheduler);
         this.videoMediaDirectory = videoMediaDirectory;
     }

@@ -143,9 +145,10 @@
         return frame;
     }

-    public Format[] getFormats() {
+    public Formats getNativeFormats() {
         return null;
     }
+
     @Override
        public <T> T getInterface(Class<T> interfaceType) {
                if(interfaceType.equals(Player.class))
=======================================
--- /trunk/servers/media/resources/recorder/src/main/java/org/mobicents/media/server/impl/resource/audio/RecorderImpl.java Wed Feb 2 05:01:45 2011 +++ /trunk/servers/media/resources/recorder/src/main/java/org/mobicents/media/server/impl/resource/audio/RecorderImpl.java Fri Mar 11 04:09:43 2011
@@ -32,8 +32,10 @@
 import javax.sound.sampled.AudioSystem;

 import org.mobicents.media.server.impl.AbstractSink;
+import org.mobicents.media.server.scheduler.Scheduler;
 import org.mobicents.media.server.spi.format.AudioFormat;
 import org.mobicents.media.server.spi.format.Format;
+import org.mobicents.media.server.spi.format.Formats;
 import org.mobicents.media.server.spi.memory.Frame;
 import org.mobicents.media.server.spi.resource.Recorder;
 import org.xiph.speex.spi.SpeexEncoding;
@@ -76,8 +78,8 @@
      *
      * @param name the name of the recorder to be created.
      */
-    public RecorderImpl(String name) {
-        super(name);
+    public RecorderImpl(String name, Scheduler scheduler) {
+        super(name, scheduler);
     }

     /**
@@ -186,7 +188,7 @@
     }


-    public Format[] getFormats() {
+    public Formats getNativeFormats() {
         return null;
     }

=======================================
--- /trunk/servers/media/resources/telephony/dtmf/src/main/java/org/mobicents/media/server/impl/resource/dtmf/DetectorImpl.java Wed Feb 2 05:01:45 2011 +++ /trunk/servers/media/resources/telephony/dtmf/src/main/java/org/mobicents/media/server/impl/resource/dtmf/DetectorImpl.java Fri Mar 11 04:09:43 2011
@@ -21,10 +21,12 @@

 import org.mobicents.media.server.impl.AbstractSink;
 import org.mobicents.media.server.impl.resource.GoertzelFilter;
+import org.mobicents.media.server.scheduler.Scheduler;
 import org.mobicents.media.server.spi.dtmf.DtmfDetector;
 import org.mobicents.media.server.spi.dtmf.DtmfDetectorListener;
 import org.mobicents.media.server.spi.format.Format;
 import org.mobicents.media.server.spi.format.FormatFactory;
+import org.mobicents.media.server.spi.format.Formats;
 import org.mobicents.media.server.spi.listener.Listeners;
 import org.mobicents.media.server.spi.listener.TooManyListenersException;
 import org.mobicents.media.server.spi.memory.Frame;
@@ -49,7 +51,11 @@
  */
 public class DetectorImpl extends AbstractSink implements DtmfDetector {
private final static Format linear = FormatFactory.createAudioFormat("linear", 8000, 16, 1);
-
+    private final static Formats formats = new Formats();
+    static {
+        formats.add(linear);
+    }
+
     /**
      * The default duration of the DTMF tone.
      */
@@ -94,15 +100,15 @@
     /**
      * Creates new instance of Detector.
      */
-    public DetectorImpl(String name) {
-        super(name);
+    public DetectorImpl(String name, Scheduler scheduler) {
+        super(name, scheduler);
         dtmfBuffer = new DtmfBuffer(this);
         signal = new double[N];
         for (int i = 0; i < 4; i++) {
             lowFreqFilters[i] = new GoertzelFilter(lowFreq[i], N, scale);
             highFreqFilters[i] = new GoertzelFilter(highFreq[i], N, scale);
         }
-        setVolume(DEFAULT_SIGNAL_LEVEL);
+        this.level = DEFAULT_SIGNAL_LEVEL;
     }

     public void setDuration(int duartion) {
@@ -249,8 +255,8 @@
         return events[fm][Fm];
     }

-    public Format[] getFormats() {
-        return new Format[] {};
+    public Formats getNativeFormats() {
+        return formats;
     }

     public boolean isAcceptable(Format format) {
=======================================
--- /trunk/servers/media/resources/telephony/dtmf/src/main/java/org/mobicents/media/server/impl/resource/dtmf/GeneratorImpl.java Wed Feb 2 05:01:45 2011 +++ /trunk/servers/media/resources/telephony/dtmf/src/main/java/org/mobicents/media/server/impl/resource/dtmf/GeneratorImpl.java Fri Mar 11 04:09:43 2011
@@ -18,10 +18,10 @@
 package org.mobicents.media.server.impl.resource.dtmf;

 import org.mobicents.media.server.impl.AbstractSource;
-import org.mobicents.media.server.spi.dsp.Codec;
+import org.mobicents.media.server.scheduler.Scheduler;
 import org.mobicents.media.server.spi.format.AudioFormat;
-import org.mobicents.media.server.spi.format.Format;
 import org.mobicents.media.server.spi.format.FormatFactory;
+import org.mobicents.media.server.spi.format.Formats;
 import org.mobicents.media.server.spi.memory.Frame;
 import org.mobicents.media.server.spi.memory.Memory;
 import org.mobicents.media.server.spi.resource.DtmfGenerator;
@@ -44,6 +44,10 @@
public class GeneratorImpl extends AbstractSource implements DtmfGenerator {

private final static AudioFormat linear = FormatFactory.createAudioFormat("linear", 8000, 16, 1);
+    private final static Formats formats = new Formats();
+    static {
+        formats.add(linear);
+    }

     public final static String[][] events = new String[][]{
         {"1", "2", "3", "A"},
@@ -61,11 +65,10 @@
     private double dt;
     private int pSize;
     private double time = 0;
-    private Codec codec;


-    public GeneratorImpl(String name) {
-        super(name);
+    public GeneratorImpl(String name, Scheduler scheduler) {
+        super(name, scheduler);
         dt = 1 / linear.getSampleRate();
     }

@@ -121,8 +124,8 @@
return (short) (A * (Math.sin(2 * Math.PI * f1 * t) + Math.sin(2 * Math.PI * f2 * t)));
     }

-    public Format[] getFormats() {
-        return new Format[]{linear};
+    public Formats getNativeFormats() {
+        return formats;
     }

     @Override

Reply via email to