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

webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h

 /*
  *  Copyright (c) 2014 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 246 matching lines @@
     encoder_->RegisterEncodeCompleteCallback(&encoder_callback_);
     decoder_->RegisterDecodeCompleteCallback(&decoder_callback_);
     DefaultSettings(&settings_, temporal_layer_profile);
     SetUpRateAllocator();
     EXPECT_EQ(0, encoder_->InitEncode(&settings_, 1, 1200));
     EXPECT_EQ(0, decoder_->InitDecode(&settings_, 1));
     int half_width = (kDefaultWidth + 1) / 2;
     input_buffer_ = I420Buffer::Create(kDefaultWidth, kDefaultHeight,
                                        kDefaultWidth, half_width, half_width);
     input_buffer_->InitializeData();
-    input_frame_.reset(
-        new VideoFrame(input_buffer_, 0, 0, webrtc::kVideoRotation_0));
+    input_frame_.reset(new VideoFrame(input_buffer_, 0, 0,
+                                      webrtc::kVideoRotation_0,
+                                      webrtc::VideoContentType::kDefault));
   }
 
   void SetUpRateAllocator() {
     TemporalLayersFactory* tl_factory = new TemporalLayersFactory();
     rate_allocator_.reset(new SimulcastRateAllocator(
         settings_, std::unique_ptr<TemporalLayersFactory>(tl_factory)));
     settings_.VP8()->tl_factory = tl_factory;
   }
 
   void SetRates(uint32_t bitrate_kbps, uint32_t fps) {
@@ skipping 232 matching lines @@
       settings_.simulcastStream[i].maxBitrate = 0;
       settings_.simulcastStream[i].width = settings_.width;
       settings_.simulcastStream[i].height = settings_.height;
     }
     // Setting input image to new resolution.
     int half_width = (settings_.width + 1) / 2;
     input_buffer_ = I420Buffer::Create(settings_.width, settings_.height,
                                        settings_.width, half_width, half_width);
     input_buffer_->InitializeData();
 
-    input_frame_.reset(
-        new VideoFrame(input_buffer_, 0, 0, webrtc::kVideoRotation_0));
+    input_frame_.reset(new VideoFrame(input_buffer_, 0, 0,
+                                      webrtc::kVideoRotation_0,
+                                      webrtc::VideoContentType::kDefault));
 
     // The for loop above did not set the bitrate of the highest layer.
     settings_.simulcastStream[settings_.numberOfSimulcastStreams - 1]
         .maxBitrate = 0;
     // The highest layer has to correspond to the non-simulcast resolution.
     settings_.simulcastStream[settings_.numberOfSimulcastStreams - 1].width =
         settings_.width;
     settings_.simulcastStream[settings_.numberOfSimulcastStreams - 1].height =
         settings_.height;
     SetUpRateAllocator();
@@ skipping 20 matching lines @@
     settings_.startBitrate = kMinBitrates[0];
     SetUpRateAllocator();
     EXPECT_EQ(0, encoder_->InitEncode(&settings_, 1, 1200));
     SetRates(settings_.startBitrate, 30);
     ExpectStreams(kVideoFrameKey, 1);
     // Resize |input_frame_| to the new resolution.
     half_width = (settings_.width + 1) / 2;
     input_buffer_ = I420Buffer::Create(settings_.width, settings_.height,
                                        settings_.width, half_width, half_width);
     input_buffer_->InitializeData();
-    input_frame_.reset(
-        new VideoFrame(input_buffer_, 0, 0, webrtc::kVideoRotation_0));
+    input_frame_.reset(new VideoFrame(input_buffer_, 0, 0,
+                                      webrtc::kVideoRotation_0,
+                                      webrtc::VideoContentType::kDefault));
     EXPECT_EQ(0, encoder_->Encode(*input_frame_, NULL, &frame_types));
   }
 
   void TestSwitchingToOneStream() { SwitchingToOneStream(1024, 768); }
 
   void TestSwitchingToOneOddStream() { SwitchingToOneStream(1023, 769); }
 
   void TestSwitchingToOneSmallStream() { SwitchingToOneStream(4, 4); }
 
   // Test the layer pattern and sync flag for various spatial-temporal patterns.
@@ skipping 130 matching lines @@
     encoder_->RegisterEncodeCompleteCallback(&encoder_callback);
     decoder_->RegisterDecodeCompleteCallback(&decoder_callback);
 
     SetRates(kMaxBitrates[2], 30);  // To get all three streams.
     // Setting two (possibly) problematic use cases for stride:
     // 1. stride > width 2. stride_y != stride_uv/2
     int stride_y = kDefaultWidth + 20;
     int stride_uv = ((kDefaultWidth + 1) / 2) + 5;
     input_buffer_ = I420Buffer::Create(kDefaultWidth, kDefaultHeight, stride_y,
                                        stride_uv, stride_uv);
-    input_frame_.reset(
-        new VideoFrame(input_buffer_, 0, 0, webrtc::kVideoRotation_0));
+    input_frame_.reset(new VideoFrame(input_buffer_, 0, 0,
+                                      webrtc::kVideoRotation_0,
+                                      webrtc::VideoContentType::kDefault));
 
     // Set color.
     int plane_offset[kNumOfPlanes];
     plane_offset[kYPlane] = kColorY;
     plane_offset[kUPlane] = kColorU;
     plane_offset[kVPlane] = kColorV;
     CreateImage(input_buffer_, plane_offset);
 
     EXPECT_EQ(0, encoder_->Encode(*input_frame_, NULL, NULL));
 
@@ skipping 21 matching lines @@
   VideoCodec settings_;
   rtc::scoped_refptr<I420Buffer> input_buffer_;
   std::unique_ptr<VideoFrame> input_frame_;
   std::unique_ptr<SimulcastRateAllocator> rate_allocator_;
 };
 
 }  // namespace testing
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_UNITTEST_H_