Reland of Add content type information to encoded images and corresponding rtp extension header

webrtc/modules/video_coding/frame_buffer.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 145 matching lines @@
   // 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
   // onto the last RTP packet in each group of packets which make up a key
   // frame (I-frame or IDR frame in H.264 (AVC), or an IRAP picture in H.265
   // (HEVC)).
   if (packet.markerBit) {
     RTC_DCHECK(!_rotation_set);
     rotation_ = packet.video_header.rotation;
     _rotation_set = true;
+    content_type_ = packet.video_header.content_type;
   }
 
   if (packet.is_first_packet_in_frame) {
     playout_delay_ = packet.video_header.playout_delay;
   }
 
   if (_sessionInfo.complete()) {
     SetState(kStateComplete);
     return kCompleteSession;
   } else if (_sessionInfo.decodable()) {
@@ skipping 98 matching lines @@
   size_t bytes_removed = _sessionInfo.MakeDecodable();
   _length -= bytes_removed;
   // Transfer frame information to EncodedFrame and create any codec
   // specific information.
   _frameType = _sessionInfo.FrameType();
   _completeFrame = _sessionInfo.complete();
   _missingFrame = !continuous;
 }
 
 }  // namespace webrtc