Delete VP8 feedback mode.

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

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 d8e247e26a7563163e0e257d86055015f7035d9d..6c37202dc71b6ccb3db917e89c16af27407b4d05 100644
--- a/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h
+++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h
@@ -224,7 +224,6 @@ class TestVp8Simulcast : public ::testing::Test {
     settings->VP8()->denoisingOn = true;
     settings->VP8()->errorConcealmentOn = false;
     settings->VP8()->automaticResizeOn = false;
-    settings->VP8()->feedbackModeOn = false;
     settings->VP8()->frameDroppingOn = true;
     settings->VP8()->keyFrameInterval = 3000;
   }
@@ -572,147 +571,6 @@ class TestVp8Simulcast : public ::testing::Test {
 
   void TestSwitchingToOneSmallStream() { SwitchingToOneStream(4, 4); }
 
-  void TestRPSIEncoder() {
-    Vp8TestEncodedImageCallback encoder_callback;
-    encoder_->RegisterEncodeCompleteCallback(&encoder_callback);
-
-    SetRates(kMaxBitrates[2], 30);  // To get all three streams.
-
-    EXPECT_EQ(0, encoder_->Encode(*input_frame_, NULL, NULL));
-    int picture_id = -1;
-    int temporal_layer = -1;
-    bool layer_sync = false;
-    encoder_callback.GetLastEncodedFrameInfo(&picture_id, &temporal_layer,
-                                             &layer_sync, 0);
-    EXPECT_EQ(0, temporal_layer);
-    EXPECT_TRUE(layer_sync);
-    int key_frame_picture_id = picture_id;
-
-    input_frame_->set_timestamp(input_frame_->timestamp() + 3000);
-    EXPECT_EQ(0, encoder_->Encode(*input_frame_, NULL, NULL));
-    encoder_callback.GetLastEncodedFrameInfo(&picture_id, &temporal_layer,
-                                             &layer_sync, 0);
-    EXPECT_EQ(2, temporal_layer);
-    EXPECT_TRUE(layer_sync);
-
-    input_frame_->set_timestamp(input_frame_->timestamp() + 3000);
-    EXPECT_EQ(0, encoder_->Encode(*input_frame_, NULL, NULL));
-    encoder_callback.GetLastEncodedFrameInfo(&picture_id, &temporal_layer,
-                                             &layer_sync, 0);
-    EXPECT_EQ(1, temporal_layer);
-    EXPECT_TRUE(layer_sync);
-
-    input_frame_->set_timestamp(input_frame_->timestamp() + 3000);
-    EXPECT_EQ(0, encoder_->Encode(*input_frame_, NULL, NULL));
-    encoder_callback.GetLastEncodedFrameInfo(&picture_id, &temporal_layer,
-                                             &layer_sync, 0);
-    EXPECT_EQ(2, temporal_layer);
-    EXPECT_FALSE(layer_sync);
-
-    CodecSpecificInfo codec_specific;
-    codec_specific.codecType = kVideoCodecVP8;
-    codec_specific.codecSpecific.VP8.hasReceivedRPSI = true;
-
-    // Must match last key frame to trigger.
-    codec_specific.codecSpecific.VP8.pictureIdRPSI = key_frame_picture_id;
-
-    input_frame_->set_timestamp(input_frame_->timestamp() + 3000);
-    EXPECT_EQ(0, encoder_->Encode(*input_frame_, &codec_specific, NULL));
-    encoder_callback.GetLastEncodedFrameInfo(&picture_id, &temporal_layer,
-                                             &layer_sync, 0);
-
-    EXPECT_EQ(0, temporal_layer);
-    EXPECT_TRUE(layer_sync);
-
-    // Must match last key frame to trigger, test bad id.
-    codec_specific.codecSpecific.VP8.pictureIdRPSI = key_frame_picture_id + 17;
-
-    input_frame_->set_timestamp(input_frame_->timestamp() + 3000);
-    EXPECT_EQ(0, encoder_->Encode(*input_frame_, &codec_specific, NULL));
-    encoder_callback.GetLastEncodedFrameInfo(&picture_id, &temporal_layer,
-                                             &layer_sync, 0);
-
-    EXPECT_EQ(2, temporal_layer);
-    // The previous frame was a base layer sync (since it was a frame that
-    // only predicts from key frame and hence resets the temporal pattern),
-    // so this frame (the next one) must have |layer_sync| set to true.
-    EXPECT_TRUE(layer_sync);
-  }
-
-  void TestRPSIEncodeDecode() {
-    Vp8TestEncodedImageCallback encoder_callback;
-    Vp8TestDecodedImageCallback decoder_callback;
-    encoder_->RegisterEncodeCompleteCallback(&encoder_callback);
-    decoder_->RegisterDecodeCompleteCallback(&decoder_callback);
-
-    SetRates(kMaxBitrates[2], 30);  // To get all three streams.
-
-    // 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));
-    int picture_id = -1;
-    int temporal_layer = -1;
-    bool layer_sync = false;
-    encoder_callback.GetLastEncodedFrameInfo(&picture_id, &temporal_layer,
-                                             &layer_sync, 0);
-    EXPECT_EQ(0, temporal_layer);
-    EXPECT_TRUE(layer_sync);
-    int key_frame_picture_id = picture_id;
-
-    // Change color.
-    plane_offset[kYPlane] += 1;
-    plane_offset[kUPlane] += 1;
-    plane_offset[kVPlane] += 1;
-    CreateImage(input_buffer_, plane_offset);
-    input_frame_->set_timestamp(input_frame_->timestamp() + 3000);
-    EXPECT_EQ(0, encoder_->Encode(*input_frame_, NULL, NULL));
-
-    // Change color.
-    plane_offset[kYPlane] += 1;
-    plane_offset[kUPlane] += 1;
-    plane_offset[kVPlane] += 1;
-    CreateImage(input_buffer_, plane_offset);
-
-    input_frame_->set_timestamp(input_frame_->timestamp() + 3000);
-    EXPECT_EQ(0, encoder_->Encode(*input_frame_, NULL, NULL));
-
-    // Change color.
-    plane_offset[kYPlane] += 1;
-    plane_offset[kUPlane] += 1;
-    plane_offset[kVPlane] += 1;
-    CreateImage(input_buffer_, plane_offset);
-
-    input_frame_->set_timestamp(input_frame_->timestamp() + 3000);
-    EXPECT_EQ(0, encoder_->Encode(*input_frame_, NULL, NULL));
-
-    CodecSpecificInfo codec_specific;
-    codec_specific.codecType = kVideoCodecVP8;
-    codec_specific.codecSpecific.VP8.hasReceivedRPSI = true;
-    // Must match last key frame to trigger.
-    codec_specific.codecSpecific.VP8.pictureIdRPSI = key_frame_picture_id;
-
-    // Change color back to original.
-    plane_offset[kYPlane] = kColorY;
-    plane_offset[kUPlane] = kColorU;
-    plane_offset[kVPlane] = kColorV;
-    CreateImage(input_buffer_, plane_offset);
-
-    input_frame_->set_timestamp(input_frame_->timestamp() + 3000);
-    EXPECT_EQ(0, encoder_->Encode(*input_frame_, &codec_specific, NULL));
-
-    EncodedImage encoded_frame;
-    encoder_callback.GetLastEncodedKeyFrame(&encoded_frame);
-    decoder_->Decode(encoded_frame, false, NULL);
-    encoder_callback.GetLastEncodedFrame(&encoded_frame);
-    decoder_->Decode(encoded_frame, false, NULL);
-    EXPECT_EQ(2, decoder_callback.DecodedFrames());
-  }
-
   // Test the layer pattern and sync flag for various spatial-temporal patterns.
   // 3-3-3 pattern: 3 temporal layers for all spatial streams, so same
   // temporal_layer id and layer_sync is expected for all streams.