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

webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc

Index: webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc
diff --git a/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc b/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc
index 84bfafb8b08b10cbbd719a57dedc7e8839bea169..541d826cb3451de66af405c4934ab2f946973639 100644
--- a/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc
+++ b/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc
@@ -367,6 +367,10 @@ int32_t H264EncoderImpl::Encode(const VideoFrame& input_frame,
   encoded_image_.ntp_time_ms_ = input_frame.ntp_time_ms();
   encoded_image_.capture_time_ms_ = input_frame.render_time_ms();
   encoded_image_.rotation_ = input_frame.rotation();
+  if (mode_ == kScreensharing)

[tommi, 2017/04/10 10:59:18]

nit (2 lines, one assignment instead of 4 lines, two assignments):
encoded_image_.content_type_ = (mode_ == kScreensharing) ?
    VideoContentType::kScreenshare : VideoContentType::kUnspecified;

You could do the same elsewhere where the same check is being done.

[ilnik, 2017/04/10 12:47:42]

Done.

+    encoded_image_.content_type_ = VideoContentType::kScreenshare;
+  else
+    encoded_image_.content_type_ = VideoContentType::kUnspecified;
   encoded_image_._frameType = ConvertToVideoFrameType(info.eFrameType);
 
   // Split encoded image up into fragments. This also updates |encoded_image_|.