| Index: webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc
|
| diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc
|
| index 2b1035fca1cc42ba35c2da43fb8f49f9a1d1bc93..83e633eb2953101817feb015f42a70e689ccf219 100644
|
| --- a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc
|
| +++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc
|
| @@ -80,10 +80,6 @@ TEST_F(TestSimulcastEncoderAdapter, TestSwitchingToOneOddStream) {
|
| TestVp8Simulcast::TestSwitchingToOneOddStream();
|
| }
|
|
|
| -TEST_F(TestSimulcastEncoderAdapter, TestRPSIEncodeDecode) {
|
| - TestVp8Simulcast::TestRPSIEncodeDecode();
|
| -}
|
| -
|
| TEST_F(TestSimulcastEncoderAdapter, TestStrideEncodeDecode) {
|
| TestVp8Simulcast::TestStrideEncodeDecode();
|
| }
|
| @@ -96,10 +92,6 @@ TEST_F(TestSimulcastEncoderAdapter, TestSpatioTemporalLayers321PatternEncoder) {
|
| TestVp8Simulcast::TestSpatioTemporalLayers321PatternEncoder();
|
| }
|
|
|
| -TEST_F(TestSimulcastEncoderAdapter, DISABLED_TestRPSIEncoder) {
|
| - TestVp8Simulcast::TestRPSIEncoder();
|
| -}
|
| -
|
| class MockVideoEncoder : public VideoEncoder {
|
| public:
|
| // TODO(nisse): Valid overrides commented out, because the gmock
|
| @@ -301,7 +293,6 @@ class TestSimulcastEncoderAdapterFake : public ::testing::Test,
|
| EXPECT_EQ(ref.maxFramerate, target.maxFramerate);
|
| EXPECT_EQ(ref.VP8().pictureLossIndicationOn,
|
| target.VP8().pictureLossIndicationOn);
|
| - EXPECT_EQ(ref.VP8().feedbackModeOn, target.VP8().feedbackModeOn);
|
| EXPECT_EQ(ref.VP8().complexity, target.VP8().complexity);
|
| EXPECT_EQ(ref.VP8().resilience, target.VP8().resilience);
|
| EXPECT_EQ(ref.VP8().numberOfTemporalLayers,
|
|
|