Implement FrameMarking header extension support

webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 333 matching lines @@
     if (flexfec_enabled())
       flexfec_sender_->SetFecParameters(fec_params);
     if (ulpfec_enabled())
       ulpfec_generator_.SetFecParameters(fec_params);
 
     fec_packet_overhead = CalculateFecPacketOverhead();
     red_enabled = this->red_enabled();
     retransmission_settings = retransmission_settings_;
   }
 
+  // Set Frame Marks.
+  FrameMarks frame_marks;
+  bool frame_marking_enabled = true;
+
+  // Common info
+  frame_marks.start_of_frame = true;
+  frame_marks.end_of_frame = false;
+  frame_marks.independent = (frame_type == kVideoFrameKey);
+
+  // Codec specific.
+  switch (video_type) {
+    case kRtpVideoH264:
+      // Nothing to add
+      frame_marks.discardable = false;
+      frame_marks.temporal_layer_id = kNoTemporalIdx;
+      frame_marks.layer_id = kNoSpatialIdx;
+      frame_marks.tl0_pic_idx = static_cast<uint8_t>(kNoTl0PicIdx);
+      break;
+    case kRtpVideoVp8:
+      frame_marks.discardable = video_header->codecHeader.VP8.nonReference;
+      frame_marks.base_layer_sync = video_header->codecHeader.VP8.layerSync;
+      frame_marks.temporal_layer_id = video_header->codecHeader.VP8.temporalIdx;
+      frame_marks.layer_id = kNoSpatialIdx;
+      frame_marks.tl0_pic_idx = video_header->codecHeader.VP8.tl0PicIdx;
+      break;
+    case kRtpVideoVp9:
+      frame_marks.discardable = false;
+      // Layer id format is codec dependant.
+      frame_marks.temporal_layer_id =
+          video_header->codecHeader.VP9.temporal_idx;
+      frame_marks.layer_id =
+          FrameMarking::CreateLayerId(video_header->codecHeader.VP9);
+      frame_marks.tl0_pic_idx = video_header->codecHeader.VP9.tl0_pic_idx;
+      break;
+    default:
+      // Do not use frame marking.
+      frame_marking_enabled = false;
+  }
+
+  // Only add frame marking for known codecs.
+  if (frame_marking_enabled)
+    // Add extension header for frame marking.
+    rtp_header->SetExtension<FrameMarking>(frame_marks);
+
   size_t packet_capacity = rtp_sender_->MaxRtpPacketSize() -
                            fec_packet_overhead -
                            (rtp_sender_->RtxStatus() ? kRtxHeaderSize : 0);
   RTC_DCHECK_LE(packet_capacity, rtp_header->capacity());
   RTC_DCHECK_GT(packet_capacity, rtp_header->headers_size());
   RTC_DCHECK_GT(packet_capacity, last_packet->headers_size());
   size_t max_data_payload_length = packet_capacity - rtp_header->headers_size();
   RTC_DCHECK_GE(last_packet->headers_size(), rtp_header->headers_size());
   size_t last_packet_reduction_len =
       last_packet->headers_size() - rtp_header->headers_size();
@@ skipping 10 matching lines @@
   const RTPFragmentationHeader* frag =
       (video_type == kRtpVideoVp8) ? nullptr : fragmentation;
   size_t num_packets =
       packetizer->SetPayloadData(payload_data, payload_size, frag);
 
   if (num_packets == 0)
     return false;
 
   bool first_frame = first_frame_sent_();
   for (size_t i = 0; i < num_packets; ++i) {
+    bool first = (i == 0);
     bool last = (i + 1) == num_packets;
     auto packet = last ? std::move(last_packet)
                        : rtc::MakeUnique<RtpPacketToSend>(*rtp_header);
     if (!packetizer->NextPacket(packet.get()))
       return false;
     RTC_DCHECK_LE(packet->payload_size(),
                   last ? max_data_payload_length - last_packet_reduction_len
                        : max_data_payload_length);
+
+    // Only add frame marking for known codecs.
+    if (frame_marking_enabled) {
+      // Update start and end marks.
+      frame_marks.start_of_frame = first;
+      frame_marks.end_of_frame = last;
+      // Update extension header for frame marking.
+      packet->SetExtension<FrameMarking>(frame_marks);
+    }
+
     if (!rtp_sender_->AssignSequenceNumber(packet.get()))
       return false;
 
     bool protect_packet = (packetizer->GetProtectionType() == kProtectedPacket);
     // Put packetization finish timestamp into extension.
     if (packet->HasExtension<VideoTimingExtension>()) {
       packet->set_packetization_finish_time_ms(clock_->TimeInMilliseconds());
       // TODO(ilnik): Due to webrtc:7859, packets with timing extensions are not
       // protected by FEC. It reduces FEC efficiency a bit. When FEC is moved
       // below the pacer, it can be re-enabled for these packets.
@@ skipping 45 matching lines @@
   rtc::CritScope cs(&crit_);
   return retransmission_settings_;
 }
 
 void RTPSenderVideo::SetSelectiveRetransmissions(uint8_t settings) {
   rtc::CritScope cs(&crit_);
   retransmission_settings_ = settings;
 }
 
 }  // namespace webrtc