Add Cast PLI support on sender side.

media/cast/net/rtcp/rtcp_builder.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/net/rtcp/rtcp_builder.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 147 matching lines @@
   writer_ = base::BigEndianWriter(NULL, 0);
   PacketRef ret = packet_;
   packet_ = NULL;
   return ret;
 }
 
 PacketRef RtcpBuilder::BuildRtcpFromReceiver(
     const RtcpReportBlock* report_block,
     const RtcpReceiverReferenceTimeReport* rrtr,
     const RtcpCastMessage* cast_message,
+    const RtcpPliMessage* pli_message,
     const ReceiverRtcpEventSubscriber::RtcpEvents* rtcp_events,
     base::TimeDelta target_delay) {
   Start();
 
   if (report_block)
     AddRR(report_block);
   if (rrtr)
     AddRrtr(rrtr);
   if (cast_message)
     AddCast(cast_message, target_delay);
+  if (pli_message)
+    AddPli(pli_message);
   if (rtcp_events)
     AddReceiverLog(*rtcp_events);
 
   return Finish();
 }
 
 PacketRef RtcpBuilder::BuildRtcpFromSender(const RtcpSenderInfo& sender_info) {
   Start();
   AddSR(sender_info);
   return Finish();
@@ skipping 32 matching lines @@
   writer_.WriteU32(ssrc_);  // Add our own SSRC.
   writer_.WriteU8(4);       // Add block type.
   writer_.WriteU8(0);       // Add reserved.
   writer_.WriteU16(2);      // Block length.
 
   // Add the media (received RTP) SSRC.
   writer_.WriteU32(rrtr->ntp_seconds);
   writer_.WriteU32(rrtr->ntp_fraction);
 }
 
+void RtcpBuilder::AddPli(const RtcpPliMessage* pli_message) {

[dcheng, 2016/03/01 23:44:12]

How about const RtcpPliMessage&? This should never be null right?

[xjz, 2016/03/02 04:24:17]

Done.

+  AddRtcpHeader(kPacketTypePayloadSpecific, 1);
+  writer_.WriteU32(ssrc_);
+  writer_.WriteU32(pli_message->remote_ssrc);
+}
+
 void RtcpBuilder::AddCast(const RtcpCastMessage* cast,
                           base::TimeDelta target_delay) {
   // See RTC 4585 Section 6.4 for application specific feedback messages.
   AddRtcpHeader(kPacketTypePayloadSpecific, 15);
   writer_.WriteU32(ssrc_);              // Add our own SSRC.
-  writer_.WriteU32(cast->media_ssrc);  // Remote SSRC.
+  writer_.WriteU32(cast->remote_ssrc);  // Remote SSRC.
   writer_.WriteU32(kCast);
   writer_.WriteU8(static_cast<uint8_t>(cast->ack_frame_id));
   uint8_t* cast_loss_field_pos = reinterpret_cast<uint8_t*>(writer_.ptr());
   writer_.WriteU8(0);  // Overwritten with number_of_loss_fields.
   DCHECK_LE(target_delay.InMilliseconds(),
             std::numeric_limits<uint16_t>::max());
   writer_.WriteU16(target_delay.InMilliseconds());
 
   size_t number_of_loss_fields = 0;
   size_t max_number_of_loss_fields = std::min<size_t>(
@@ skipping 35 matching lines @@
           } else {
             break;
           }
         }
         writer_.WriteU8(bitmask);
         ++number_of_loss_fields;
       }
     }
   }
   VLOG_IF(1, !nack_string_builder.Empty())
-      << "SSRC: " << cast->media_ssrc
-      << ", ACK: " << cast->ack_frame_id
+      << "SSRC: " << cast->remote_ssrc << ", ACK: " << cast->ack_frame_id
       << ", NACK: " << nack_string_builder.GetString();
   DCHECK_LE(number_of_loss_fields, kRtcpMaxCastLossFields);
   *cast_loss_field_pos = static_cast<uint8_t>(number_of_loss_fields);
 }
 
 void RtcpBuilder::AddSR(const RtcpSenderInfo& sender_info) {
   AddRtcpHeader(kPacketTypeSenderReport, 0);
   writer_.WriteU32(ssrc_);
   writer_.WriteU32(sender_info.ntp_seconds);
   writer_.WriteU32(sender_info.ntp_fraction);
@@ skipping 174 matching lines @@
     receiver_log_message->push_front(frame_log);
   }
 
   VLOG(3) << "number of frames: " << number_of_frames;
   VLOG(3) << "total messages to send: " << *total_number_of_messages_to_send;
   return number_of_frames > 0;
 }
 
 }  // namespace cast
 }  // namespace media