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

webrtc/test/frame_generator_capturer.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.
  */
 
@@ skipping 88 matching lines @@
 
 FrameGeneratorCapturer::~FrameGeneratorCapturer() {
   Stop();
 }
 
 void FrameGeneratorCapturer::SetFakeRotation(VideoRotation rotation) {
   rtc::CritScope cs(&lock_);
   fake_rotation_ = rotation;
 }
 
+void FrameGeneratorCapturer::SetFakeContentType(
+    VideoContentTypeId content_type) {
+  rtc::CritScope cs(&lock_);
+  fake_video_content_type_ = content_type;
+}
+
 bool FrameGeneratorCapturer::Init() {
   // This check is added because frame_generator_ might be file based and should
   // not crash because a file moved.
   if (frame_generator_.get() == NULL)
     return false;
 
   task_queue_.PostDelayedTask(
       std::unique_ptr<rtc::QueuedTask>(
           new InsertFrameTask(this, 1000 / target_fps_)),
       1000 / target_fps_);
 
   return true;
 }
 
 void FrameGeneratorCapturer::InsertFrame() {
   {
     rtc::CritScope cs(&lock_);
     if (sending_) {
       VideoFrame* frame = frame_generator_->NextFrame();
       frame->set_ntp_time_ms(clock_->CurrentNtpInMilliseconds());
       frame->set_rotation(fake_rotation_);
+      frame->set_content_type(fake_video_content_type_);
       if (first_frame_capture_time_ == -1) {
         first_frame_capture_time_ = frame->ntp_time_ms();
       }
       if (sink_)
         sink_->OnFrame(*frame);
     }
   }
 }
 
 void FrameGeneratorCapturer::Start() {
@@ skipping 36 matching lines @@
 
 void FrameGeneratorCapturer::ForceFrame() {
   // One-time non-repeating task,
   // therefore repeat_interval_ms is 0 in InsertFrameTask()
   task_queue_.PostTask(
       std::unique_ptr<rtc::QueuedTask>(new InsertFrameTask(this, 0)));
 }
 
 }  // namespace test
 }  // namespace webrtc