Changeset 54

Timestamp:

08/04/10 21:39:39 (18 months ago)

Author:

shiretu

Message:

-- added support for stream metadata gathered from flv metadata

Location:

trunk

Files:

• builders/cmake/rtmpserver/rtmpserver.lua (modified) (1 diff)
• sources/thelib/include/protocols/liveflv/inboundliveflvprotocol.h (modified) (2 diffs)
• sources/thelib/src/protocols/liveflv/inboundliveflvprotocol.cpp (modified) (9 diffs)

trunk/builders/cmake/rtmpserver/rtmpserver.lua

@@ -133 +133 @@
                                         ip="0.0.0.0",
                                         port=6666,
-                                        protocol="inboundLiveFlv"
+                                        protocol="inboundLiveFlv",
+                                        waitForMetadata=true,
                                 },
                                 {

trunk/sources/thelib/include/protocols/liveflv/inboundliveflvprotocol.h

@@ -31 +31 @@
         InNetLiveFLVStream *_pStream;
         bool _headerParsed;
+        bool _waitForMetadata;
 public:
         InboundLiveFLVProtocol();
@@ -41 +42 @@
         virtual bool SignalInputData(IOBuffer &buffer);
 private:
-        bool InitializeStream();
+        bool InitializeStream(string streamName);
 };
 

trunk/sources/thelib/src/protocols/liveflv/inboundliveflvprotocol.cpp

@@ -1 +1 @@
 /* 
-*  Copyright (c) 2010,
-*  Gavriloaie Eugen-Andrei (shiretu@gmail.com)
-*  
-*  This file is part of crtmpserver.
-*  crtmpserver is free software: you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation, either version 3 of the License, or
-*  (at your option) any later version.
-*  
-*  crtmpserver is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*  
-*  You should have received a copy of the GNU General Public License
-*  along with crtmpserver.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ *  Copyright (c) 2010,
+ *  Gavriloaie Eugen-Andrei (shiretu@gmail.com)
+ *
+ *  This file is part of crtmpserver.
+ *  crtmpserver is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  crtmpserver is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with crtmpserver.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #ifdef HAS_PROTOCOL_LIVEFLV
@@ -32 +32 @@
         _pStream = NULL;
         _headerParsed = false;
+        _waitForMetadata = false;
 }
 
@@ -42 +43 @@
 
 bool InboundLiveFLVProtocol::Initialize(Variant &parameters) {
+        GetCustomParameters() = parameters;
+        FINEST("parameters:\n%s", STR(parameters.ToString()));
+        if (parameters.HasKey("waitForMetadata"))
+                _waitForMetadata = (bool)parameters["waitForMetadata"];
+        else
+                _waitForMetadata = false;
+        FINEST("_waitForMetadata: %d", _waitForMetadata);
         return true;
 }
@@ -63 +71 @@
         //1. Initialize the stream
         if (_pStream == NULL) {
-                if (!InitializeStream()) {
-                        FATAL("Unable to initialize the stream");
-                        return false;
+                if (!_waitForMetadata) {
+                        if (!InitializeStream("")) {
+                                FATAL("Unable to initialize the stream");
+                                return false;
+                        }
                 }
         }
@@ -113 +123 @@
                         {
                                 //audio data
-                                if (!_pStream->FeedData(GETIBPOINTER(buffer), length, 0,
-                                                length, timestamp, true)) {
-                                        FATAL("Unable to feed audio");
-                                        return false;
+                                if (_pStream != NULL) {
+                                        if (!_pStream->FeedData(GETIBPOINTER(buffer), length, 0,
+                                                        length, timestamp, true)) {
+                                                FATAL("Unable to feed audio");
+                                                return false;
+                                        }
                                 }
                                 break;
@@ -123 +135 @@
                         {
                                 //video data
-                                if (!_pStream->FeedData(GETIBPOINTER(buffer), length, 0,
-                                                length, timestamp, false)) {
-                                        FATAL("Unable to feed audio");
-                                        return false;
+                                if (_pStream != NULL) {
+                                        if (!_pStream->FeedData(GETIBPOINTER(buffer), length, 0,
+                                                        length, timestamp, false)) {
+                                                FATAL("Unable to feed audio");
+                                                return false;
+                                        }
                                 }
                                 break;
@@ -151 +165 @@
                                 //3. Read the rest of the parameters
                                 Variant parameters;
+                                string streamName = "";
                                 while (GETAVAILABLEBYTESCOUNT(metaBuffer) > 0) {
                                         Variant v;
@@ -157 +172 @@
                                                 return false;
                                         }
+                                        if (v.HasKey("streamName")) {
+                                                if (v["streamName"] == V_STRING) {
+                                                        streamName = (string) v["streamName"];
+                                                }
+                                        }
                                         parameters.PushToArray(v);
                                 }
 
+                                if (_pStream == NULL) {
+                                        if (!InitializeStream(streamName)) {
+                                                FATAL("Unable to initialize the stream");
+                                                return false;
+                                        }
+                                }
+
+                                INFO("Stream metadata:\n%s", STR(parameters.ToString()));
+
                                 //4. Send the notify
-                                if (!_pStream->SendStreamMessage(notifyFunction, parameters, true)) {
-                                        FATAL("Unable to send the notify");
-                                        return false;
+                                if (_pStream != NULL) {
+                                        if (!_pStream->SendStreamMessage(notifyFunction, parameters, true)) {
+                                                FATAL("Unable to send the notify");
+                                                return false;
+                                        }
                                 }
 
@@ -183 +214 @@
 }
 
-bool InboundLiveFLVProtocol::InitializeStream() {
-        //1. Compute a stream name based on the nature of the carrier (if any...)
-        string streamName = "";
-        if (GetIOHandler() != NULL) {
-                //we have a carrier
-                if (GetIOHandler()->GetType() == IOHT_TCP_CARRIER) {
-                        //this is a tcp carrier
-                        streamName = format("%s_%d",
-                                        STR(((TCPCarrier *) GetIOHandler())->GetFarEndpointAddressIp()),
-                                        ((TCPCarrier *) GetIOHandler())->GetFarEndpointPort());
+bool InboundLiveFLVProtocol::InitializeStream(string streamName) {
+        if (streamName == "") {
+                //1. Compute a stream name based on the nature of the carrier (if any...)
+                if (GetIOHandler() != NULL) {
+                        //we have a carrier
+                        if (GetIOHandler()->GetType() == IOHT_TCP_CARRIER) {
+                                //this is a tcp carrier
+                                streamName = format("%s_%d",
+                                                STR(((TCPCarrier *) GetIOHandler())->GetFarEndpointAddressIp()),
+                                                ((TCPCarrier *) GetIOHandler())->GetFarEndpointPort());
+                        } else {
+                                //this is not a TCP carrier
+                                streamName = format("flv_%d", GetId());
+                        }
                 } else {
-                        //this is not a TCP carrier
+                        //we don't have a carrier. This protocl might be artificially fed
                         streamName = format("flv_%d", GetId());
                 }
-        } else {
-                //we don't have a carrier. This protocl might be artificially fed
-                streamName = format("flv_%d", GetId());
         }
         FINEST("Stream name: %s", STR(streamName));