Revert 255602 "Cast: Cap max receiver log size per rtcp packet t..."

trunk/src/media/cast/rtcp/rtcp_sender.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/cast/rtcp/rtcp_sender.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/big_endian.h"
 #include "base/logging.h"
 #include "media/cast/cast_environment.h"
 #include "media/cast/rtcp/rtcp_defines.h"
 #include "media/cast/rtcp/rtcp_utility.h"
 #include "media/cast/transport/cast_transport_defines.h"
 #include "media/cast/transport/pacing/paced_sender.h"
 
 namespace media {
 namespace cast {
 namespace {
 
 // Max delta is 4095 milliseconds because we need to be able to encode it in
 // 12 bits.
 const int64 kMaxWireFormatTimeDeltaMs = GG_INT64_C(0xfff);
 
-// We limit the size of receiver logs to avoid queuing up packets. We also
-// do not need the amount of redundancy that results from filling up every
-// RTCP packet with log messages. This number should give a redundancy of
-// about 2-3 per log message.
-const size_t kMaxReceiverLogBytes = 200;
-
 // Converts a log event type to an integer value.
 // NOTE: We have only allocated 4 bits to represent the type of event over the
 // wire. Therefore, this function can only return values from 0 to 15.
 int ConvertEventTypeToWireFormat(const CastLoggingEvent& event) {
   switch (event) {
     case kAudioAckSent:
       return 1;
     case kAudioPlayoutDelay:
       return 2;
     case kAudioFrameDecoded:
@@ skipping 39 matching lines @@
   return lhs.event_timestamp < rhs.event_timestamp;
 }
 
 bool BuildRtcpReceiverLogMessage(
     const ReceiverRtcpEventSubscriber::RtcpEventMultiMap& rtcp_events,
     size_t start_size,
     RtcpReceiverLogMessage* receiver_log_message,
     size_t* number_of_frames,
     size_t* total_number_of_messages_to_send,
     size_t* rtcp_log_size) {
-  size_t remaining_space =
-      std::min(kMaxReceiverLogBytes, kMaxIpPacketSize - start_size);
+  size_t remaining_space = kMaxIpPacketSize - start_size;
   if (remaining_space < kRtcpCastLogHeaderSize + kRtcpReceiverFrameLogSize +
                             kRtcpReceiverEventLogSize) {
     return false;
   }
 
   // We use this to do event timestamp sorting and truncating for events of
   // a single frame.
   std::vector<RtcpReceiverEventLogMessage> sorted_log_messages;
 
   // Account for the RTCP header for an application-defined packet.
@@ skipping 605 matching lines @@
     if (frame_log_messages.event_log_messages_.empty()) {
       // We sent all messages on this frame; pop the frame header.
       receiver_log_message.pop_front();
     }
   }
   DCHECK_EQ(total_number_of_messages_to_send, 0);
 }
 
 }  // namespace cast
 }  // namespace media