Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit

src/Rtcp/Rtcp.cpp

@@ -454,6 +454,7 @@ std::shared_ptr<RtcpSdes> RtcpSdes::create(const std::vector<string> &item_text)
     auto real_size = sizeof(RtcpSdes) - sizeof(SdesChunk) + item_total_size;
     auto real_size = sizeof(RtcpSdes) - sizeof(SdesChunk) + item_total_size;
     auto bytes = alignSize(real_size);
     auto bytes = alignSize(real_size);
     auto ptr = (RtcpSdes *) new char[bytes];
     auto ptr = (RtcpSdes *) new char[bytes];
+    memset(ptr, 0x00, bytes);
     auto item_ptr = &ptr->chunks;
     auto item_ptr = &ptr->chunks;
     for (auto &text : item_text) {
     for (auto &text : item_text) {
         item_ptr->txt_len = (0xFF & text.size());
         item_ptr->txt_len = (0xFF & text.size());

src/Rtsp/Rtsp.cpp

@@ -94,7 +94,7 @@ string SdpTrack::getControlUrl(const string &base_url) const {
     return base_url + "/" + _control;
     return base_url + "/" + _control;
 }
 }
 
 
-string SdpTrack::toString() const {
+string SdpTrack::toString(uint16_t port) const {
     _StrPrinter _printer;
     _StrPrinter _printer;
     switch (_type) {
     switch (_type) {
         case TrackTitle: {
         case TrackTitle: {
@@ -106,9 +106,9 @@ string SdpTrack::toString() const {
         case TrackAudio:
         case TrackAudio:
         case TrackVideo: {
         case TrackVideo: {
             if (_type == TrackAudio) {
             if (_type == TrackAudio) {
-                _printer << "m=audio 0 RTP/AVP " << _pt << "\r\n";
+                _printer << "m=audio " << port << " RTP/AVP " << _pt << "\r\n";
             } else {
             } else {
-                _printer << "m=video 0 RTP/AVP " << _pt << "\r\n";
+                _printer << "m=video " << port << " RTP/AVP " << _pt << "\r\n";
             }
             }
             if (!_b.empty()) {
             if (!_b.empty()) {
                 _printer << "b=" << _b << "\r\n";
                 _printer << "b=" << _b << "\r\n";

src/Rtsp/Rtsp.h

@@ -216,7 +216,7 @@ public:
     map<char, string> _other;
     map<char, string> _other;
     multimap<string, string> _attr;
     multimap<string, string> _attr;
 
 
-    string toString() const;
+    string toString(uint16_t port = 0) const;
     string getName() const;
     string getName() const;
     string getControlUrl(const string &base_url) const;
     string getControlUrl(const string &base_url) const;