Revert of Remove VCMQmRobustness.

webrtc/modules/rtp_rtcp/source/producer_fec_unittest.cc

 /*
  *  Copyright (c) 2012 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 60 matching lines @@
   protected_packets.push_back({15, 3, 41, 0});
   protected_packets.push_back({14, 1, 43, 0});
   protected_packets.push_back({19, 0, 48, 0});
   protected_packets.push_back({19, 0, 50, 0});
   protected_packets.push_back({14, 3, 51, 0});
   protected_packets.push_back({13, 8, 52, 0});
   protected_packets.push_back({19, 2, 53, 0});
   protected_packets.push_back({12, 3, 54, 0});
   protected_packets.push_back({21, 0, 55, 0});
   protected_packets.push_back({13, 3, 57, 1});
-  FecProtectionParams params = {117, 3, kFecMaskBursty};
+  FecProtectionParams params = {117, 0, 3, kFecMaskBursty};
   producer_->SetFecParameters(&params, 0);
   uint8_t packet[28] = {0};
   for (Packet p : protected_packets) {
     if (p.marker_bit) {
       packet[1] |= 0x80;
     } else {
       packet[1] &= ~0x80;
     }
     ByteWriter<uint16_t>::WriteBigEndian(&packet[2], p.seq_num);
     producer_->AddRtpPacketAndGenerateFec(packet, p.payload_size,
@@ skipping 12 matching lines @@
 }
 
 TEST_F(ProducerFecTest, OneFrameFec) {
   // The number of media packets (|kNumPackets|), number of frames (one for
   // this test), and the protection factor (|params->fec_rate|) are set to make
   // sure the conditions for generating FEC are satisfied. This means:
   // (1) protection factor is high enough so that actual overhead over 1 frame
   // of packets is within |kMaxExcessOverhead|, and (2) the total number of
   // media packets for 1 frame is at least |minimum_media_packets_fec_|.
   const int kNumPackets = 4;
-  FecProtectionParams params = {15, 3, kFecMaskRandom};
+  FecProtectionParams params = {15, false, 3};
   std::list<test::RawRtpPacket*> rtp_packets;
   generator_->NewFrame(kNumPackets);
   producer_->SetFecParameters(&params, 0);  // Expecting one FEC packet.
   uint32_t last_timestamp = 0;
   for (int i = 0; i < kNumPackets; ++i) {
     test::RawRtpPacket* rtp_packet = generator_->NextPacket(i, 10);
     rtp_packets.push_back(rtp_packet);
     EXPECT_EQ(0, producer_->AddRtpPacketAndGenerateFec(rtp_packet->data,
                                                        rtp_packet->length,
                                                        kRtpHeaderSize));
@@ skipping 20 matching lines @@
   // The number of media packets/frame (|kNumPackets|), the number of frames
   // (|kNumFrames|), and the protection factor (|params->fec_rate|) are set to
   // make sure the conditions for generating FEC are satisfied. This means:
   // (1) protection factor is high enough so that actual overhead over
   // |kNumFrames| is within |kMaxExcessOverhead|, and (2) the total number of
   // media packets for |kNumFrames| frames is at least
   // |minimum_media_packets_fec_|.
   const int kNumPackets = 2;
   const int kNumFrames = 2;
 
-  FecProtectionParams params = {15, 3, kFecMaskRandom};
+  FecProtectionParams params = {15, 0, 3};
   std::list<test::RawRtpPacket*> rtp_packets;
   producer_->SetFecParameters(&params, 0);  // Expecting one FEC packet.
   uint32_t last_timestamp = 0;
   for (int i = 0; i < kNumFrames; ++i) {
     generator_->NewFrame(kNumPackets);
     for (int j = 0; j < kNumPackets; ++j) {
       test::RawRtpPacket* rtp_packet =
           generator_->NextPacket(i * kNumPackets + j, 10);
       rtp_packets.push_back(rtp_packet);
       EXPECT_EQ(0, producer_->AddRtpPacketAndGenerateFec(rtp_packet->data,
@@ skipping 31 matching lines @@
                kRedPayloadType,
                packet->header.header.payloadType,
                red_packet.get(),
                true);  // Marker bit set.
   for (int i = 0; i < 10; ++i)
     EXPECT_EQ(i, red_packet->data()[kRtpHeaderSize + 1 + i]);
   delete packet;
 }
 
 }  // namespace webrtc