Generalize FlexfecReceiveStream::Config. (CL1)

webrtc/call/flexfec_receive_stream_unittest.cc

 /*
  *  Copyright (c) 2016 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.
  */
 
 #include "webrtc/base/basictypes.h"
 #include "webrtc/call/flexfec_receive_stream.h"
 #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 #include "webrtc/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {
 
 TEST(FlexfecReceiveStreamTest, ConstructDestruct) {
   FlexfecReceiveStream::Config config;
-  config.flexfec_payload_type = 118;
-  config.flexfec_ssrc = 424223;
+  config.payload_type = 118;
+  config.remote_ssrc = 424223;
   config.protected_media_ssrcs = {912512};
   MockRecoveredPacketReceiver callback;
 
   internal::FlexfecReceiveStream receive_stream(config, &callback);
 }
 
 TEST(FlexfecReceiveStreamTest, StartStop) {
   FlexfecReceiveStream::Config config;
-  config.flexfec_payload_type = 118;
-  config.flexfec_ssrc = 1652392;
+  config.payload_type = 118;
+  config.remote_ssrc = 1652392;
   config.protected_media_ssrcs = {23300443};
   MockRecoveredPacketReceiver callback;
   internal::FlexfecReceiveStream receive_stream(config, &callback);
 
   receive_stream.Start();
   receive_stream.Stop();
 }
 
 TEST(FlexfecReceiveStreamTest, DoesNotProcessPacketWhenNoMediaSsrcGiven) {
   FlexfecReceiveStream::Config config;
-  config.flexfec_payload_type = 118;
-  config.flexfec_ssrc = 424223;
+  config.payload_type = 118;
+  config.remote_ssrc = 424223;
   config.protected_media_ssrcs = {};
   MockRecoveredPacketReceiver callback;
   internal::FlexfecReceiveStream receive_stream(config, &callback);
   const uint8_t packet[] = {0x00, 0x11, 0x22, 0x33};
   const size_t packet_length = sizeof(packet);
 
   EXPECT_FALSE(
       receive_stream.AddAndProcessReceivedPacket(packet, packet_length));
 }
 
@@ skipping 30 matching lines @@
       kMediaTs[0],     kMediaTs[1],     kMediaTs[2],        kMediaTs[3],
       kSsrcCount,      kReservedBits,   kReservedBits,      kReservedBits,
       kMediaSsrc[0],   kMediaSsrc[1],   kMediaSsrc[2],      kMediaSsrc[3],
       kMediaSeqNum[0], kMediaSeqNum[1], kFlexfecPktMask[0], kFlexfecPktMask[1],
       // FEC payload.
       kPayloadBits,    kPayloadBits,    kPayloadBits,       kPayloadBits};
   // clang-format on
   constexpr size_t kFlexfecPacketLength = sizeof(kFlexfecPacket);
 
   FlexfecReceiveStream::Config config;
-  config.flexfec_payload_type = kFlexfecPlType;
-  config.flexfec_ssrc = ByteReader<uint32_t>::ReadBigEndian(kFlexfecSsrc);
+  config.payload_type = kFlexfecPlType;
+  config.remote_ssrc = ByteReader<uint32_t>::ReadBigEndian(kFlexfecSsrc);
   config.protected_media_ssrcs = {
       ByteReader<uint32_t>::ReadBigEndian(kMediaSsrc)};
   testing::StrictMock<MockRecoveredPacketReceiver> recovered_packet_receiver;
   internal::FlexfecReceiveStream receive_stream(config,
                                                 &recovered_packet_receiver);
 
   // Do not call back before being started.
   receive_stream.AddAndProcessReceivedPacket(kFlexfecPacket,
                                              kFlexfecPacketLength);
 
   // Call back after being started.
   receive_stream.Start();
   EXPECT_CALL(
       recovered_packet_receiver,
       OnRecoveredPacket(::testing::_, kRtpHeaderSize + kPayloadLength[1]));
   receive_stream.AddAndProcessReceivedPacket(kFlexfecPacket,
                                              kFlexfecPacketLength);
 }
 
 }  // namespace webrtc