Changeset 718

Timestamp:

01/14/12 03:59:44 (4 months ago)

Author:

josh

Message:

-- RTMP: Allow application-selectable innet streams.

Location:

trunk/sources/thelib

Files:

• include/protocols/rtmp/basertmpappprotocolhandler.h (modified) (2 diffs)
• include/protocols/rtmp/basertmpprotocol.h (modified) (1 diff)
• include/protocols/rtmp/streaming/innetrtmpstream.h (modified) (1 diff)
• src/protocols/rtmp/basertmpappprotocolhandler.cpp (modified) (1 diff)
• src/protocols/rtmp/basertmpprotocol.cpp (modified) (3 diffs)
• src/protocols/rtmp/streaming/innetrtmpstream.cpp (modified) (1 diff)

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

@@ -33 +33 @@
 class BaseRTMPProtocol;
 class BaseOutFileStream;
+class InNetRTMPStream;
 
 class DLLEXP BaseRTMPAppProtocolHandler
@@ -244 +245 @@
          * */
         virtual BaseOutFileStream *CreateOutFileStream(BaseRTMPProtocol *pFrom, Variant &meta, bool append);
+
+        /*
+         * 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 InNetRTMPStream *CreateInNetStream(BaseRTMPProtocol *pFrom,
+                uint32_t channelId, uint32_t streamId, string streamName);
+
 private:
         /*

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

@@ -104 +104 @@
 
         uint32_t GetOutboundChunkSize();
+        uint32_t GetInboundChunkSize();
         bool SetInboundChunkSize(uint32_t chunkSize);
         void TrySetOutboundChunkSize(uint32_t chunkSize);

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

@@ -54 +54 @@
         uint64_t _videoDroppedBytesCount;
 public:
-        InNetRTMPStream(BaseProtocol *pProtocol, StreamsManager *pStreamsManager,
-                        string name, uint32_t rtmpStreamId, uint32_t chunkSize,
-                        uint32_t channelId);
+        InNetRTMPStream(BaseRTMPProtocol *pProtocol, StreamsManager *pStreamsManager,
+                        string name, uint32_t rtmpStreamId, uint32_t channelId);
         virtual ~InNetRTMPStream();
         virtual StreamCapabilities * GetCapabilities();

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

@@ -1887 +1887 @@
 }
 
+InNetRTMPStream *BaseRTMPAppProtocolHandler::CreateInNetStream(
+        BaseRTMPProtocol *pFrom, uint32_t channelId, uint32_t streamId,
+        string streamName) {
+        return new InNetRTMPStream(pFrom,
+                GetApplication()->GetStreamsManager(), streamName, streamId, channelId);
+
+}
+
 string NormalizeStreamName(string streamName) {
         replace(streamName, "-", "_");

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

@@ -312 +312 @@
 }
 
+uint32_t BaseRTMPProtocol::GetInboundChunkSize() {
+        return _inboundChunkSize;
+}
+
 bool BaseRTMPProtocol::SetInboundChunkSize(uint32_t chunkSize) {
         /*WARN("Chunk size changed for RTMP connection %p: %u->%u", this,
@@ -424 +428 @@
 
 InNetRTMPStream * BaseRTMPProtocol::CreateINS(uint32_t channelId,
-                uint32_t streamId, string streamName) {
+        uint32_t streamId, string streamName) {
         if (streamId == 0 || streamId >= MAX_STREAMS_COUNT) {
                 FATAL("Invalid stream id: %u", streamId);
@@ -443 +447 @@
         _streams[streamId] = NULL;
 
-        InNetRTMPStream *pStream = new InNetRTMPStream(this,
-                        GetApplication()->GetStreamsManager(), streamName, streamId,
-                        _inboundChunkSize, channelId);
-
+        InNetRTMPStream *pStream = _pProtocolHandler->CreateInNetStream(this,
+                channelId, streamId, streamName);
         _streams[streamId] = pStream;
 

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

@@ -27 +27 @@
 #include "streaming/streamstypes.h"
 
-InNetRTMPStream::InNetRTMPStream(BaseProtocol *pProtocol,
+InNetRTMPStream::InNetRTMPStream(BaseRTMPProtocol *pProtocol,
                 StreamsManager *pStreamsManager, string name,
-                uint32_t rtmpStreamId, uint32_t chunkSize, uint32_t channelId)
+                uint32_t rtmpStreamId, uint32_t channelId)
 : BaseInNetStream(pProtocol, pStreamsManager, ST_IN_NET_RTMP, name) {
         _rtmpStreamId = rtmpStreamId;
-        _chunkSize = chunkSize;
+        _chunkSize = pProtocol->GetInboundChunkSize();
         _channelId = channelId;
         _clientId = format("%d_%d_%"PRIz"u", _pProtocol->GetId(), _rtmpStreamId, (size_t)this);