commit dc80bae2a62a1bdbe0d342b3260a7e5b2cb958df
author andresp@webrtc.org <andresp@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Apr 08 11:06:12 2014 +0000
committer andresp@webrtc.org <andresp@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Apr 08 11:06:12 2014 +0000
tree ffd9ea4647aab295f3ca0222d257aacbe802ea2f
parent b287d968d9c6b7d1190b663cae207efc0497d75f

Convert logs in rtp rtcp module from WEBRTC_TRACE into LOG.
Clean some logs and add asserts in the way.

BUG=3153
R=mflodman@webrtc.org, stefan@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/11129004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5861 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/rtp_rtcp/source/rtcp_packet.cc

diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet.cc
index 0c3197f..a127bc1 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_packet.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet.cc
@@ -11,7 +11,7 @@
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
 
 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
-#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/system_wrappers/interface/logging.h"
 
 namespace webrtc {
 namespace rtcp {
@@ -233,8 +233,7 @@
                           uint16_t* len,
                           uint16_t max_len) const {
   if (*len + Length() > max_len) {
-    WEBRTC_TRACE(kTraceWarning, kTraceRtpRtcp, -1,
-                 "Max packet size reached, skipped SR.");
+    LOG(LS_WARNING) << "Max packet size reached.";
     return;
   }
   CreateSenderReport(sr_, packet, len);
@@ -244,8 +243,7 @@
 void SenderReport::WithReportBlock(ReportBlock* block) {
   assert(block);
   if (report_blocks_.size() >= kMaxNumberOfReportBlocks) {
-    WEBRTC_TRACE(kTraceWarning, kTraceRtpRtcp, -1,
-                 "Max report block size reached.");
+    LOG(LS_WARNING) << "Max report blocks reached.";
     return;
   }
   report_blocks_.push_back(block);
@@ -256,8 +254,7 @@
                             uint16_t* len,
                             uint16_t max_len) const {
   if (*len + Length() > max_len) {
-    WEBRTC_TRACE(kTraceWarning, kTraceRtpRtcp, -1,
-                 "Max packet size reached, skipped RR.");
+    LOG(LS_WARNING) << "Max packet size reached.";
     return;
   }
   CreateReceiverReport(rr_, packet, len);
@@ -267,8 +264,7 @@
 void ReceiverReport::WithReportBlock(ReportBlock* block) {
   assert(block);
   if (report_blocks_.size() >= kMaxNumberOfReportBlocks) {
-    WEBRTC_TRACE(kTraceWarning, kTraceRtpRtcp, -1,
-                 "Max report block size reached.");
+    LOG(LS_WARNING) << "Max report blocks reached.";
     return;
   }
   report_blocks_.push_back(block);
@@ -277,8 +273,7 @@
 
 void Bye::Create(uint8_t* packet, uint16_t* len, uint16_t max_len) const {
   if (*len + Length() > max_len) {
-    WEBRTC_TRACE(kTraceWarning, kTraceRtpRtcp, -1,
-                 "Max packet size reached, skipped BYE.");
+    LOG(LS_WARNING) << "Max packet size reached.";
     return;
   }
   CreateBye(bye_, csrcs_, packet, len);
@@ -286,8 +281,7 @@
 
 void Bye::WithCsrc(uint32_t csrc) {
   if (csrcs_.size() >= kMaxNumberOfCsrcs) {
-    WEBRTC_TRACE(kTraceWarning, kTraceRtpRtcp, -1,
-                 "Max CSRC size reached.");
+    LOG(LS_WARNING) << "Max CSRC size reached.";
     return;
   }
   csrcs_.push_back(csrc);
@@ -295,8 +289,7 @@
 
 void Fir::Create(uint8_t* packet, uint16_t* len, uint16_t max_len) const {
   if (*len + Length() > max_len) {
-    WEBRTC_TRACE(kTraceWarning, kTraceRtpRtcp, -1,
-                 "Max packet size reached, skipped FIR.");
+    LOG(LS_WARNING) << "Max packet size reached.";
     return;
   }
   CreateFirRequest(fir_, fir_item_, packet, len);