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

webrtc/test/frame_generator.cc

Index: webrtc/test/frame_generator.cc
diff --git a/webrtc/test/frame_generator.cc b/webrtc/test/frame_generator.cc
index e29364223977879867b5fde71a00def8636bac5e..32bccf6476ec92922cc0bd42f0606a84e08c50be 100644
--- a/webrtc/test/frame_generator.cc
+++ b/webrtc/test/frame_generator.cc
@@ -64,7 +64,8 @@ class SquareGenerator : public FrameGenerator {
     for (const auto& square : squares_)
       square->Draw(buffer);
 
-    frame_.reset(new VideoFrame(buffer, 0, 0, webrtc::kVideoRotation_0));
+    frame_.reset(new VideoFrame(buffer, 0, 0, webrtc::kVideoRotation_0,
+                                webrtc::VideoContentType::kDefault));
     return frame_.get();
   }
 
@@ -151,8 +152,9 @@ class YuvFileGenerator : public FrameGenerator {
     if (++current_display_count_ >= frame_display_count_)
       current_display_count_ = 0;
 
-    temp_frame_.reset(
-        new VideoFrame(last_read_buffer_, 0, 0, webrtc::kVideoRotation_0));
+    temp_frame_.reset(new VideoFrame(last_read_buffer_, 0, 0,
+                                     webrtc::kVideoRotation_0,
+                                     webrtc::VideoContentType::kDefault));
     return temp_frame_.get();
   }
 
@@ -267,12 +269,11 @@ class ScrollingImageFrameGenerator : public FrameGenerator {
         current_source_frame_->video_frame_buffer());
     current_frame_ = rtc::Optional<webrtc::VideoFrame>(webrtc::VideoFrame(
         new rtc::RefCountedObject<webrtc::WrappedI420Buffer>(
-            target_width_, target_height_,
-            &frame_buffer->DataY()[offset_y], frame_buffer->StrideY(),
-            &frame_buffer->DataU()[offset_u], frame_buffer->StrideU(),
-            &frame_buffer->DataV()[offset_v], frame_buffer->StrideV(),
-            KeepRefUntilDone(frame_buffer)),
-        kVideoRotation_0, 0));
+            target_width_, target_height_, &frame_buffer->DataY()[offset_y],
+            frame_buffer->StrideY(), &frame_buffer->DataU()[offset_u],
+            frame_buffer->StrideU(), &frame_buffer->DataV()[offset_v],
+            frame_buffer->StrideV(), KeepRefUntilDone(frame_buffer)),
+        kVideoRotation_0, webrtc::VideoContentType::kDefault, 0));
   }
 
   Clock* const clock_;