Changeset 53

Timestamp:

08/04/10 19:56:40 (18 months ago)

Author:

shiretu

Message:

-- added proper stream naming for rtsp streams

Location:

trunk

Files:

• builders/cmake/rtmpserver/rtmpserver.lua (modified) (1 diff)
• sources/thelib/include/protocols/rtp/connectivity/inboundconnectivity.h (modified) (1 diff)
• sources/thelib/include/protocols/rtp/rtspprotocol.h (modified) (1 diff)
• sources/thelib/include/protocols/rtp/sdp.h (modified) (1 diff)
• sources/thelib/src/protocols/rtp/basertspappprotocolhandler.cpp (modified) (1 diff)
• sources/thelib/src/protocols/rtp/connectivity/inboundconnectivity.cpp (modified) (3 diffs)
• sources/thelib/src/protocols/rtp/rtspprotocol.cpp (modified) (1 diff)
• sources/thelib/src/protocols/rtp/sdp.cpp (modified) (2 diffs)

trunk/builders/cmake/rtmpserver/rtmpserver.lua

@@ -149 +149 @@
                                 --[[{
                                         url="rtsp://82.177.67.61/axis-media/media.amp",
+                                        streamName="stream1",
                                         forceTcp=false
-                                },
-                                {
-                                        url="rtsp://217.153.33.206/axis-media/media.amp",
-                                        forceTcp=true
                                 },
                                 {

trunk/sources/thelib/include/protocols/rtp/connectivity/inboundconnectivity.h

@@ -53 +53 @@
         void EnqueueForDelete();
 
-        bool Initialize(Variant &videoTrack, Variant &audioTrack, bool forceTcp);
+        bool Initialize(Variant &videoTrack, Variant &audioTrack,
+                        string streamName, bool forceTcp);
 
         string GetTransportHeaderLine(bool isAudio);

trunk/sources/thelib/include/protocols/rtp/rtspprotocol.h

@@ -91 +91 @@
 
         InboundConnectivity *GetInboundConnectivity(Variant &videoTrack,
-                        Variant &audioTrack);
+                        Variant &audioTrack, string sdpStreamName);
         void CloseInboundConnectivity();
 

trunk/sources/thelib/include/protocols/rtp/sdp.h

@@ -58 +58 @@
         static bool ParseSDP(SDP &sdp, string &raw);
         Variant GetVideoTrack(uint32_t index, string uri);
+        string GetStreamName();
 private:
         static bool ParseSection(Variant &result, vector<string> &lines,

trunk/sources/thelib/src/protocols/rtp/basertspappprotocolhandler.cpp

@@ -488 +488 @@
                         requestHeaders[RTSP_FIRST_LINE][RTSP_URL]);
         Variant audioTrack;
-        FINEST("videoTrack:\n%s", STR(videoTrack.ToString()));
+        //FINEST("videoTrack:\n%s", STR(videoTrack.ToString()));
 
 
         //5. Create the inbound connectivity
-        if (pFrom->GetInboundConnectivity(videoTrack, audioTrack) == NULL) {
+        if (pFrom->GetInboundConnectivity(videoTrack, audioTrack,
+                        sdp.GetStreamName()) == NULL) {
                 FATAL("Unable to get the inbound connectivity");
                 return false;

trunk/sources/thelib/src/protocols/rtp/connectivity/inboundconnectivity.cpp

@@ -54 +54 @@
 
 bool InboundConnectivity::Initialize(Variant &videoTrack, Variant &audioTrack,
-                bool forceTcp) {
+                string streamName, bool forceTcp) {
         _forceTcp = forceTcp;
 
@@ -87 +87 @@
 
         //5. Create the in stream
+        if (streamName == "")
+                streamName = format("rtsp_%d", _pRTSP->GetId());
         _pInStream = new InNetRTPStream(_pRTSP, pApplication->GetStreamsManager(),
-                        format("rtsp_%d", _pRTSP->GetId()),
+                        streamName,
                         unb64((string) SDP_VIDEO_CODEC_H264_SPS(videoTrack)),
                         unb64((string) SDP_VIDEO_CODEC_H264_PPS(videoTrack)));
@@ -214 +216 @@
         //FINEST("%s:%d length: %d", inet_ntoa(address.sin_addr), ntohs(address.sin_port), length);
         return sendto(pRTCP->GetIOHandler()->GetOutboundFd(),
-                        (char *)pBuffer, length, 0, (sockaddr *) & address, sizeof (address)) == (int32_t) length;
+                        (char *) pBuffer, length, 0, (sockaddr *) & address, sizeof (address)) == (int32_t) length;
 }
 

trunk/sources/thelib/src/protocols/rtp/rtspprotocol.cpp

@@ -278 +278 @@
 
 InboundConnectivity *RTSPProtocol::GetInboundConnectivity(Variant &videoTrack,
-                Variant &audioTrack) {
+                Variant &audioTrack, string sdpStreamName) {
         CloseInboundConnectivity();
+        string streamName;
+        if (GetCustomParameters().HasKey("streamName")) {
+                streamName = (string) GetCustomParameters()["streamName"];
+        } else {
+                streamName = sdpStreamName;
+        }
         _pInboundConnectivity = new InboundConnectivity(this);
         if (!_pInboundConnectivity->Initialize(videoTrack, audioTrack,
-                        (bool)GetCustomParameters()["forceTcp"])) {
+                        streamName, (bool)GetCustomParameters()["forceTcp"])) {
                 FATAL("Unable to initialize inbound connectivity");
                 CloseInboundConnectivity();

trunk/sources/thelib/src/protocols/rtp/sdp.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_RTP
@@ -127 +127 @@
         //3. Done
         return result;
+}
+
+string SDP::GetStreamName() {
+        if (!HasKey(SDP_SESSION))
+                return "";
+        if (!(*this)[SDP_SESSION].HasKey(SDP_S))
+                return "";
+        return (string) (*this)[SDP_SESSION][SDP_S];
 }