Merge remote-tracking branch 'origin/master'

src/engine/helper/HL_Rtp.cpp

@@ -245,3 +245,8 @@ std::string MediaStreamId::getFinishDescription() const
     return oss.str();
 }
 
+std::ostream& operator << (std::ostream& output, const MediaStreamId& id)
+{
+    return (output << id.toString());
+}
+

src/engine/helper/HL_Rtp.h

@@ -87,4 +87,6 @@ struct MediaStreamId
     std::string getFinishDescription() const;
 };
 
+std::ostream& operator << (std::ostream& output, const MediaStreamId& id);
+
 #endif

src/engine/helper/HL_String.cpp

@@ -119,7 +119,7 @@ std::string StringHelper::toHex(unsigned int value)
 std::string StringHelper::toHex(const void *ptr)
 {
     std::ostringstream oss;
-    oss << std::hex << ptr;
+    oss << std::fixed << std::setw(8) << std::setfill('0') << std::hex << ptr;
     return oss.str();
 }