Changeset 118 for trunk/sources/thelib/src/protocols/rtp/basertspappprotocolhandler.cpp

Timestamp:

09/02/10 22:32:44 (21 months ago)

Author:

shiretu

Message:

-- android related stuff

File:

• trunk/sources/thelib/src/protocols/rtp/basertspappprotocolhandler.cpp (modified) (2 diffs)

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

@@ -279 +279 @@
                 pFrom->GetCustomParameters()["audioDataPortNumber"] = dataPortNumber;
                 pFrom->GetCustomParameters()["audioRtcpPortNumber"] = rtcpPortNumber;
+                pFrom->GetCustomParameters()["audioTrackUri"] = requestHeaders[RTSP_FIRST_LINE][RTSP_URL];
         } else {
                 pFrom->GetCustomParameters()["videoDataPortNumber"] = dataPortNumber;
                 pFrom->GetCustomParameters()["videoRtcpPortNumber"] = rtcpPortNumber;
+                pFrom->GetCustomParameters()["videoTrackUri"] = requestHeaders[RTSP_FIRST_LINE][RTSP_URL];
         }
 
@@ -349 +351 @@
         //6. prepare the response
         pFrom->PushResponseFirstLine(RTSP_VERSION_1_0, 200, "OK");
+        pFrom->PushResponseHeader(RTSP_HEADERS_RANGE, "npt=0.0-");
+
+        string rtpInfoVideo = "";
+        string rtpInfoAudio = "";
+        if (pFrom->GetCustomParameters().HasKey("videoTrackId")) {
+                rtpInfoVideo = format("url=%s;seq=%u;rtptime=%u",
+                                STR(pFrom->GetCustomParameters()["videoTrackUri"]),
+                                pOutboundConnectivity->GetLastVideoSequence(),
+                                0);
+                //pOutboundConnectivity->GetLastVideoRTPTimestamp());
+        }
+        if (pFrom->GetCustomParameters().HasKey("audioTrackId")) {
+                rtpInfoAudio = format("url=%s;seq=%u;rtptime=%u",
+                                STR(pFrom->GetCustomParameters()["audioTrackUri"]),
+                                pOutboundConnectivity->GetLastAudioSequence(),
+                                0);
+                //pOutboundConnectivity->GetLastAudioRTPTimestamp());
+        }
+        string rtpInfo = rtpInfoVideo;
+        if (rtpInfo != "") {
+                if (rtpInfoAudio != "") {
+                        rtpInfo += ", " + rtpInfoAudio;
+                }
+        } else {
+                rtpInfo = rtpInfoAudio;
+        }
+        //pFrom->PushResponseHeader(RTSP_HEADERS_RTP_INFO, rtpInfo);
 
         //7. Done