Delete VP8 feedback mode.

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

 /*
  *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 206 matching lines @@
     ConfigureStream(kDefaultWidth / 2, kDefaultHeight / 2, kMaxBitrates[1],
                     kMinBitrates[1], kTargetBitrates[1],
                     &settings->simulcastStream[1], temporal_layer_profile[1]);
     ConfigureStream(kDefaultWidth, kDefaultHeight, kMaxBitrates[2],
                     kMinBitrates[2], kTargetBitrates[2],
                     &settings->simulcastStream[2], temporal_layer_profile[2]);
     settings->VP8()->resilience = kResilientStream;
     settings->VP8()->denoisingOn = true;
     settings->VP8()->errorConcealmentOn = false;
     settings->VP8()->automaticResizeOn = false;
-    settings->VP8()->feedbackModeOn = false;
     settings->VP8()->frameDroppingOn = true;
     settings->VP8()->keyFrameInterval = 3000;
   }
 
   static void ConfigureStream(int width,
                               int height,
                               int max_bitrate,
                               int min_bitrate,
                               int target_bitrate,
                               SimulcastStream* stream,
@@ skipping 327 matching lines @@
         new VideoFrame(input_buffer_, 0, 0, webrtc::kVideoRotation_0));
     EXPECT_EQ(0, encoder_->Encode(*input_frame_, NULL, &frame_types));
   }
 
   void TestSwitchingToOneStream() { SwitchingToOneStream(1024, 768); }
 
   void TestSwitchingToOneOddStream() { SwitchingToOneStream(1023, 769); }
 
   void TestSwitchingToOneSmallStream() { SwitchingToOneStream(4, 4); }
 
+  // TODO(nisse): Rename, refactor or delete test?

[sprang_webrtc, 2017/03/20 16:22:30]

I vote delete. The other parts should already be covered.

[nisse-webrtc, 2017/03/21 07:26:02]

Deleted.

   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);
   }
 
+  // TODO(nisse): Rename, refactor or delete test?

[sprang_webrtc, 2017/03/20 16:22:30]

Ditto

[nisse-webrtc, 2017/03/21 07:26:02]

Also deleted.

   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.
   void TestSaptioTemporalLayers333PatternEncoder() {
     Vp8TestEncodedImageCallback encoder_callback;
     encoder_->RegisterEncodeCompleteCallback(&encoder_callback);
     SetRates(kMaxBitrates[2], 30);  // To get all three streams.
 
@@ skipping 166 matching lines @@
   VideoCodec settings_;
   rtc::scoped_refptr<I420Buffer> input_buffer_;
   std::unique_ptr<VideoFrame> input_frame_;
   std::unique_ptr<SimulcastRateAllocator> rate_allocator_;
 };
 
 }  // namespace testing
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_UNITTEST_H_