Rename FrameGenerator -> UlpfecPacketGenerator. (pt. 6b)

webrtc/modules/rtp_rtcp/source/fec_receiver_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 10 matching lines @@
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 #include "webrtc/modules/rtp_rtcp/source/fec_test_helper.h"
 #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h"
 
 namespace webrtc {
 
 namespace {
 constexpr uint8_t kFecPayloadType = 96;
 }  // namespace
 
 using ::testing::_;

[danilchap, 2016/09/21 11:26:45]

move all using inside unnamed namespace

[brandtr, 2016/09/21 12:54:07]

Done.

 using ::testing::Args;
 using ::testing::ElementsAreArray;
 using ::testing::Return;
 
-using ::webrtc::test::fec::FrameGenerator;
 using Packet = ::webrtc::ForwardErrorCorrection::Packet;
 using ::webrtc::test::fec::RawRtpPacket;
+using ::webrtc::test::fec::UlpfecPacketGenerator;

[danilchap, 2016/09/21 11:26:45]

'::webrtc::' can be removed actually (that likely opposite to what I comment
before, but I reread guidance more carefully)

[brandtr, 2016/09/21 12:54:07]

Ok :)

Changing in Ulpfec/Flexfec unit tests as well.

 
 class ReceiverFecTest : public ::testing::Test {
  protected:
   ReceiverFecTest()
       : fec_(ForwardErrorCorrection::CreateUlpfec()),
         receiver_fec_(FecReceiver::Create(&rtp_data_callback_)) {}
 
   void EncodeFec(ForwardErrorCorrection::PacketList* media_packets,
                  std::list<ForwardErrorCorrection::Packet*>* fec_packets,
                  unsigned int num_fec_packets) {
@@ skipping 43 matching lines @@
   }
 
   void InjectGarbagePacketLength(size_t fec_garbage_offset);
   static void SurvivesMaliciousPacket(const uint8_t* data,
                                       size_t length,
                                       uint8_t ulpfec_payload_type);
 
   MockRtpData rtp_data_callback_;
   std::unique_ptr<ForwardErrorCorrection> fec_;
   std::unique_ptr<FecReceiver> receiver_fec_;
-  FrameGenerator generator_;
+  UlpfecPacketGenerator generator_;
 };
 
 TEST_F(ReceiverFecTest, TwoMediaOneFec) {
   const unsigned int kNumFecPackets = 1u;
   std::list<RawRtpPacket*> media_rtp_packets;
   ForwardErrorCorrection::PacketList media_packets;
   GenerateFrame(2, 0, &media_rtp_packets, &media_packets);
   std::list<ForwardErrorCorrection::Packet*> fec_packets;
   EncodeFec(&media_packets, &fec_packets, kNumFecPackets);
 
@@ skipping 395 matching lines @@
                              0x27,
                              0xc4,
                              0x2a,
                              0x21,
                              0x2a,
                              0x28};
   SurvivesMaliciousPacket(kPacket, sizeof(kPacket), 100);
 }
 
 }  // namespace webrtc