Bug 1465253: use postfix as prefix when logging and log in clear. r=bwc
MozReview-Commit-ID: 4bfVQZyM9qy
--- a/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
+++ b/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
@@ -1123,17 +1123,17 @@ MediaPipeline::RtpPacketReceived(Transpo
}
}
}
CSFLogDebug(LOGTAG, "%s received RTP packet.", mDescription.c_str());
IncrementRtpPacketsReceived(packet.len());
OnRtpPacketReceived();
- RtpLogger::LogPacket(packet, true, header.headerLength, mDescription);
+ RtpLogger::LogPacket(packet, true, mDescription);
// Might be nice to pass ownership of the buffer in this case, but it is a
// small optimization in a rare case.
mPacketDumper->Dump(
mLevel, dom::mozPacketDumpType::Srtp, false, packet.encrypted_data(), packet.encrypted_len());
mPacketDumper->Dump(
mLevel, dom::mozPacketDumpType::Rtp, false, packet.data(), packet.len());
@@ -1175,17 +1175,17 @@ MediaPipeline::RtcpPacketReceived(Transp
if (mFilter && !mFilter->FilterSenderReport(packet.data(), packet.len())) {
CSFLogWarn(LOGTAG, "Dropping incoming RTCP packet; filtered out");
return;
}
CSFLogDebug(LOGTAG, "%s received RTCP packet.", mDescription.c_str());
IncrementRtcpPacketsReceived();
- RtpLogger::LogPacket(packet, true, 0, mDescription);
+ RtpLogger::LogPacket(packet, true, mDescription);
// Might be nice to pass ownership of the buffer in this case, but it is a
// small optimization in a rare case.
mPacketDumper->Dump(
mLevel, dom::mozPacketDumpType::Srtcp, false, packet.encrypted_data(), packet.encrypted_len());
mPacketDumper->Dump(mLevel, dom::mozPacketDumpType::Rtcp, false, packet.data(), packet.len());
@@ -1642,23 +1642,17 @@ MediaPipeline::PipelineTransport::SendRt
MOZ_ASSERT(transport.mTransport);
NS_ENSURE_TRUE(transport.mTransport, NS_ERROR_NULL_POINTER);
MediaPacket packet(std::move(*aPacket));
packet.sdp_level() = Some(mPipeline->Level());
if (RtpLogger::IsPacketLoggingOn()) {
- int headerLen = 12;
- webrtc::RTPHeader header;
- if (mPipeline->mRtpParser &&
- mPipeline->mRtpParser->Parse(packet.data(), packet.len(), &header)) {
- headerLen = header.headerLength;
- }
- RtpLogger::LogPacket(packet, false, headerLen, mPipeline->mDescription);
+ RtpLogger::LogPacket(packet, false, mPipeline->mDescription);
}
if (isRtp) {
mPipeline->mPacketDumper->Dump(mPipeline->Level(),
dom::mozPacketDumpType::Rtp,
true,
packet.data(),
packet.len());
--- a/media/webrtc/signaling/src/mediapipeline/RtpLogger.cpp
+++ b/media/webrtc/signaling/src/mediapipeline/RtpLogger.cpp
@@ -29,22 +29,22 @@ static const char* rlLogTag = "RtpLogger
namespace mozilla {
bool RtpLogger::IsPacketLoggingOn() {
return CSFLogTestLevel(CSF_LOG_DEBUG);
}
void RtpLogger::LogPacket(const MediaPacket& packet, bool input,
- size_t headerLength, std::string desc) {
- bool isRtp = (packet.type() == MediaPacket::RTP);
+ std::string desc) {
if (CSFLogTestLevel(CSF_LOG_DEBUG)) {
+ bool isRtp = (packet.type() == MediaPacket::RTP);
std::stringstream ss;
/* This creates text2pcap compatible format, e.g.:
- * O 10:36:26.864934 000000 80 c8 00 06 6d ... RTCP_PACKET
+ * RTCP_PACKET O 10:36:26.864934 000000 80 c8 00 06 6d ...
*/
ss << (input ? "I " : "O ");
std::time_t t = std::time(nullptr);
std::tm tm = *std::localtime(&t);
char buf[9];
if (0 < strftime(buf, sizeof(buf), "%H:%M:%S", &tm)) {
ss << buf;
}
@@ -55,28 +55,18 @@ void RtpLogger::LogPacket(const MediaPac
ss << "." << (tb.millitm) << " ";
#else
struct timeval tv;
gettimeofday(&tv, NULL);
ss << "." << (tv.tv_usec) << " ";
#endif
ss << " 000000";
ss << std::hex << std::setfill('0');
- size_t offset_ = headerLength;
- if (isRtp && (offset_ + 5 < packet.len())) {
- // Allow the first 5 bytes of the payload in clear
- offset_ += 5;
+ for (size_t i=0; i < packet.len(); ++i) {
+ ss << " " << std::setw(2) << (int)packet.data()[i];
}
- for (size_t i=0; i < packet.len(); ++i) {
- if (isRtp && i > offset_) {
- ss << " 00";
- }
- else {
- ss << " " << std::setw(2) << (int)packet.data()[i];
- }
- }
- CSFLogDebug(LOGTAG, "%s%s%s", ss.str().c_str(),
- (isRtp ? " RTP_PACKET " : " RTCP_PACKET "), desc.c_str());
+ CSFLogDebug(LOGTAG, "%s%s%s", desc.c_str(),
+ (isRtp ? " RTP_PACKET " : " RTCP_PACKET "), ss.str().c_str());
}
}
} // end of namespace
--- a/media/webrtc/signaling/src/mediapipeline/RtpLogger.h
+++ b/media/webrtc/signaling/src/mediapipeline/RtpLogger.h
@@ -16,14 +16,14 @@ namespace mozilla {
* text2pcap.
* Example to convert the MOZ log file into a PCAP file:
* egrep '(RTP_PACKET|RTCP_PACKET)' moz.log | text2pcap -D -n -l 1 -i 17 -u 1234,1235 -t '%H:%M:%S.' - rtp.pcap
*/
class RtpLogger {
public:
static bool IsPacketLoggingOn();
static void LogPacket(const MediaPacket& packet, bool input,
- size_t headerLength, std::string desc);
+ std::string desc);
};
} // End of namespace
#endif