Generalize FlexfecReceiveStream::Config. (CL1)

webrtc/call/call_unittest.cc

 /*
  *  Copyright (c) 2015 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 205 matching lines @@
 
   EXPECT_CALL(*recv_channel_proxy, DisassociateSendChannel()).Times(1);
   call->DestroyAudioReceiveStream(recv_stream);
 
   call->DestroyAudioSendStream(send_stream);
 }
 
 TEST(CallTest, CreateDestroy_FlexfecReceiveStream) {
   CallHelper call;
   FlexfecReceiveStream::Config config;
-  config.flexfec_payload_type = 118;
-  config.flexfec_ssrc = 38837212;
+  config.payload_type = 118;
+  config.remote_ssrc = 38837212;
   config.protected_media_ssrcs = {27273};
 
   FlexfecReceiveStream* stream = call->CreateFlexfecReceiveStream(config);
   EXPECT_NE(stream, nullptr);
   call->DestroyFlexfecReceiveStream(stream);
 }
 
 TEST(CallTest, CreateDestroy_FlexfecReceiveStreams) {
   CallHelper call;
   FlexfecReceiveStream::Config config;
-  config.flexfec_payload_type = 118;
+  config.payload_type = 118;
   std::list<FlexfecReceiveStream*> streams;
 
   for (int i = 0; i < 2; ++i) {
     for (uint32_t ssrc = 0; ssrc < 1234567; ssrc += 34567) {
-      config.flexfec_ssrc = ssrc;
+      config.remote_ssrc = ssrc;
       config.protected_media_ssrcs = {ssrc + 1};
       FlexfecReceiveStream* stream = call->CreateFlexfecReceiveStream(config);
       EXPECT_NE(stream, nullptr);
       if (ssrc & 1) {
         streams.push_back(stream);
       } else {
         streams.push_front(stream);
       }
     }
     for (auto s : streams) {
       call->DestroyFlexfecReceiveStream(s);
     }
     streams.clear();
   }
 }
 
 TEST(CallTest, MultipleFlexfecReceiveStreamsProtectingSingleVideoStream) {
   CallHelper call;
   FlexfecReceiveStream::Config config;
-  config.flexfec_payload_type = 118;
+  config.payload_type = 118;
   config.protected_media_ssrcs = {1324234};
   FlexfecReceiveStream* stream;
   std::list<FlexfecReceiveStream*> streams;
 
-  config.flexfec_ssrc = 838383;
+  config.remote_ssrc = 838383;
   stream = call->CreateFlexfecReceiveStream(config);
   EXPECT_NE(stream, nullptr);
   streams.push_back(stream);
 
-  config.flexfec_ssrc = 424993;
+  config.remote_ssrc = 424993;
   stream = call->CreateFlexfecReceiveStream(config);
   EXPECT_NE(stream, nullptr);
   streams.push_back(stream);
 
-  config.flexfec_ssrc = 99383;
+  config.remote_ssrc = 99383;
   stream = call->CreateFlexfecReceiveStream(config);
   EXPECT_NE(stream, nullptr);
   streams.push_back(stream);
 
-  config.flexfec_ssrc = 5548;
+  config.remote_ssrc = 5548;
   stream = call->CreateFlexfecReceiveStream(config);
   EXPECT_NE(stream, nullptr);
   streams.push_back(stream);
 
   for (auto s : streams) {
     call->DestroyFlexfecReceiveStream(s);
   }
 }
 
 }  // namespace webrtc