Remove default receive channel from WVoE; baby step 3.

talk/media/webrtc/webrtcvoiceengine.h

Index: talk/media/webrtc/webrtcvoiceengine.h
diff --git a/talk/media/webrtc/webrtcvoiceengine.h b/talk/media/webrtc/webrtcvoiceengine.h
index 1a8a6ab1da0d7fd679f39c4ae82e1515268c799f..4a9f15fa9a2d1a64632d417834eadc4bb7a3c626 100644
--- a/talk/media/webrtc/webrtcvoiceengine.h
+++ b/talk/media/webrtc/webrtcvoiceengine.h
@@ -260,9 +260,7 @@ class WebRtcVoiceMediaChannel : public VoiceMediaChannel,
                        const std::vector<AudioCodec>& all_codecs,
                        webrtc::CodecInst* send_codec);
   bool EnableRtcp(int channel);
-  bool ResetRecvCodecs(int channel);
   bool SetPlayout(int channel, bool playout);
-  static uint32_t ParseSsrc(const void* data, size_t len, bool rtcp);
   static Error WebRtcErrorToChannelError(int err_code);
 
   class WebRtcVoiceChannelRenderer;
@@ -283,9 +281,6 @@ class WebRtcVoiceMediaChannel : public VoiceMediaChannel,
   void ConfigureSendChannel(int channel);
   bool ConfigureRecvChannel(int channel);
   bool DeleteChannel(int channel);
-  bool InConferenceMode() const {
-    return options_.conference_mode.GetWithDefaultIfUnset(false);
-  }
   bool IsDefaultChannel(int channel_id) const {
     return channel_id == default_send_channel_id_;
   }
@@ -325,16 +320,14 @@ class WebRtcVoiceMediaChannel : public VoiceMediaChannel,
   SendFlags send_;
   webrtc::Call* const call_;
 
+  int64_t default_recv_ssrc_;

[pthatcher1, 2015/10/08 18:55:40]

Can you comment that it's really int32_t with an "unset" value?  Can you also
comment on what set vs unset means?

[the sun, 2015/10/12 15:03:01]

Done.

+
   // send_channels_ contains the channels which are being used for sending.
   // When the default channel (default_send_channel_id) is used for sending, it
   // is contained in send_channels_, otherwise not.
   ChannelMap send_channels_;
   std::vector<RtpHeaderExtension> send_extensions_;
-  uint32_t default_receive_ssrc_;
-  // Note the default channel (default_send_channel_id()) can reside in both
-  // receive_channels_ and send_channels_ in non-conference mode and in that
-  // case it will only be there if a non-zero default_receive_ssrc_ is set.
-  ChannelMap receive_channels_;  // for multiple sources
+  ChannelMap receive_channels_;
   std::map<uint32_t, webrtc::AudioReceiveStream*> receive_streams_;
   std::map<uint32_t, StreamParams> receive_stream_params_;
   // receive_channels_ can be read from WebRtc callback thread.  Access from
@@ -342,10 +335,6 @@ class WebRtcVoiceMediaChannel : public VoiceMediaChannel,
   // Reads on the worker thread are ok.
   std::vector<RtpHeaderExtension> receive_extensions_;
   std::vector<webrtc::RtpExtension> recv_rtp_extensions_;
-
-  // Do not lock this on the VoE media processor thread; potential for deadlock
-  // exists.
-  mutable rtc::CriticalSection receive_channels_cs_;
 };
 
 }  // namespace cricket