Implement FrameMarking header extension support

webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc

Index: webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc
index 3f4c401a19d5c43ff9f64c6a9e3bd14d60ff9fb6..a9f68293f52d99c839c81ce42dd4cda73b45df39 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc
@@ -301,6 +301,59 @@ bool RTPSenderVideo::SendVideo(RtpVideoCodecTypes video_type,
   rtp_header->SetPayloadType(payload_type);
   rtp_header->SetTimestamp(rtp_timestamp);
   rtp_header->set_capture_time_ms(capture_time_ms);
+
+  // 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.spatial_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.spatial_layer_id = kNoSpatialIdx;
+      frame_marks.tl0_pic_idx = video_header->codecHeader.VP8.tl0PicIdx;
+      break;
+    case kRtpVideoVp9:
+      frame_marks.discardable = false;
+      frame_marks.temporal_layer_id =
+          video_header->codecHeader.VP9.temporal_idx;
+      frame_marks.spatial_layer_id = kNoSpatialIdx;
+      frame_marks.tl0_pic_idx = video_header->codecHeader.VP9.tl0_pic_idx;
+      // TODO(sergio.garcia.murillo@gmail.com): This will need to be changed to
+      // support VP9 SVC, but videoheader is set per-frame, not per packet,
+      // so we can't have access to this values.
+      // Also, small modifications to the extensions will be needed to not
+      // change size of the extension between sid:0 and sid:1
+      //    frame_marks.start_of_frame =
+      //        video_header->codecHeader.VP9.beginning_of_frame;
+      //    frame_marks.end_of_frame =
+      //    video_header->codecHeader.VP9.end_of_frame;
+      //    frame_marks.spatial_layer_id =
+      //    video_header->codecHeader.VP9.spatial_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);
+
   auto last_packet = rtc::MakeUnique<RtpPacketToSend>(*rtp_header);
 
   size_t fec_packet_overhead;
@@ -308,7 +361,7 @@ bool RTPSenderVideo::SendVideo(RtpVideoCodecTypes video_type,
   int32_t retransmission_settings;
   {
     rtc::CritScope cs(&crit_);
-    // According to
+    // According to;
     // http://www.etsi.org/deliver/etsi_ts/126100_126199/126114/12.07.00_60/
     // ts_126114v120700p.pdf Section 7.4.5:
     // The MTSI client shall add the payload bytes as defined in this clause
@@ -377,6 +430,7 @@ bool RTPSenderVideo::SendVideo(RtpVideoCodecTypes video_type,
 
   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);
@@ -385,6 +439,16 @@ bool RTPSenderVideo::SendVideo(RtpVideoCodecTypes video_type,
     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;