Cast: Limit number of events/packets in EncodingEventSubscriber protos.

media/cast/logging/encoding_event_subscriber.cc

 // Copyright 2014 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/logging/encoding_event_subscriber.h"
 
 #include <cstring>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 33 matching lines @@
     // Look up existing entry. If not found, create a new entry and add to map.
     if (it == frame_event_map_.end()) {
       event_proto.reset(new AggregatedFrameEvent);
       event_proto->set_relative_rtp_timestamp(relative_rtp_timestamp);
       frame_event_map_.insert(
           std::make_pair(relative_rtp_timestamp, event_proto));
     } else {
       event_proto = it->second;
     }
 
-    event_proto->add_event_type(ToProtoEventType(frame_event.type));
-    event_proto->add_event_timestamp_ms(
-        (frame_event.timestamp - base::TimeTicks()).InMilliseconds());
+    if (event_proto->event_type_size() >= kMaxEventsPerProto) {

[Alpha Left Google, 2014/04/21 18:14:04]

I think we should keep as many as types as possible.

+      DVLOG(2) << "Too many events in frame " << frame_event.rtp_timestamp
+               << ". Dropping frame event.";
+    } else {
+      event_proto->add_event_type(ToProtoEventType(frame_event.type));
+      event_proto->add_event_timestamp_ms(
+          (frame_event.timestamp - base::TimeTicks()).InMilliseconds());
 
-    if (frame_event.type == kAudioFrameEncoded) {
-      event_proto->set_encoded_frame_size(frame_event.size);
-    } else if (frame_event.type == kVideoFrameEncoded) {
-      event_proto->set_encoded_frame_size(frame_event.size);
-      event_proto->set_key_frame(frame_event.key_frame);
-    } else if (frame_event.type == kAudioPlayoutDelay ||
-               frame_event.type == kVideoRenderDelay) {
-      event_proto->set_delay_millis(frame_event.delay_delta.InMilliseconds());
+      if (frame_event.type == kAudioFrameEncoded) {
+        event_proto->set_encoded_frame_size(frame_event.size);
+      } else if (frame_event.type == kVideoFrameEncoded) {
+        event_proto->set_encoded_frame_size(frame_event.size);
+        event_proto->set_key_frame(frame_event.key_frame);
+      } else if (frame_event.type == kAudioPlayoutDelay ||
+                 frame_event.type == kVideoRenderDelay) {
+        event_proto->set_delay_millis(frame_event.delay_delta.InMilliseconds());
+      }
     }
-
     TruncateFrameEventMapIfNeeded();
   }
 
   DCHECK(frame_event_map_.size() <= max_frames_);
 }
 
 void EncodingEventSubscriber::OnReceivePacketEvent(
     const PacketEvent& packet_event) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
@@ skipping 22 matching lines @@
       for (RepeatedPtrField<BasePacketEvent>::pointer_iterator it =
                field->pointer_begin();
            it != field->pointer_end();
            ++it) {
         if ((*it)->packet_id() == packet_event.packet_id) {
           base_packet_event_proto = *it;
           break;
         }
       }
       if (!base_packet_event_proto) {
-        base_packet_event_proto = event_proto->add_base_packet_event();
-        base_packet_event_proto->set_packet_id(packet_event.packet_id);
+        if (event_proto->base_packet_event_size() >= kMaxPacketsPerFrame) {
+          DVLOG(3) << "Too many packets in AggregatedPacketEvent "
+                   << packet_event.rtp_timestamp << ". Dropping packet event.";
+        } else {
+          base_packet_event_proto = event_proto->add_base_packet_event();
+          base_packet_event_proto->set_packet_id(packet_event.packet_id);
+        }
       }
     }
 
-    base_packet_event_proto->add_event_type(
-        ToProtoEventType(packet_event.type));
-    base_packet_event_proto->add_event_timestamp_ms(
-        (packet_event.timestamp - base::TimeTicks()).InMilliseconds());
+    if (base_packet_event_proto) {
+      if (base_packet_event_proto->event_type_size() >= kMaxEventsPerProto) {
+        DVLOG(3) << "Too many events in packet "
+                 << packet_event.rtp_timestamp << ", "
+                 << packet_event.packet_id << ". Dropping packet event.";
+      } else {
+        base_packet_event_proto->add_event_type(
+            ToProtoEventType(packet_event.type));
+        base_packet_event_proto->add_event_timestamp_ms(
+            (packet_event.timestamp - base::TimeTicks()).InMilliseconds());
+      }
+    }
 
     TruncatePacketEventMapIfNeeded();
   }
 
   DCHECK(packet_event_map_.size() <= max_frames_);
 }
 
 void EncodingEventSubscriber::OnReceiveGenericEvent(
     const GenericEvent& generic_event) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 46 matching lines @@
 
 void EncodingEventSubscriber::Reset() {
   frame_event_map_.clear();
   packet_event_map_.clear();
   seen_first_rtp_timestamp_ = false;
   first_rtp_timestamp_ = 0u;
 }
 
 }  // namespace cast
 }  // namespace media