Only generate one CNAME per PeerConnection.

webrtc/pc/mediasession.h

 /*
  *  Copyright 2004 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 58 matching lines @@
 
 extern const char kMediaProtocolSctp[];
 extern const char kMediaProtocolDtlsSctp[];
 extern const char kMediaProtocolUdpDtlsSctp[];
 extern const char kMediaProtocolTcpDtlsSctp[];
 
 // Options to control how session descriptions are generated.
 const int kAutoBandwidth = -1;
 const int kBufferedModeDisabled = 0;
 
+// Default CNAME for unit tests
+const char kDefaultCname[] = "DefaultCnameVal";

[Taylor Brandstetter, 2016/04/13 23:03:06]

nit: Can just be "DefaultCname"

+
 struct MediaSessionOptions {
-  MediaSessionOptions() :
-      recv_audio(true),
-      recv_video(false),
-      data_channel_type(DCT_NONE),
-      is_muc(false),
-      vad_enabled(true),  // When disabled, removes all CN codecs from SDP.
-      rtcp_mux_enabled(true),
-      bundle_enabled(false),
-      video_bandwidth(kAutoBandwidth),
-      data_bandwidth(kDataMaxBandwidth) {
-  }
+  MediaSessionOptions()
+      : recv_audio(true),
+        recv_video(false),
+        data_channel_type(DCT_NONE),
+        is_muc(false),
+        vad_enabled(true),  // When disabled, removes all CN codecs from SDP.
+        rtcp_mux_enabled(true),
+        bundle_enabled(false),
+        video_bandwidth(kAutoBandwidth),
+        data_bandwidth(kDataMaxBandwidth),
+        cname(kDefaultCname) {}
 
   bool has_audio() const {
     return recv_audio || HasSendMediaStream(MEDIA_TYPE_AUDIO);
   }
   bool has_video() const {
     return recv_video || HasSendMediaStream(MEDIA_TYPE_VIDEO);
   }
   bool has_data() const { return data_channel_type != DCT_NONE; }
 
   // Add a stream with MediaType type and id.
@@ skipping 25 matching lines @@
   DataChannelType data_channel_type;
   bool is_muc;
   bool vad_enabled;
   bool rtcp_mux_enabled;
   bool bundle_enabled;
   // bps. -1 == auto.
   int video_bandwidth;
   int data_bandwidth;
   // content name ("mid") => options.
   std::map<std::string, TransportOptions> transport_options;
+  // the CNAME of the PeerConnection

[Taylor Brandstetter, 2016/04/13 23:03:06]

nit: Capitalize "The" and add period to end of comment.

+  std::string cname;
 
   struct Stream {
     Stream(MediaType type,
            const std::string& id,
            const std::string& sync_label,
            int num_sim_layers)
         : type(type), id(id), sync_label(sync_label),
           num_sim_layers(num_sim_layers) {
     }
     MediaType type;
@@ skipping 392 matching lines @@
 void GetSupportedVideoCryptoSuiteNames(
     std::vector<std::string>* crypto_suite_names);
 void GetSupportedDataCryptoSuiteNames(
     std::vector<std::string>* crypto_suite_names);
 void GetDefaultSrtpCryptoSuiteNames(
     std::vector<std::string>* crypto_suite_names);
 
 }  // namespace cricket
 
 #endif  // TALK_SESSION_MEDIA_MEDIASESSION_H_