Cast: Fix rtcp event dedup logic in rtcp_receiver.

media/cast/rtcp/test_rtcp_packet_builder.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/test_rtcp_packet_builder.h"
+
 #include "base/logging.h"
+#include "media/cast/rtcp/rtcp_utility.h"
 
 namespace media {
 namespace cast {
 
 TestRtcpPacketBuilder::TestRtcpPacketBuilder()
     : ptr_of_length_(NULL),
       big_endian_writer_(reinterpret_cast<char*>(buffer_), kMaxIpPacketSize) {}
 
 void TestRtcpPacketBuilder::AddSr(uint32 sender_ssrc,
                                   int number_of_report_blocks) {
@@ skipping 222 matching lines @@
                                                 int num_events,
                                                 uint32 event_timesamp_base) {
   big_endian_writer_.WriteU32(rtp_timestamp);
   big_endian_writer_.WriteU8(static_cast<uint8>(num_events - 1));
   big_endian_writer_.WriteU8(static_cast<uint8>(event_timesamp_base >> 16));
   big_endian_writer_.WriteU8(static_cast<uint8>(event_timesamp_base >> 8));
   big_endian_writer_.WriteU8(static_cast<uint8>(event_timesamp_base));
 }
 
 void TestRtcpPacketBuilder::AddReceiverEventLog(uint16 event_data,
-                                                uint8 event_id,
+                                                CastLoggingEvent event,
                                                 uint16 event_timesamp_delta) {
   big_endian_writer_.WriteU16(event_data);
+  uint8 event_id = ConvertEventTypeToWireFormat(event);
   uint16 type_and_delta = static_cast<uint16>(event_id) << 12;
   type_and_delta += event_timesamp_delta & 0x0fff;
   big_endian_writer_.WriteU16(type_and_delta);
 }
 
 scoped_ptr<media::cast::Packet> TestRtcpPacketBuilder::GetPacket() {
   PatchLengthField();
   return scoped_ptr<media::cast::Packet>(
       new media::cast::Packet(buffer_, buffer_ + Length()));
 }
@@ skipping 24 matching lines @@
   big_endian_writer_.WriteU8(0x80 | (format_or_count & 0x1F));
   big_endian_writer_.WriteU8(payload);
   ptr_of_length_ = big_endian_writer_.ptr();
 
   // Initialize length to "clearly illegal".
   big_endian_writer_.WriteU16(0xDEAD);
 }
 
 }  // namespace cast
 }  // namespace media