Use suffixed {uint,int}{8,16,32,64}_t types.

talk/session/media/channel.h

Index: talk/session/media/channel.h
diff --git a/talk/session/media/channel.h b/talk/session/media/channel.h
index bb430bf3655691b9011c1b49de6f85ecc4cbdaea..58b3b2f87ecdd73eefb5bc2f43980155610f7f1a 100644
--- a/talk/session/media/channel.h
+++ b/talk/session/media/channel.h
@@ -127,9 +127,9 @@ class BaseChannel
 
   // Multiplexing
   bool AddRecvStream(const StreamParams& sp);
-  bool RemoveRecvStream(uint32 ssrc);
+  bool RemoveRecvStream(uint32_t ssrc);
   bool AddSendStream(const StreamParams& sp);
-  bool RemoveSendStream(uint32 ssrc);
+  bool RemoveSendStream(uint32_t ssrc);
 
   // Monitoring
   void StartConnectionMonitor(int cms);
@@ -137,7 +137,7 @@ class BaseChannel
   // For ConnectionStatsGetter, used by ConnectionMonitor
   virtual bool GetConnectionStats(ConnectionInfos* infos) override;
 
-  void set_srtp_signal_silent_time(uint32 silent_time) {
+  void set_srtp_signal_silent_time(uint32_t silent_time) {
     srtp_filter_.set_signal_silent_time(silent_time);
   }
 
@@ -226,9 +226,9 @@ class BaseChannel
   void ChannelWritable_w();
   void ChannelNotWritable_w();
   bool AddRecvStream_w(const StreamParams& sp);
-  bool RemoveRecvStream_w(uint32 ssrc);
+  bool RemoveRecvStream_w(uint32_t ssrc);
   bool AddSendStream_w(const StreamParams& sp);
-  bool RemoveSendStream_w(uint32 ssrc);
+  bool RemoveSendStream_w(uint32_t ssrc);
   virtual bool ShouldSetupDtlsSrtp() const;
   // Do the DTLS key expansion and impose it on the SRTP/SRTCP filters.
   // |rtcp_channel| indicates whether to set up the RTP or RTCP filter.
@@ -328,11 +328,13 @@ class VoiceChannel : public BaseChannel {
                const std::string& content_name, bool rtcp);
   ~VoiceChannel();
   bool Init();
-  bool SetRemoteRenderer(uint32 ssrc, AudioRenderer* renderer);
+  bool SetRemoteRenderer(uint32_t ssrc, AudioRenderer* renderer);
 
   // Configure sending media on the stream with SSRC |ssrc|
   // If there is only one sending stream SSRC 0 can be used.
-  bool SetAudioSend(uint32 ssrc, bool mute, const AudioOptions* options,
+  bool SetAudioSend(uint32_t ssrc,
+                    bool mute,
+                    const AudioOptions* options,
                     AudioRenderer* renderer);
 
   // downcasts a MediaChannel
@@ -347,7 +349,7 @@ class VoiceChannel : public BaseChannel {
   // own ringing sound
   sigslot::signal1<VoiceChannel*> SignalEarlyMediaTimeout;
 
-  bool PlayRingbackTone(uint32 ssrc, bool play, bool loop);
+  bool PlayRingbackTone(uint32_t ssrc, bool play, bool loop);
   // TODO(ronghuawu): Replace PressDTMF with InsertDtmf.
   bool PressDTMF(int digit, bool playout);
   // Returns if the telephone-event has been negotiated.
@@ -357,8 +359,8 @@ class VoiceChannel : public BaseChannel {
   // The |ssrc| should be either 0 or a valid send stream ssrc.
   // The valid value for the |event| are 0 which corresponding to DTMF
   // event 0-9, *, #, A-D.
-  bool InsertDtmf(uint32 ssrc, int event_code, int duration, int flags);
-  bool SetOutputScaling(uint32 ssrc, double left, double right);
+  bool InsertDtmf(uint32_t ssrc, int event_code, int duration, int flags);
+  bool SetOutputScaling(uint32_t ssrc, double left, double right);
   // Get statistics about the current media session.
   bool GetStats(VoiceMediaInfo* stats);
 
@@ -380,8 +382,8 @@ class VoiceChannel : public BaseChannel {
   void GetActiveStreams_w(AudioInfo::StreamList* actives);
 
   // Signal errors from VoiceMediaChannel.  Arguments are:
-  //     ssrc(uint32), and error(VoiceMediaChannel::Error).
-  sigslot::signal3<VoiceChannel*, uint32, VoiceMediaChannel::Error>
+  //     ssrc(uint32_t), and error(VoiceMediaChannel::Error).
+  sigslot::signal3<VoiceChannel*, uint32_t, VoiceMediaChannel::Error>
       SignalMediaError;
 
  private:
@@ -399,10 +401,10 @@ class VoiceChannel : public BaseChannel {
                                   ContentAction action,
                                   std::string* error_desc);
   bool SetRingbackTone_w(const void* buf, int len);
-  bool PlayRingbackTone_w(uint32 ssrc, bool play, bool loop);
+  bool PlayRingbackTone_w(uint32_t ssrc, bool play, bool loop);
   void HandleEarlyMediaTimeout();
-  bool InsertDtmf_w(uint32 ssrc, int event, int duration, int flags);
-  bool SetOutputScaling_w(uint32 ssrc, double left, double right);
+  bool InsertDtmf_w(uint32_t ssrc, int event, int duration, int flags);
+  bool SetOutputScaling_w(uint32_t ssrc, double left, double right);
   bool GetStats_w(VoiceMediaInfo* stats);
 
   virtual void OnMessage(rtc::Message* pmsg);
@@ -412,9 +414,11 @@ class VoiceChannel : public BaseChannel {
   virtual void OnMediaMonitorUpdate(
       VoiceMediaChannel* media_channel, const VoiceMediaInfo& info);
   void OnAudioMonitorUpdate(AudioMonitor* monitor, const AudioInfo& info);
-  void OnVoiceChannelError(uint32 ssrc, VoiceMediaChannel::Error error);
+  void OnVoiceChannelError(uint32_t ssrc, VoiceMediaChannel::Error error);
   void SendLastMediaError();
-  void OnSrtpError(uint32 ssrc, SrtpFilter::Mode mode, SrtpFilter::Error error);
+  void OnSrtpError(uint32_t ssrc,
+                   SrtpFilter::Mode mode,
+                   SrtpFilter::Error error);
 
   static const int kEarlyMediaTimeout = 1000;
   MediaEngineInterface* media_engine_;
@@ -444,20 +448,20 @@ class VideoChannel : public BaseChannel {
     return static_cast<VideoMediaChannel*>(BaseChannel::media_channel());
   }
 
-  bool SetRenderer(uint32 ssrc, VideoRenderer* renderer);
+  bool SetRenderer(uint32_t ssrc, VideoRenderer* renderer);
   bool ApplyViewRequest(const ViewRequest& request);
 
   // TODO(pthatcher): Refactor to use a "capture id" instead of an
   // ssrc here as the "key".
   // Passes ownership of the capturer to the channel.
-  bool AddScreencast(uint32 ssrc, VideoCapturer* capturer);
-  bool SetCapturer(uint32 ssrc, VideoCapturer* capturer);
-  bool RemoveScreencast(uint32 ssrc);
+  bool AddScreencast(uint32_t ssrc, VideoCapturer* capturer);
+  bool SetCapturer(uint32_t ssrc, VideoCapturer* capturer);
+  bool RemoveScreencast(uint32_t ssrc);
   // True if we've added a screencast.  Doesn't matter if the capturer
   // has been started or not.
   bool IsScreencasting();
-  int GetScreencastFps(uint32 ssrc);
-  int GetScreencastMaxPixels(uint32 ssrc);
+  int GetScreencastFps(uint32_t ssrc);
+  int GetScreencastMaxPixels(uint32_t ssrc);
   // Get statistics about the current media session.
   bool GetStats(VideoMediaInfo* stats);
 
@@ -467,19 +471,19 @@ class VideoChannel : public BaseChannel {
   void StartMediaMonitor(int cms);
   void StopMediaMonitor();
   sigslot::signal2<VideoChannel*, const VideoMediaInfo&> SignalMediaMonitor;
-  sigslot::signal2<uint32, rtc::WindowEvent> SignalScreencastWindowEvent;
+  sigslot::signal2<uint32_t, rtc::WindowEvent> SignalScreencastWindowEvent;
 
   bool SendIntraFrame();
   bool RequestIntraFrame();
-  sigslot::signal3<VideoChannel*, uint32, VideoMediaChannel::Error>
+  sigslot::signal3<VideoChannel*, uint32_t, VideoMediaChannel::Error>
       SignalMediaError;
 
   // Configure sending media on the stream with SSRC |ssrc|
   // If there is only one sending stream SSRC 0 can be used.
-  bool SetVideoSend(uint32 ssrc, bool mute, const VideoOptions* options);
+  bool SetVideoSend(uint32_t ssrc, bool mute, const VideoOptions* options);
 
  private:
-  typedef std::map<uint32, VideoCapturer*> ScreencastMap;
+  typedef std::map<uint32_t, VideoCapturer*> ScreencastMap;
   struct ScreencastDetailsData;
 
   // overrides from BaseChannel
@@ -493,9 +497,9 @@ class VideoChannel : public BaseChannel {
                                   std::string* error_desc);
   bool ApplyViewRequest_w(const ViewRequest& request);
 
-  bool AddScreencast_w(uint32 ssrc, VideoCapturer* capturer);
-  bool RemoveScreencast_w(uint32 ssrc);
-  void OnScreencastWindowEvent_s(uint32 ssrc, rtc::WindowEvent we);
+  bool AddScreencast_w(uint32_t ssrc, VideoCapturer* capturer);
+  bool RemoveScreencast_w(uint32_t ssrc);
+  void OnScreencastWindowEvent_s(uint32_t ssrc, rtc::WindowEvent we);
   bool IsScreencasting_w() const;
   void GetScreencastDetails_w(ScreencastDetailsData* d) const;
   bool GetStats_w(VideoMediaInfo* stats);
@@ -506,13 +510,14 @@ class VideoChannel : public BaseChannel {
       ConnectionMonitor* monitor, const std::vector<ConnectionInfo>& infos);
   virtual void OnMediaMonitorUpdate(
       VideoMediaChannel* media_channel, const VideoMediaInfo& info);
-  virtual void OnScreencastWindowEvent(uint32 ssrc,
-                                       rtc::WindowEvent event);
+  virtual void OnScreencastWindowEvent(uint32_t ssrc, rtc::WindowEvent event);
   virtual void OnStateChange(VideoCapturer* capturer, CaptureState ev);
-  bool GetLocalSsrc(const VideoCapturer* capturer, uint32* ssrc);
+  bool GetLocalSsrc(const VideoCapturer* capturer, uint32_t* ssrc);
 
-  void OnVideoChannelError(uint32 ssrc, VideoMediaChannel::Error error);
-  void OnSrtpError(uint32 ssrc, SrtpFilter::Mode mode, SrtpFilter::Error error);
+  void OnVideoChannelError(uint32_t ssrc, VideoMediaChannel::Error error);
+  void OnSrtpError(uint32_t ssrc,
+                   SrtpFilter::Mode mode,
+                   SrtpFilter::Error error);
 
   VideoRenderer* renderer_;
   ScreencastMap screencast_capturers_;
@@ -554,7 +559,7 @@ class DataChannel : public BaseChannel {
   sigslot::signal2<DataChannel*, const DataMediaInfo&> SignalMediaMonitor;
   sigslot::signal2<DataChannel*, const std::vector<ConnectionInfo>&>
       SignalConnectionMonitor;
-  sigslot::signal3<DataChannel*, uint32, DataMediaChannel::Error>
+  sigslot::signal3<DataChannel*, uint32_t, DataMediaChannel::Error>
       SignalMediaError;
   sigslot::signal3<DataChannel*,
                    const ReceiveDataParams&,
@@ -565,7 +570,7 @@ class DataChannel : public BaseChannel {
   // both local and remote descriptions are set, and the channel is unblocked.
   sigslot::signal1<bool> SignalReadyToSendData;
   // Signal for notifying that the remote side has closed the DataChannel.
-  sigslot::signal1<uint32> SignalStreamClosedRemotely;
+  sigslot::signal1<uint32_t> SignalStreamClosedRemotely;
 
  protected:
   // downcasts a MediaChannel.
@@ -634,10 +639,12 @@ class DataChannel : public BaseChannel {
   virtual bool ShouldSetupDtlsSrtp() const;
   void OnDataReceived(
       const ReceiveDataParams& params, const char* data, size_t len);
-  void OnDataChannelError(uint32 ssrc, DataMediaChannel::Error error);
+  void OnDataChannelError(uint32_t ssrc, DataMediaChannel::Error error);
   void OnDataChannelReadyToSend(bool writable);
-  void OnSrtpError(uint32 ssrc, SrtpFilter::Mode mode, SrtpFilter::Error error);
-  void OnStreamClosedRemotely(uint32 sid);
+  void OnSrtpError(uint32_t ssrc,
+                   SrtpFilter::Mode mode,
+                   SrtpFilter::Error error);
+  void OnStreamClosedRemotely(uint32_t sid);
 
   rtc::scoped_ptr<DataMediaMonitor> media_monitor_;
   // TODO(pthatcher): Make a separate SctpDataChannel and