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

webrtc/test/frame_generator.cc

 /*
  *  Copyright (c) 2013 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.
  */
 #include "webrtc/test/frame_generator.h"
@@ skipping 46 matching lines @@
     // Ensure stride == width.
     rtc::scoped_refptr<I420Buffer> buffer(
         I420Buffer::Create(width_, height_, width_, half_width_, half_width_));
     memset(buffer->MutableDataY(), 127, y_size_);
     memset(buffer->MutableDataU(), 127, uv_size_);
     memset(buffer->MutableDataV(), 127, uv_size_);
 
     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();
   }
 
  private:
   class Square {
    public:
     Square(int width, int height, int seed)
         : random_generator_(seed),
           x_(random_generator_.Rand(0, width)),
           y_(random_generator_.Rand(0, height)),
@@ skipping 66 matching lines @@
     for (FILE* file : files_)
       fclose(file);
   }
 
   VideoFrame* NextFrame() override {
     if (current_display_count_ == 0)
       ReadNextFrame();
     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();
   }
 
   void ReadNextFrame() {
     last_read_buffer_ =
         test::ReadI420Buffer(static_cast<int>(width_),
                              static_cast<int>(height_),
                              files_[file_index_]);
     if (!last_read_buffer_) {
       // No more frames to read in this file, rewind and move to next file.
@@ skipping 94 matching lines @@
                     (pixels_scrolled_y / 2)) +
                    (pixels_scrolled_x / 2);
     int offset_v = (current_source_frame_->video_frame_buffer()->StrideV() *
                     (pixels_scrolled_y / 2)) +
                    (pixels_scrolled_x / 2);
 
     rtc::scoped_refptr<VideoFrameBuffer> frame_buffer(
         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_;
   const int64_t start_time_;
   const int64_t scroll_time_;
   const int64_t pause_time_;
   const size_t num_frames_;
   const int target_width_;
   const int target_height_;
 
@@ skipping 79 matching lines @@
     files.push_back(file);
   }
 
   return std::unique_ptr<FrameGenerator>(new ScrollingImageFrameGenerator(
       clock, files, source_width, source_height, target_width, target_height,
       scroll_time_ms, pause_time_ms));
 }
 
 }  // namespace test
 }  // namespace webrtc