| Index: webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h
|
| diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h b/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h
|
| index 6c37202dc71b6ccb3db917e89c16af27407b4d05..9015cb2786dc48285d1ab0dff344f8b5c5d23984 100644
|
| --- a/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h
|
| +++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h
|
| @@ -264,8 +264,9 @@ class TestVp8Simulcast : public ::testing::Test {
|
| 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() {
|
| @@ -518,8 +519,9 @@ class TestVp8Simulcast : public ::testing::Test {
|
| 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]
|
| @@ -560,8 +562,9 @@ class TestVp8Simulcast : public ::testing::Test {
|
| 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));
|
| }
|
|
|
| @@ -712,8 +715,9 @@ class TestVp8Simulcast : public ::testing::Test {
|
| 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];
|
|
|