| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 
| 3  * | 3  * | 
| 4  *  Use of this source code is governed by a BSD-style license | 4  *  Use of this source code is governed by a BSD-style license | 
| 5  *  that can be found in the LICENSE file in the root of the source | 5  *  that can be found in the LICENSE file in the root of the source | 
| 6  *  tree. An additional intellectual property rights grant can be found | 6  *  tree. An additional intellectual property rights grant can be found | 
| 7  *  in the file PATENTS.  All contributing project authors may | 7  *  in the file PATENTS.  All contributing project authors may | 
| 8  *  be found in the AUTHORS file in the root of the source tree. | 8  *  be found in the AUTHORS file in the root of the source tree. | 
| 9  */ | 9  */ | 
| 10 | 10 | 
| 11 #include <memory> | 11 #include <memory> | 
| 12 #include <vector> | 12 #include <vector> | 
| 13 | 13 | 
| 14 #include "webrtc/api/video/i420_buffer.h" | 14 #include "webrtc/api/video/i420_buffer.h" | 
| 15 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" | 15 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" | 
| 16 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h" | 16 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h" | 
|  | 17 #include "webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h" | 
| 17 #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" | 18 #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" | 
| 18 #include "webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h" | 19 #include "webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h" | 
| 19 #include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h" | 20 #include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h" | 
| 20 #include "webrtc/modules/video_coding/include/video_coding.h" | 21 #include "webrtc/modules/video_coding/include/video_coding.h" | 
| 21 #include "webrtc/modules/video_coding/test/test_util.h" | 22 #include "webrtc/modules/video_coding/test/test_util.h" | 
| 22 #include "webrtc/modules/video_coding/video_coding_impl.h" | 23 #include "webrtc/modules/video_coding/video_coding_impl.h" | 
| 23 #include "webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h" | 24 #include "webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h" | 
| 24 #include "webrtc/modules/video_coding/utility/simulcast_rate_allocator.h" |  | 
| 25 #include "webrtc/system_wrappers/include/clock.h" | 25 #include "webrtc/system_wrappers/include/clock.h" | 
| 26 #include "webrtc/test/frame_generator.h" | 26 #include "webrtc/test/frame_generator.h" | 
| 27 #include "webrtc/test/gtest.h" | 27 #include "webrtc/test/gtest.h" | 
| 28 #include "webrtc/test/testsupport/fileutils.h" | 28 #include "webrtc/test/testsupport/fileutils.h" | 
| 29 | 29 | 
| 30 using ::testing::_; | 30 using ::testing::_; | 
| 31 using ::testing::AllOf; | 31 using ::testing::AllOf; | 
| 32 using ::testing::ElementsAre; | 32 using ::testing::ElementsAre; | 
| 33 using ::testing::ElementsAreArray; | 33 using ::testing::ElementsAreArray; | 
| 34 using ::testing::Field; | 34 using ::testing::Field; | 
| (...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 529   } | 529   } | 
| 530   { | 530   { | 
| 531     // TODO(andresp): Find out why this fails with framerate = 7.5 | 531     // TODO(andresp): Find out why this fails with framerate = 7.5 | 
| 532     Vp8StreamInfo expected = {{7.0, 7.0, 7.0}, {high_b, high_b, high_b}}; | 532     Vp8StreamInfo expected = {{7.0, 7.0, 7.0}, {high_b, high_b, high_b}}; | 
| 533     EXPECT_THAT(SimulateWithFramerate(7.0), MatchesVp8StreamInfo(expected)); | 533     EXPECT_THAT(SimulateWithFramerate(7.0), MatchesVp8StreamInfo(expected)); | 
| 534   } | 534   } | 
| 535 } | 535 } | 
| 536 }  // namespace | 536 }  // namespace | 
| 537 }  // namespace vcm | 537 }  // namespace vcm | 
| 538 }  // namespace webrtc | 538 }  // namespace webrtc | 
| OLD | NEW | 
|---|