[Red5commits] [1651] fixed bug with serialization of auto-generated metadata

[jbauch]

fixed bug with serialization of auto-generated metadata


Timestamp: 01/23/07 18:38:51 EST (17 hours ago) 
Change: 1651 
Author: jbauch

Files (see diff or trac for details): 
java/server/branches/joachim_amf3_integration/src/org/red5/io/flv/impl/FLVReader.java
java/server/branches/joachim_amf3_integration/src/org/red5/io/mp3/impl/MP3Reader.java


Trac: http://mirror1.cvsdude.com/trac/osflash/red5/changeset/1651

Index: /java/server/branches/joachim_amf3_integration/src/org/red5/io/flv/impl/FLVReader.java
===================================================================
--- /java/server/branches/joachim_amf3_integration/src/org/red5/io/flv/impl/FLVReader.java (revision 1639)
+++ /java/server/branches/joachim_amf3_integration/src/org/red5/io/flv/impl/FLVReader.java (revision 1651)
@@ -464,5 +464,5 @@
         // Duration property
 		out.writeString("onMetaData");
-		Map<String, Object> props = new HashMap<String, Object>();
+		Map<Object, Object> props = new HashMap<Object, Object>();
 		props.put("duration", duration / 1000.0);
 		if (firstVideoTag != -1) {
@@ -487,5 +487,5 @@
 		}
 		props.put("canSeekToEnd", true);
-		out.writeObject(props, new Serializer());
+		out.writeMap(props, new Serializer());
 		buf.flip();
 
Index: /java/server/branches/joachim_amf3_integration/src/org/red5/io/mp3/impl/MP3Reader.java
===================================================================
--- /java/server/branches/joachim_amf3_integration/src/org/red5/io/mp3/impl/MP3Reader.java (revision 1639)
+++ /java/server/branches/joachim_amf3_integration/src/org/red5/io/mp3/impl/MP3Reader.java (revision 1651)
@@ -179,5 +179,5 @@
 		Output out = new Output(buf);
 		out.writeString("onMetaData");
-		Map<String, Object> props = new HashMap<String, Object>();
+		Map<Object, Object> props = new HashMap<Object, Object>();
 		props.put("duration", frameMeta.timestamps[frameMeta.timestamps.length - 1] / 1000.0);
 		props.put("audiocodecid", IoConstants.FLAG_FORMAT_MP3);
@@ -186,5 +186,5 @@
 		}
 		props.put("canSeekToEnd", true);
-		out.writeObject(props, new Serializer());
+		out.writeMap(props, new Serializer());
 		buf.flip();
 


Note:
Diffs are chopped if more than 25k.
This is to get past the limit on the mailing list.