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

webrtc/common_types.h

Index: webrtc/common_types.h
diff --git a/webrtc/common_types.h b/webrtc/common_types.h
index a3c8b3f18849af8d6f896604ff5ee1e82d23ac87..aaa9f8810d5d1601614af63a19a807d9c524e962 100644
--- a/webrtc/common_types.h
+++ b/webrtc/common_types.h
@@ -19,6 +19,7 @@
 #include <vector>
 
 #include "webrtc/api/video/video_rotation.h"
+#include "webrtc/api/video/video_content_type.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/optional.h"
 #include "webrtc/typedefs.h"
@@ -717,6 +718,9 @@ struct RTPHeaderExtension {
   bool hasVideoRotation;
   VideoRotation videoRotation;
 
+  bool hasVideoContentType;
+  VideoContentTypeId videoContentType;

[sprang_webrtc, 2017/03/28 11:14:23]

Maybe an rtc::Optional<VideoContentTypeId> would be in place here?
If so, maybe even refactor the ones above.

[ilnik, 2017/03/28 14:47:02]

This CL is already too long. I'll leave it as todo for now.

+
   PlayoutDelay playout_delay = {-1, -1};
 };