Ticket #693: red5-fix-ffmpeg-publish.diff

src/org/red5/server/net/rtmp/codec/RTMPProtocolDecoder.java

@@ -975 +975 @@
                                 //get the params datatype
                                 byte object = input.readDataType();
                                 log.debug("Dataframe params type: {}", object);
-                                ObjectMap<Object, Object> params = (ObjectMap<Object, Object>) input.readObject(deserializer,
-                                                Object.class);
+
+                Map<Object, Object> params;
+                if (object == DataTypes.CORE_MAP) {
+                    // The params are sent as a Mixed-Array.  This is needed
+                    // to support the RTMP publish provided by ffmpeg/xuggler
+                    params = (Map<Object, Object>) input.readMap(deserializer, null);
+                } else {
+                    // Read the params as a standard object
+                    params = (Map<Object, Object>) input.readObject(deserializer,
+                            Object.class);
+                }
                                 log.debug("Dataframe: {} params: {}", onCueOrOnMeta, params.toString());
 
                                 IoBuffer buf = IoBuffer.allocate(1024);