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

webrtc/video/vie_encoder.h

Index: webrtc/video/vie_encoder.h
diff --git a/webrtc/video/vie_encoder.h b/webrtc/video/vie_encoder.h
index c0b80baadd6e948c918b8f75fb704b5b77b4e2b4..820f26fbc4f093311078f6a4f052749c2a700363 100644
--- a/webrtc/video/vie_encoder.h
+++ b/webrtc/video/vie_encoder.h
@@ -16,6 +16,7 @@
 #include <vector>
 
 #include "webrtc/api/video/video_rotation.h"
+#include "webrtc/api/video/video_content_type.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/event.h"
 #include "webrtc/base/sequenced_task_checker.h"
@@ -68,7 +69,8 @@ class ViEEncoder : public rtc::VideoSinkInterface<VideoFrame>,
              SendStatisticsProxy* stats_proxy,
              const VideoSendStream::Config::EncoderSettings& settings,
              rtc::VideoSinkInterface<VideoFrame>* pre_encode_callback,
-             EncodedFrameObserver* encoder_timing);
+             EncodedFrameObserver* encoder_timing,
+             VideoEncoderConfig::ContentType content_type);
   ~ViEEncoder();
   // RegisterProcessThread register |module_process_thread| with those objects
   // that use it. Registration has to happen on the thread where
@@ -133,14 +135,17 @@ class ViEEncoder : public rtc::VideoSinkInterface<VideoFrame>,
     VideoFrameInfo(int width,
                    int height,
                    VideoRotation rotation,
+                   VideoContentTypeId content_type,
                    bool is_texture)
         : width(width),
           height(height),
           rotation(rotation),
+          content_type_(content_type),
           is_texture(is_texture) {}
     int width;
     int height;
     VideoRotation rotation;
+    VideoContentTypeId content_type_;
     bool is_texture;
     int pixel_count() const { return width * height; }
   };
@@ -184,6 +189,7 @@ class ViEEncoder : public rtc::VideoSinkInterface<VideoFrame>,
   EncoderSink* sink_;
   const VideoSendStream::Config::EncoderSettings settings_;
   const VideoCodecType codec_type_;
+  const VideoEncoderConfig::ContentType content_type_;
 
   vcm::VideoSender video_sender_ ACCESS_ON(&encoder_queue_);
   OveruseFrameDetector overuse_detector_ ACCESS_ON(&encoder_queue_);