You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@openmeetings.apache.org by co...@google.com on 2013/02/18 09:22:15 UTC

[red5phone] r87 committed - red5sip: RTPStreamReceiver.java code cleanup

Revision: 87
Author:   timur.tleukenov@gmail.com
Date:     Mon Feb 18 00:22:02 2013
Log:      red5sip: RTPStreamReceiver.java code cleanup
http://code.google.com/p/red5phone/source/detail?r=87

Modified:
  /branches/red5sip/src/java/org/red5/sip/app/RTPStreamReceiver.java

=======================================
--- /branches/red5sip/src/java/org/red5/sip/app/RTPStreamReceiver.java	Mon  
Feb 18 00:06:43 2013
+++ /branches/red5sip/src/java/org/red5/sip/app/RTPStreamReceiver.java	Mon  
Feb 18 00:22:02 2013
@@ -23,6 +23,7 @@
      private boolean running = false;
      private long timeStamp = 0;
      private int frameCounter = 0;
+    private final Object sync = new Object();


      /**
@@ -122,7 +123,7 @@
                  int avail = 0;
                  while(running) {
                      byte[] codedBuffer = new byte[  
sipCodec.getIncomingEncodedFrameSize() ];
-                    synchronized (buffer) {
+                    synchronized (sync) {
                          avail = buffer.available();
                          if(!ready) {
                              if(avail > 30) {
@@ -151,9 +152,7 @@
                                      pause -= 1;
                                  }
                                  log.trace("Sleep pause: " + pause);
-                                //System.out.println("pushAudio, ts: " +  
timeStamp + ", pause: " + pause);
                                  Thread.sleep( pause, 800000 );
-                                 
//Thread.sleep(sipCodec.getIncomingPacketization() - 1);
                              } catch (InterruptedException e) {

                              }
@@ -186,13 +185,9 @@

                          if(payloadType < 20)
                          {
-							//System.arraycopy(packetBuffer, offset, codedBuffer, 0,  
sipCodec.getIncomingEncodedFrameSize());
-                            synchronized (buffer) {
-                                System.out.println(String.format("RTP:  
ssrc[%d], cscr count %d", rtpPacket.getSscr(), rtpPacket.getCscrCount()));
+                            synchronized (sync) {
                                  buffer.push(packetBuffer, offset,  
sipCodec.getIncomingEncodedFrameSize());
                              }
-//                            timeStamp +=  
sipCodec.getIncomingPacketization();
-//							rtmpUser.pushAudio(codedBuffer, timeStamp, 130);
                          }
                      }
                  }