Hi,
I have included patches for Red5 version 0.5 tarball Linux
bad-chars.patch : fix bad encoding chars (utf8 ??) who block compilation
with JDK 1.5.0
return-javadoc : fix all warnings of @return <none> from javadoc
Unfixed last warning :
http://jetty.mortbay.org/jetty6/jetty/package-list is unavailable.
I don't know the new url address for the package-list file.
[javadoc] javadoc: warning - Error fetching URL:
http://jetty.mortbay.org/jetty6/jetty/package-list
Maybe you need to change build.xml on line 185
<link href="http://jetty.mortbay.org/jetty6/jetty"/>
Thanks for your great product -- Red5 power !
--
Infomaniak Network SA
Guy Baconniere <[EMAIL PROTECTED]>
Unix System Administrator
Certified Linux Engineer (RHCE, LPIC-2)
Avenue de la Praille 26
1227 Carouge (Geneva)
Switzerland (CH)
Phone +41 (0)22 820 3541
Fax +41 (0)22 820 3546
AS29222 / BACO-RIPE
--- src/org/red5/io/amf/Input.java 2006-07-09 18:01:49.000000000 +0200
+++ src/org/red5/io/amf/Input.java 2006-09-19 14:57:54.257462000 +0200
@@ -215,8 +215,8 @@
* Date: 0x0B T7 T6 .. T0 Z1 Z2
T7 to T0 form a 64 bit Big Endian number that specifies the number of
nanoseconds that have passed since 1/1/1970 0:00 to the specified time.
- This format is ÒUTC 1970Ó. Z1 an Z0 for a 16 bit Big Endian number
- indicating the indicated timeÕs timezone in minutes.
+ This format is UTC 1970. Z1 an Z0 for a 16 bit Big Endian number
+ indicating the indicated times timezone in minutes.
*/
long ms = (long) buf.getDouble();
short clientTimeZoneMins = buf.getShort();
diff -Naur src-old/org/red5/io/amf3/AMF3.java src/org/red5/io/amf3/AMF3.java
--- src-old/org/red5/io/amf3/AMF3.java 2006-06-30 00:23:06.000000000 +0200
+++ src/org/red5/io/amf3/AMF3.java 2006-09-19 14:58:15.984313000 +0200
@@ -60,7 +60,7 @@
/**
* 01 = single anonymous property. <br />
* A single amf3-data contains a single value. <br />
- * The property name should be declared in the class-def reference but this doesnt seem <b />
+ * The property name should be declared in the class-def reference but this doesn't seem <b />
* to always be the case - more to come here.
*/
public final static byte TYPE_OBJECT_ANONYMOUS_PROPERTY = 0x01;
--- src/org/red5/io/amf3/Input.java 2006-07-09 18:01:49.000000000 +0200
+++ src/org/red5/io/amf3/Input.java 2006-09-19 14:59:07.788297000 +0200
@@ -180,8 +180,8 @@
* Date: 0x0B T7 T6 .. T0 Z1 Z2
T7 to T0 form a 64 bit Big Endian number that specifies the number of
nanoseconds that have passed since 1/1/1970 0:00 to the specified time.
- This format is ÒUTC 1970Ó. Z1 an Z0 for a 16 bit Big Endian number
- indicating the indicated timeÕs timezone in minutes.
+ This format is UTC 1970. Z1 an Z0 for a 16 bit Big Endian number
+ indicating the indicated times timezone in minutes.
*/
long ms = (long)buf.getDouble();
short clientTimeZoneMins = buf.getShort();
--- src/org/red5/server/net/rtmp/event/FLVData.java 2006-06-30 00:23:06.000000000 +0200
+++ src/org/red5/server/net/rtmp/event/FLVData.java 2006-09-19 15:04:16.190934000 +0200
@@ -24,21 +24,21 @@
public class FLVData {
/*
- * 0Ã08 AUDIO Contains an audio packet similar to a SWF SoundStreamBlock plus codec information
-0Ã09 VIDEO Contains a video packet similar to a SWF VideoFrame plus codec information
-0Ã12 META Contains two AMF packets, the name of the event and the data to go with it
+ * 0x08 AUDIO Contains an audio packet similar to a SWF SoundStreamBlock plus codec information
+0x09 VIDEO Contains a video packet similar to a SWF VideoFrame plus codec information
+0x12 META Contains two AMF packets, the name of the event and the data to go with it
*/
/*
- * soundType (byte & 0Ã01) » 0 0: mono, 1: stereo
-soundSize (byte & 0Ã02) » 1 0: 8-bit, 2: 16-bit
-soundRate (byte & 0x0C) » 2 0: 5.5 kHz, 1: 11 kHz, 2: 22 kHz, 3: 44 kHz
-soundFormat (byte & 0xf0) » 4 0: Uncompressed, 1: ADPCM, 2: MP3, 5: Nellymoser 8kHz mono, 6: Nellymoser
+ * soundType (byte & 0x01) 0 0: mono, 1: stereo
+soundSize (byte & 0x02) 1 0: 8-bit, 2: 16-bit
+soundRate (byte & 0x0C) 2 0: 5.5 kHz, 1: 11 kHz, 2: 22 kHz, 3: 44 kHz
+soundFormat (byte & 0xf0) 4 0: Uncompressed, 1: ADPCM, 2: MP3, 5: Nellymoser 8kHz mono, 6: Nellymoser
*/
/*
- codecID (byte & 0x0f) » 0 2: Sorensen H.263, 3: Screen video, 4: On2 VP6
- frameType (byte & 0xf0) » 4 1: keyframe, 2: inter frame, 3: disposable inter frame
+ codecID (byte & 0x0f) 0 2: Sorensen H.263, 3: Screen video, 4: On2 VP6
+ frameType (byte & 0xf0) 4 1: keyframe, 2: inter frame, 3: disposable inter frame
*/
protected ByteBuffer data;
@@ -82,4 +82,4 @@
return 0;
}
-}
\ No newline at end of file
+}
--- src/org/red5/server/Client.java 2006-07-07 19:04:43.000000000 +0200
+++ src/org/red5/server/Client.java 2006-09-19 16:01:25.121912000 +0200
@@ -138,7 +138,7 @@
/**
* Get the context from anyone of the IConnection.
- * @return
+ * @return context
*/
private IContext getContextFromConnection() {
IConnection conn = null;
@@ -151,4 +151,4 @@
return null;
}
-}
\ No newline at end of file
+}
--- src/org/red5/server/api/IConnection.java 2006-07-24 17:53:43.000000000 +0200
+++ src/org/red5/server/api/IConnection.java 2006-09-19 15:57:44.261659000 +0200
@@ -90,7 +90,7 @@
/**
* Return the parameters that were given in the call to "connect".
*
- * @return
+ * @return parameters
*/
public Map<String, String> getConnectParams();
@@ -208,4 +208,4 @@
*/
public Iterator<IBasicScope> getBasicScopes();
-}
\ No newline at end of file
+}
--- src/org/red5/server/api/persistence/IPersistable.java 2006-07-01 09:17:16.000000000 +0200
+++ src/org/red5/server/api/persistence/IPersistable.java 2006-09-19 15:51:48.576044000 +0200
@@ -53,7 +53,7 @@
* Returns <code>true</code> if the object is persistent, <code>false</code>
* otherwise.
*
- * @return
+ * @return state
* true or false
*/
public boolean isPersistent();
@@ -69,7 +69,7 @@
/**
* Returns the name of the persistent object.
*
- * @return
+ * @return name
* the name of the object
*/
public String getName();
@@ -85,7 +85,7 @@
/**
* Returns the type of the persistent object.
*
- * @return
+ * @return type
* the type of the object
*/
public String getType();
@@ -93,7 +93,7 @@
/**
* Returns the path of the persistent object.
*
- * @return
+ * @return path
* the path of the object
*/
public String getPath();
@@ -109,7 +109,7 @@
/**
* Returns the timestamp when the object was last modified.
*
- * @return
+ * @return timestamp
* last modification date in milliseconds
*/
public long getLastModified();
@@ -117,7 +117,7 @@
/**
* Returns the persistence store this object is stored in
*
- * @return
+ * @return store
* the store for this object
*/
public IPersistenceStore getStore();
--- src/org/red5/server/api/persistence/IPersistenceStore.java 2006-06-30 00:23:06.000000000 +0200
+++ src/org/red5/server/api/persistence/IPersistenceStore.java 2006-09-19 15:50:34.555141000 +0200
@@ -46,7 +46,7 @@
*
* @param name
* the name of the object to load
- * @return
+ * @return object
* the loaded object or <code>null</code> if no such object was found
*/
public IPersistable load(String name);
@@ -56,7 +56,7 @@
*
* @param obj
* the object to initializ
- * @return
+ * @return state
* true if the object was initialized, false otherwise
*/
public boolean load(IPersistable obj);
@@ -80,7 +80,7 @@
/**
* Return iterator over the names of all already loaded objects in the storage.
*
- * @return
+ * @return iterator
* iterator over all objects
*/
public Iterator<String> getObjectNames();
@@ -88,7 +88,7 @@
/**
* Return iterator over the already loaded objects in the storage.
*
- * @return
+ * @return iterator
* iterator over all objects
*/
public Iterator<IPersistable> getObjects();
--- src/org/red5/server/api/stream/IBroadcastStream.java 2006-06-30 00:23:06.000000000 +0200
+++ src/org/red5/server/api/stream/IBroadcastStream.java 2006-09-19 16:11:07.935235000 +0200
@@ -42,11 +42,11 @@
/**
* Get the provider corresponding to this stream.
- * @return
+ * @return provider
*/
IProvider getProvider();
String getPublishedName();
void setPublishedName(String name);
-}
\ No newline at end of file
+}
--- src/org/red5/server/api/stream/IClientStream.java 2006-07-25 01:05:14.000000000 +0200
+++ src/org/red5/server/api/stream/IClientStream.java 2006-09-19 16:09:41.595184000 +0200
@@ -35,20 +35,20 @@
/**
* Get stream id allocated in a connection.
- * @return
+ * @return streamId
*/
int getStreamId();
/**
* Get connection containing the stream.
- * @return
+ * @return connection
*/
IStreamCapableConnection getConnection();
/**
* Get the flow settings for this stream.
*
- * @return
+ * @return settings
*/
IStreamFlow getStreamFlow();
--- src/org/red5/server/api/stream/IPlayItem.java 2006-06-30 00:23:06.000000000 +0200
+++ src/org/red5/server/api/stream/IPlayItem.java 2006-09-19 16:07:31.785039000 +0200
@@ -26,19 +26,19 @@
* Get name of item.
* The VOD or Live stream provider is found according
* to this name.
- * @return
+ * @return name
*/
String getName();
/**
* Start time in millisecond.
- * @return
+ * @return time
*/
long getStart();
/**
* Play length in millisecond.
- * @return
+ * @return length
*/
long getLength();
@@ -47,7 +47,7 @@
* This object overrides the default algorithm for finding
* the appropriate VOD or Live stream provider according to
* the item name.
- * @return
+ * @return input
*/
IMessageInput getMessageInput();
}
--- src/org/red5/server/api/stream/IPlaylist.java 2006-06-30 00:23:06.000000000 +0200
+++ src/org/red5/server/api/stream/IPlaylist.java 2006-09-19 16:15:55.255951000 +0200
@@ -64,7 +64,7 @@
/**
* Whether items are randomly played.
- * @return
+ * @return state
*/
boolean isRandom();
@@ -76,7 +76,7 @@
/**
* Whether rewind the list.
- * @return
+ * @return state
*/
boolean isRewind();
@@ -88,7 +88,7 @@
/**
* Whether repeat playing an item.
- * @return
+ * @return state
*/
boolean isRepeat();
--- src/org/red5/server/api/stream/IStream.java 2006-06-30 00:23:06.000000000 +0200
+++ src/org/red5/server/api/stream/IStream.java 2006-09-19 15:52:08.768972000 +0200
@@ -37,7 +37,7 @@
/**
* Get Codec info for a stream.
- * @return
+ * @return info
*/
IStreamCodecInfo getCodecInfo();
--- src/org/red5/server/api/stream/IStreamCapableConnection.java 2006-07-21 17:25:56.000000000 +0200
+++ src/org/red5/server/api/stream/IStreamCapableConnection.java 2006-09-19 15:57:10.446411000 +0200
@@ -33,7 +33,7 @@
/**
* Return a reserved stream id for use.
* According to FCS/FMS regulation, the base is 1.
- * @return
+ * @return streamId
*/
int reserveStreamId();
@@ -53,28 +53,28 @@
/**
* Get a stream by its id.
* @param streamId
- * @return
+ * @return stream
*/
IClientStream getStreamById(int streamId);
/**
* Create a stream that can play only one item.
* @param streamId
- * @return
+ * @return stream
*/
ISingleItemSubscriberStream newSingleItemSubscriberStream(int streamId);
/**
* Create a stream that can play a list.
* @param streamId
- * @return
+ * @return stream
*/
IPlaylistSubscriberStream newPlaylistSubscriberStream(int streamId);
/**
* Create a broadcast stream.
* @param streamId
- * @return
+ * @return stream
*/
IClientBroadcastStream newBroadcastStream(int streamId);
@@ -86,4 +86,4 @@
*/
long getPendingVideoMessages(int streamId);
-}
\ No newline at end of file
+}
--- src/org/red5/server/api/stream/IStreamFilenameGenerator.java 2006-07-23 23:50:02.000000000 +0200
+++ src/org/red5/server/api/stream/IStreamFilenameGenerator.java 2006-09-19 16:11:37.924534000 +0200
@@ -37,7 +37,7 @@
*
* @param scope
* @param name
- * @return
+ * @return filename
*/
public String generateFilename(IScope scope, String name);
@@ -47,7 +47,7 @@
* @param scope
* @param name
* @param extension
- * @return
+ * @return filename
*/
public String generateFilename(IScope scope, String name, String extension);
--- src/org/red5/server/api/stream/IStreamService.java 2006-07-21 17:25:56.000000000 +0200
+++ src/org/red5/server/api/stream/IStreamService.java 2006-09-19 16:15:45.720638000 +0200
@@ -30,7 +30,7 @@
/**
* Create a stream and return a corresponding id.
- * @return
+ * @return streamId
*/
public int createStream();
@@ -42,7 +42,7 @@
/**
* Close the stream if not been closed.
* Deallocate the related resources.
- * @param number
+ * @param streamId
*/
public void deleteStream(int streamId);
--- src/org/red5/server/api/stream/ISubscriberStream.java 2006-07-21 17:25:56.000000000 +0200
+++ src/org/red5/server/api/stream/ISubscriberStream.java 2006-09-19 15:52:28.851948000 +0200
@@ -50,7 +50,7 @@
/**
* Check if the stream is currently paused.
- * @return
+ * @return state
*/
boolean isPaused();
--- src/org/red5/server/net/remoting/RemotingClient.java 2006-07-09 18:01:49.000000000 +0200
+++ src/org/red5/server/net/remoting/RemotingClient.java 2006-09-19 15:59:33.951737000 +0200
@@ -104,7 +104,7 @@
*
* @param method
* @param params
- * @return
+ * @return result
*/
private synchronized ByteBuffer encodeInvoke(String method, Object[] params) {
ByteBuffer result = ByteBuffer.allocate(1024);
@@ -202,7 +202,7 @@
* Decode response received from remoting server.
*
* @param data
- * @return
+ * @return result
*/
private synchronized Object decodeResult(ByteBuffer data) {
processHeaders(data);
--- src/org/red5/server/net/servlet/RTMPTServlet.java 2006-07-25 10:42:02.000000000 +0200
+++ src/org/red5/server/net/servlet/RTMPTServlet.java 2006-09-19 16:00:18.313066000 +0200
@@ -186,7 +186,7 @@
* Get the RTMPT client for a session.
*
* @param req
- * @return
+ * @return client
*/
protected RTMPTConnection getClient(HttpServletRequest req) {
String id = getClientId(req);
--- src/org/red5/server/net/servlet/ServletUtils.java 2006-06-30 00:23:06.000000000 +0200
+++ src/org/red5/server/net/servlet/ServletUtils.java 2006-09-19 16:30:54.676599000 +0200
@@ -72,9 +72,10 @@
}
/**
- * @returns a byte[] containing the information contained in the
+ * Return a byte[] containing the information contained in the
* specified InputStream.
* @throws java.io.IOException
+ * @return information
*/
public static byte[] getBytes(InputStream input)
throws IOException {
--- src/org/red5/server/service/ServiceInvoker.java 2006-07-24 07:32:30.000000000 +0200
+++ src/org/red5/server/service/ServiceInvoker.java 2006-09-19 16:00:41.520727000 +0200
@@ -54,7 +54,7 @@
*
* @param scope
* @param serviceName
- * @return
+ * @return service
*/
private Object getServiceHandler(IScope scope, String serviceName) {
// Get application scope handler first
--- src/org/red5/server/statistics/ScopeStatistics.java 2006-07-14 00:06:57.000000000 +0200
+++ src/org/red5/server/statistics/ScopeStatistics.java 2006-09-19 16:01:02.204307000 +0200
@@ -119,7 +119,7 @@
* Inspired by "Reflective XML-RPC" by "Stephan Maier".
*
* @param value
- * @return
+ * @return object
*/
private Object getXMLRPCValue(Object value) {
if (value == null) {
--- src/org/red5/server/stream/IFlowControlService.java 2006-07-07 08:40:55.000000000 +0200
+++ src/org/red5/server/stream/IFlowControlService.java 2006-09-19 16:10:49.805312000 +0200
@@ -65,7 +65,7 @@
* The bucket can be used till releasing regardless of
* BW configuration changes.
* @param fc
- * @return
+ * @return bucket
*/
ITokenBucket getAudioTokenBucket(IFlowControllable fc);
@@ -74,7 +74,7 @@
* The bucket can be used till releasing regardless of
* BW configuration changes.
* @param fc
- * @return
+ * @return bucket
*/
ITokenBucket getVideoTokenBucket(IFlowControllable fc);
}
--- src/org/red5/server/stream/ITokenBucket.java 2006-07-24 15:22:18.000000000 +0200
+++ src/org/red5/server/stream/ITokenBucket.java 2006-09-19 16:12:30.139742000 +0200
@@ -53,19 +53,19 @@
* not enough tokens are left in bucket, all remaining will be
* returned.
* @param upperLimitCount
- * @return
+ * @return token
*/
double acquireTokenBestEffort(double upperLimitCount);
/**
* Get the capacity of this bucket in Byte.
- * @return
+ * @return capacity
*/
long getCapacity();
/**
* The amount of tokens increased per second in millisecond.
- * @return
+ * @return speed
*/
double getSpeed();
--- src/org/red5/server/stream/PlayBuffer.java 2006-07-08 15:20:42.000000000 +0200
+++ src/org/red5/server/stream/PlayBuffer.java 2006-09-19 16:13:40.845232000 +0200
@@ -43,7 +43,7 @@
/**
* Buffer capacity in bytes.
- * @return
+ * @return capacity
*/
public long getCapacity() {
return capacity;
@@ -55,7 +55,7 @@
/**
* Number of message in buffer.
- * @return
+ * @return count
*/
public int getMessageCount() {
return messageQueue.size();
@@ -63,7 +63,7 @@
/**
* Total message size in bytes.
- * @return
+ * @return size
*/
public long getMessageSize() {
return messageSize;
_______________________________________________
Red5 mailing list
[email protected]
http://osflash.org/mailman/listinfo/red5_osflash.org
