Cast: Fix a bug with indexing in LogDeserializer.

media/cast/logging/log_deserializer.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/log_deserializer.h"
 
 #include <map>
 #include <utility>
 
 #include "base/big_endian.h"
@@ skipping 15 matching lines @@
 // since the there are two streams in the blob.
 // Keep in sync with media/cast/logging/log_serializer.cc.
 const int kMaxUncompressedBytes = 60 * 1000 * 1000;
 
 void MergePacketEvent(const AggregatedPacketEvent& from,
     linked_ptr<AggregatedPacketEvent> to) {
   for (int i = 0; i < from.base_packet_event_size(); i++) {
     const BasePacketEvent& from_base_event = from.base_packet_event(i);
     bool merged = false;
     for (int j = 0; j < to->base_packet_event_size(); j++) {
-      BasePacketEvent* to_base_event = to->mutable_base_packet_event(i);
+      BasePacketEvent* to_base_event = to->mutable_base_packet_event(j);
       if (from_base_event.packet_id() == to_base_event->packet_id()) {
         to_base_event->MergeFrom(from_base_event);
         merged = true;
         break;
       }
     }
     if (!merged) {
       BasePacketEvent* to_base_event = to->add_base_packet_event();
       to_base_event->CopyFrom(from_base_event);
     }
   }
 }
 
 void MergeFrameEvent(const AggregatedFrameEvent& from,
     linked_ptr<AggregatedFrameEvent> to) {
   to->mutable_event_type()->MergeFrom(from.event_type());
   to->mutable_event_timestamp_ms()->MergeFrom(from.event_timestamp_ms());
-  if (!to->has_encoded_frame_size())
+  if (!to->has_encoded_frame_size() && from.has_encoded_frame_size())
     to->set_encoded_frame_size(from.encoded_frame_size());
-  if (!to->has_delay_millis())
+  if (!to->has_delay_millis() && from.has_delay_millis())
     to->set_delay_millis(from.delay_millis());
-  if (!to->has_key_frame())
+  if (!to->has_key_frame() && from.has_key_frame())
     to->set_key_frame(from.key_frame());
+  if (!to->has_target_bitrate() && from.has_target_bitrate())
+    to->set_target_bitrate(from.target_bitrate());
 }
 
 bool PopulateDeserializedLog(base::BigEndianReader* reader,
                              media::cast::DeserializedLog* log) {
   FrameEventMap frame_event_map;
   PacketEventMap packet_event_map;
 
   int num_frame_events = log->metadata.num_frame_events();
   RtpTimestamp relative_rtp_timestamp = 0;
   uint16 proto_size = 0;
@@ skipping 166 matching lines @@
   } else {
     return DoDeserializeEvents(data, data_bytes, audio_log, video_log);
   }
 }
 
 DeserializedLog::DeserializedLog() {}
 DeserializedLog::~DeserializedLog() {}
 
 }  // namespace cast
 }  // namespace media