OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2014 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 |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 } | 73 } |
74 | 74 |
75 TEST_F(TestSimulcastEncoderAdapter, TestSwitchingToOneStream) { | 75 TEST_F(TestSimulcastEncoderAdapter, TestSwitchingToOneStream) { |
76 TestVp8Simulcast::TestSwitchingToOneStream(); | 76 TestVp8Simulcast::TestSwitchingToOneStream(); |
77 } | 77 } |
78 | 78 |
79 TEST_F(TestSimulcastEncoderAdapter, TestSwitchingToOneOddStream) { | 79 TEST_F(TestSimulcastEncoderAdapter, TestSwitchingToOneOddStream) { |
80 TestVp8Simulcast::TestSwitchingToOneOddStream(); | 80 TestVp8Simulcast::TestSwitchingToOneOddStream(); |
81 } | 81 } |
82 | 82 |
83 TEST_F(TestSimulcastEncoderAdapter, TestRPSIEncodeDecode) { | |
84 TestVp8Simulcast::TestRPSIEncodeDecode(); | |
85 } | |
86 | |
87 TEST_F(TestSimulcastEncoderAdapter, TestStrideEncodeDecode) { | 83 TEST_F(TestSimulcastEncoderAdapter, TestStrideEncodeDecode) { |
88 TestVp8Simulcast::TestStrideEncodeDecode(); | 84 TestVp8Simulcast::TestStrideEncodeDecode(); |
89 } | 85 } |
90 | 86 |
91 TEST_F(TestSimulcastEncoderAdapter, TestSaptioTemporalLayers333PatternEncoder) { | 87 TEST_F(TestSimulcastEncoderAdapter, TestSaptioTemporalLayers333PatternEncoder) { |
92 TestVp8Simulcast::TestSaptioTemporalLayers333PatternEncoder(); | 88 TestVp8Simulcast::TestSaptioTemporalLayers333PatternEncoder(); |
93 } | 89 } |
94 | 90 |
95 TEST_F(TestSimulcastEncoderAdapter, TestSpatioTemporalLayers321PatternEncoder) { | 91 TEST_F(TestSimulcastEncoderAdapter, TestSpatioTemporalLayers321PatternEncoder) { |
96 TestVp8Simulcast::TestSpatioTemporalLayers321PatternEncoder(); | 92 TestVp8Simulcast::TestSpatioTemporalLayers321PatternEncoder(); |
97 } | 93 } |
98 | 94 |
99 TEST_F(TestSimulcastEncoderAdapter, DISABLED_TestRPSIEncoder) { | |
100 TestVp8Simulcast::TestRPSIEncoder(); | |
101 } | |
102 | |
103 class MockVideoEncoder : public VideoEncoder { | 95 class MockVideoEncoder : public VideoEncoder { |
104 public: | 96 public: |
105 // TODO(nisse): Valid overrides commented out, because the gmock | 97 // TODO(nisse): Valid overrides commented out, because the gmock |
106 // methods don't use any override declarations, and we want to avoid | 98 // methods don't use any override declarations, and we want to avoid |
107 // warnings from -Winconsistent-missing-override. See | 99 // warnings from -Winconsistent-missing-override. See |
108 // http://crbug.com/428099. | 100 // http://crbug.com/428099. |
109 int32_t InitEncode(const VideoCodec* codecSettings, | 101 int32_t InitEncode(const VideoCodec* codecSettings, |
110 int32_t numberOfCores, | 102 int32_t numberOfCores, |
111 size_t maxPayloadSize) /* override */ { | 103 size_t maxPayloadSize) /* override */ { |
112 codec_ = *codecSettings; | 104 codec_ = *codecSettings; |
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
294 EXPECT_EQ(0, strcmp(ref.plName, target.plName)); | 286 EXPECT_EQ(0, strcmp(ref.plName, target.plName)); |
295 EXPECT_EQ(ref.plType, target.plType); | 287 EXPECT_EQ(ref.plType, target.plType); |
296 EXPECT_EQ(ref.width, target.width); | 288 EXPECT_EQ(ref.width, target.width); |
297 EXPECT_EQ(ref.height, target.height); | 289 EXPECT_EQ(ref.height, target.height); |
298 EXPECT_EQ(ref.startBitrate, target.startBitrate); | 290 EXPECT_EQ(ref.startBitrate, target.startBitrate); |
299 EXPECT_EQ(ref.maxBitrate, target.maxBitrate); | 291 EXPECT_EQ(ref.maxBitrate, target.maxBitrate); |
300 EXPECT_EQ(ref.minBitrate, target.minBitrate); | 292 EXPECT_EQ(ref.minBitrate, target.minBitrate); |
301 EXPECT_EQ(ref.maxFramerate, target.maxFramerate); | 293 EXPECT_EQ(ref.maxFramerate, target.maxFramerate); |
302 EXPECT_EQ(ref.VP8().pictureLossIndicationOn, | 294 EXPECT_EQ(ref.VP8().pictureLossIndicationOn, |
303 target.VP8().pictureLossIndicationOn); | 295 target.VP8().pictureLossIndicationOn); |
304 EXPECT_EQ(ref.VP8().feedbackModeOn, target.VP8().feedbackModeOn); | |
305 EXPECT_EQ(ref.VP8().complexity, target.VP8().complexity); | 296 EXPECT_EQ(ref.VP8().complexity, target.VP8().complexity); |
306 EXPECT_EQ(ref.VP8().resilience, target.VP8().resilience); | 297 EXPECT_EQ(ref.VP8().resilience, target.VP8().resilience); |
307 EXPECT_EQ(ref.VP8().numberOfTemporalLayers, | 298 EXPECT_EQ(ref.VP8().numberOfTemporalLayers, |
308 target.VP8().numberOfTemporalLayers); | 299 target.VP8().numberOfTemporalLayers); |
309 EXPECT_EQ(ref.VP8().denoisingOn, target.VP8().denoisingOn); | 300 EXPECT_EQ(ref.VP8().denoisingOn, target.VP8().denoisingOn); |
310 EXPECT_EQ(ref.VP8().errorConcealmentOn, target.VP8().errorConcealmentOn); | 301 EXPECT_EQ(ref.VP8().errorConcealmentOn, target.VP8().errorConcealmentOn); |
311 EXPECT_EQ(ref.VP8().automaticResizeOn, target.VP8().automaticResizeOn); | 302 EXPECT_EQ(ref.VP8().automaticResizeOn, target.VP8().automaticResizeOn); |
312 EXPECT_EQ(ref.VP8().frameDroppingOn, target.VP8().frameDroppingOn); | 303 EXPECT_EQ(ref.VP8().frameDroppingOn, target.VP8().frameDroppingOn); |
313 EXPECT_EQ(ref.VP8().keyFrameInterval, target.VP8().keyFrameInterval); | 304 EXPECT_EQ(ref.VP8().keyFrameInterval, target.VP8().keyFrameInterval); |
314 EXPECT_EQ(ref.qpMax, target.qpMax); | 305 EXPECT_EQ(ref.qpMax, target.qpMax); |
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
570 codec_.numberOfSimulcastStreams = 3; | 561 codec_.numberOfSimulcastStreams = 3; |
571 helper_->factory()->set_init_encode_return_value( | 562 helper_->factory()->set_init_encode_return_value( |
572 WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE); | 563 WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE); |
573 EXPECT_EQ(WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE, | 564 EXPECT_EQ(WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE, |
574 adapter_->InitEncode(&codec_, 1, 1200)); | 565 adapter_->InitEncode(&codec_, 1, 1200)); |
575 EXPECT_TRUE(helper_->factory()->encoders().empty()); | 566 EXPECT_TRUE(helper_->factory()->encoders().empty()); |
576 } | 567 } |
577 | 568 |
578 } // namespace testing | 569 } // namespace testing |
579 } // namespace webrtc | 570 } // namespace webrtc |
OLD | NEW |