[Red5commits] [red5 commit] r3160 - in java/server/branches/paulg_mp4/src/org/red5/server/stream: . consumer

[codesite-noreply at google.com]

Author: steven.gong
Date: Mon Oct  6 07:09:59 2008
New Revision: 3160

Modified:
    java/server/branches/paulg_mp4/src/org/red5/server/stream/PlayEngine.java
     
java/server/branches/paulg_mp4/src/org/red5/server/stream/consumer/ConnectionConsumer.java

Log:
rollback unnecessary changes.

Modified:  
java/server/branches/paulg_mp4/src/org/red5/server/stream/PlayEngine.java
==============================================================================
---  
java/server/branches/paulg_mp4/src/org/red5/server/stream/PlayEngine.java	 
(original)
+++  
java/server/branches/paulg_mp4/src/org/red5/server/stream/PlayEngine.java	 
Mon Oct  6 07:09:59 2008
@@ -646,7 +646,7 @@
  				sendCompleteStatus();
  			}
  			bytesSent = 0;
-			//sendClearPing();
+			sendClearPing();
  			sendStopStatus(currentItem);
  		} else {
  			if (lastMessage != null) {

Modified:  
java/server/branches/paulg_mp4/src/org/red5/server/stream/consumer/ConnectionConsumer.java
==============================================================================
---  
java/server/branches/paulg_mp4/src/org/red5/server/stream/consumer/ConnectionConsumer.java	 
(original)
+++  
java/server/branches/paulg_mp4/src/org/red5/server/stream/consumer/ConnectionConsumer.java	 
Mon Oct  6 07:09:59 2008
@@ -163,16 +163,6 @@
  							.getData().asReadOnlyBuffer());
  					audioData.setHeader(header);
  					audioData.setTimestamp(header.getTimer());
-					// XXX for H.264 only
-					ByteBuffer audioBuf = audioData.getData();
-					audioBuf.mark();
-					byte[] audioPrefix = new byte[2];
-					audioBuf.get(audioPrefix);
-					audioBuf.reset();
-					if ((audioPrefix[0] & 0xff) == 0xaf && audioPrefix[1] == 0x00) {
-						header.setTimerRelative(false);
-						streamTracker.reset();
-					}
  					audio.write(audioData);
  					break;
  				case Constants.TYPE_VIDEO_DATA:
@@ -181,18 +171,6 @@
  							.getData().asReadOnlyBuffer());
  					videoData.setHeader(header);
  					videoData.setTimestamp(header.getTimer());
-					// XXX for H.264 only
-					ByteBuffer videoBuf = videoData.getData();
-					videoBuf.mark();
-					byte[] videoPrefix = new byte[5];
-					videoBuf.get(videoPrefix);
-					videoBuf.reset();
-					if (videoPrefix[0] == 0x17 && videoPrefix[1] == 0x00 &&
-							videoPrefix[2] == 0x00 && videoPrefix[3] == 0x00 &&
-							videoPrefix[4] == 0x00) {
-						header.setTimerRelative(false);
-						streamTracker.reset();
-					}
  					video.write(videoData);
  					break;
  				case Constants.TYPE_PING: