Changeset 715

Timestamp:

01/13/12 09:32:27 (4 months ago)

Author:

josh

Message:

-- RTMP: Allow application-selectable outfile streams.

Files:

• branches/1.0/sources/thelib/include/protocols/rtmp/basertmpappprotocolhandler.h (modified) (2 diffs)
• branches/1.0/sources/thelib/include/protocols/rtmp/streaming/innetrtmpstream.h (modified) (2 diffs)
• branches/1.0/sources/thelib/src/protocols/rtmp/basertmpappprotocolhandler.cpp (modified) (3 diffs)
• branches/1.0/sources/thelib/src/protocols/rtmp/streaming/innetrtmpstream.cpp (modified) (1 diff)
• trunk/sources/thelib/include/protocols/rtmp/basertmpappprotocolhandler.h (modified) (2 diffs)
• trunk/sources/thelib/include/protocols/rtmp/streaming/innetrtmpstream.h (modified) (2 diffs)
• trunk/sources/thelib/src/protocols/rtmp/basertmpappprotocolhandler.cpp (modified) (3 diffs)
• trunk/sources/thelib/src/protocols/rtmp/streaming/innetrtmpstream.cpp (modified) (1 diff)

branches/1.0/sources/thelib/include/protocols/rtmp/basertmpappprotocolhandler.h

@@ -27 +27 @@
 #include "protocols/rtmp/rtmpprotocolserializer.h"
 #include "protocols/rtmp/sharedobjects/somanager.h"
-#include "basertmpprotocol.h"
+#include "streaming/baseoutstream.h"
+#include "streaming/baseoutfilestream.h"
 
 class OutboundRTMPProtocol;
 class BaseRTMPProtocol;
+class BaseOutFileStream;
 
 class DLLEXP BaseRTMPAppProtocolHandler
@@ -234 +236 @@
         bool SendRTMPMessage(BaseRTMPProtocol *pTo, Variant message,
                         bool trackResponse = false);
+
+        /*
+         * Create a file stream for writing to disk.
+         * pFrom - The connection which wants to stream to disk
+         * meta - Stream metadata
+         * append - Whether to append this stream to an exiting file
+         * */
+        virtual BaseOutFileStream *CreateOutFileStream(BaseRTMPProtocol *pFrom, Variant &meta, bool append);
 private:
         /*

branches/1.0/sources/thelib/include/protocols/rtmp/streaming/innetrtmpstream.h

@@ -28 +28 @@
 class BaseRTMPProtocol;
 class BaseOutStream;
+class BaseOutFileStream;
 
 class DLLEXP InNetRTMPStream
@@ -71 +72 @@
                         bool persistent = true);
         bool SendOnStatusStreamPublished();
-        bool RecordFLV(Variant &meta, bool append);
-        bool RecordMP4(Variant &meta);
+        bool Record(BaseOutFileStream* pOutFileStream);
 
         virtual void SignalOutStreamAttached(BaseOutStream *pOutStream);

branches/1.0/sources/thelib/src/protocols/rtmp/basertmpappprotocolhandler.cpp

@@ -29 +29 @@
 #include "protocols/rtmp/streaming/infilertmpstream.h"
 #include "protocols/rtmp/streaming/innetrtmpstream.h"
+#include "protocols/rtmp/streaming/outfilertmpflvstream.h"
 #include "streaming/streamstypes.h"
 #include "streaming/baseinstream.h"
@@ -812 +813 @@
                 Variant meta = GetMetaData(streamName, false);
 
-                if ((meta[META_MEDIA_TYPE] == MEDIA_TYPE_LIVE_OR_FLV) ||
-                                (meta[META_MEDIA_TYPE] == MEDIA_TYPE_FLV)) {
-                        if (!pInNetRTMPStream->RecordFLV(meta, appending)) {
-                                FATAL("Unable to bind the recording stream");
-                                return false;
-                        }
-                } else if (meta[META_MEDIA_TYPE] == MEDIA_TYPE_MP4) {
-                        if (!pInNetRTMPStream->RecordMP4(meta)) {
-                                FATAL("Unable to bind the recording stream");
-                                return false;
-                        }
+                BaseOutFileStream *pOutFileStream = CreateOutFileStream(pFrom, meta, appending);
+                if (!pOutFileStream || !pInNetRTMPStream->Record(pOutFileStream)) {
+                        FATAL("Unable to bind the recording stream");
+                        return false;
                 }
         }
@@ -1866 +1860 @@
 }
 
+BaseOutFileStream* BaseRTMPAppProtocolHandler::CreateOutFileStream(
+        BaseRTMPProtocol *pFrom, Variant &meta, bool append)
+{
+        //1. Compute the file name
+        string fileName = meta[META_SERVER_MEDIA_DIR];
+        fileName += (string) meta[META_SERVER_FILE_NAME];
+        FINEST("fileName: %s", STR(fileName));
+
+        //2. Delete the old file
+        if (append) {
+                WARN("append not supported yet. File will be overwritten");
+        }
+        deleteFile(fileName);
+
+        if ((meta[META_MEDIA_TYPE] == MEDIA_TYPE_LIVE_OR_FLV) ||
+                        (meta[META_MEDIA_TYPE] == MEDIA_TYPE_FLV)) {
+                return new OutFileRTMPFLVStream(pFrom,
+                        GetApplication()->GetStreamsManager(), fileName);
+        }
+        if (meta[META_MEDIA_TYPE] == MEDIA_TYPE_MP4) {
+                FATAL("Streaming to MP4 file not supported");
+                return NULL;
+        }
+        FATAL("Media type not supported");
+        return NULL;
+}
+
 string NormalizeStreamName(string streamName) {
         replace(streamName, "-", "_");

branches/1.0/sources/thelib/src/protocols/rtmp/streaming/innetrtmpstream.cpp

@@ -188 +188 @@
 }
 
-bool InNetRTMPStream::RecordFLV(Variant &meta, bool append) {
-        //1. Compute the file name
-        string fileName = meta[META_SERVER_MEDIA_DIR];
-        fileName += (string) meta[META_SERVER_FILE_NAME];
-        FINEST("fileName: %s", STR(fileName));
-
-        //2. Delete the old file
-        if (append) {
-                WARN("append not supported yet. File will be overwritten");
-        }
-        deleteFile(fileName);
-
-        //3. Create the out file
-        _pOutFileRTMPFLVStream = new OutFileRTMPFLVStream(_pProtocol,
-                        _pStreamsManager, fileName);
-
-        //4. Link it
+bool InNetRTMPStream::Record(BaseOutFileStream *pOutStream) {
+
+        _pOutFileRTMPFLVStream = pOutStream;
         return _pOutFileRTMPFLVStream->Link(this);
-}
-
-bool InNetRTMPStream::RecordMP4(Variant &meta) {
-        NYIR;
 }
 

trunk/sources/thelib/include/protocols/rtmp/basertmpappprotocolhandler.h

@@ -27 +27 @@
 #include "protocols/rtmp/rtmpprotocolserializer.h"
 #include "protocols/rtmp/sharedobjects/somanager.h"
-#include "basertmpprotocol.h"
+#include "streaming/baseoutstream.h"
+#include "streaming/baseoutfilestream.h"
 
 class OutboundRTMPProtocol;
 class BaseRTMPProtocol;
+class BaseOutFileStream;
 
 class DLLEXP BaseRTMPAppProtocolHandler
@@ -234 +236 @@
         bool SendRTMPMessage(BaseRTMPProtocol *pTo, Variant message,
                         bool trackResponse = false);
+
+        /*
+         * Create a file stream for writing to disk.
+         * pFrom - The connection which wants to stream to disk
+         * meta - Stream metadata
+         * append - Whether to append this stream to an exiting file
+         * */
+        virtual BaseOutFileStream *CreateOutFileStream(BaseRTMPProtocol *pFrom, Variant &meta, bool append);
 private:
         /*

trunk/sources/thelib/include/protocols/rtmp/streaming/innetrtmpstream.h

@@ -28 +28 @@
 class BaseRTMPProtocol;
 class BaseOutStream;
+class BaseOutFileStream;
 
 class DLLEXP InNetRTMPStream
@@ -71 +72 @@
                         bool persistent = true);
         bool SendOnStatusStreamPublished();
-        bool RecordFLV(Variant &meta, bool append);
-        bool RecordMP4(Variant &meta);
+        bool Record(BaseOutFileStream* pOutFileStream);
 
         virtual void SignalOutStreamAttached(BaseOutStream *pOutStream);

trunk/sources/thelib/src/protocols/rtmp/basertmpappprotocolhandler.cpp

@@ -29 +29 @@
 #include "protocols/rtmp/streaming/infilertmpstream.h"
 #include "protocols/rtmp/streaming/innetrtmpstream.h"
+#include "protocols/rtmp/streaming/outfilertmpflvstream.h"
 #include "streaming/streamstypes.h"
 #include "streaming/baseinstream.h"
@@ -812 +813 @@
                 Variant meta = GetMetaData(streamName, false);
 
-                if ((meta[META_MEDIA_TYPE] == MEDIA_TYPE_LIVE_OR_FLV) ||
-                                (meta[META_MEDIA_TYPE] == MEDIA_TYPE_FLV)) {
-                        if (!pInNetRTMPStream->RecordFLV(meta, appending)) {
-                                FATAL("Unable to bind the recording stream");
-                                return false;
-                        }
-                } else if (meta[META_MEDIA_TYPE] == MEDIA_TYPE_MP4) {
-                        if (!pInNetRTMPStream->RecordMP4(meta)) {
-                                FATAL("Unable to bind the recording stream");
-                                return false;
-                        }
+                BaseOutFileStream *pOutFileStream = CreateOutFileStream(pFrom, meta, appending);
+                if (!pOutFileStream || !pInNetRTMPStream->Record(pOutFileStream)) {
+                        FATAL("Unable to bind the recording stream");
+                        return false;
                 }
         }
@@ -1866 +1860 @@
 }
 
+BaseOutFileStream* BaseRTMPAppProtocolHandler::CreateOutFileStream(
+        BaseRTMPProtocol *pFrom, Variant &meta, bool append)
+{
+        //1. Compute the file name
+        string fileName = meta[META_SERVER_MEDIA_DIR];
+        fileName += (string) meta[META_SERVER_FILE_NAME];
+        FINEST("fileName: %s", STR(fileName));
+
+        //2. Delete the old file
+        if (append) {
+                WARN("append not supported yet. File will be overwritten");
+        }
+        deleteFile(fileName);
+
+        if ((meta[META_MEDIA_TYPE] == MEDIA_TYPE_LIVE_OR_FLV) ||
+                        (meta[META_MEDIA_TYPE] == MEDIA_TYPE_FLV)) {
+                return new OutFileRTMPFLVStream(pFrom,
+                        GetApplication()->GetStreamsManager(), fileName);
+        }
+        if (meta[META_MEDIA_TYPE] == MEDIA_TYPE_MP4) {
+                FATAL("Streaming to MP4 file not supported");
+                return NULL;
+        }
+        FATAL("Media type not supported");
+        return NULL;
+}
+
 string NormalizeStreamName(string streamName) {
         replace(streamName, "-", "_");

trunk/sources/thelib/src/protocols/rtmp/streaming/innetrtmpstream.cpp

@@ -188 +188 @@
 }
 
-bool InNetRTMPStream::RecordFLV(Variant &meta, bool append) {
-        //1. Compute the file name
-        string fileName = meta[META_SERVER_MEDIA_DIR];
-        fileName += (string) meta[META_SERVER_FILE_NAME];
-        FINEST("fileName: %s", STR(fileName));
-
-        //2. Delete the old file
-        if (append) {
-                WARN("append not supported yet. File will be overwritten");
-        }
-        deleteFile(fileName);
-
-        //3. Create the out file
-        _pOutFileRTMPFLVStream = new OutFileRTMPFLVStream(_pProtocol,
-                        _pStreamsManager, fileName);
-
-        //4. Link it
+bool InNetRTMPStream::Record(BaseOutFileStream *pOutStream) {
+
+        _pOutFileRTMPFLVStream = pOutStream;
         return _pOutFileRTMPFLVStream->Link(this);
-}
-
-bool InNetRTMPStream::RecordMP4(Variant &meta) {
-        NYIR;
 }