diff options
author | Peter Boström <pbos@webrtc.org> | 2015-10-07 12:23:21 +0200 |
---|---|---|
committer | Peter Boström <pbos@webrtc.org> | 2015-10-07 10:23:32 +0000 |
commit | 0c4e06b4c6107a1b94f764e279e4fb4161e905b0 (patch) | |
tree | b0e40786378df3e3118c577e7890414669e536c5 /talk/app/webrtc/webrtcsession.cc | |
parent | 8d15bd6dabae829d27443e17f2f02cfbe6fa6525 (diff) | |
download | webrtc-0c4e06b4c6107a1b94f764e279e4fb4161e905b0.tar.gz |
Use suffixed {uint,int}{8,16,32,64}_t types.
Removes the use of uint8, etc. in favor of uint8_t.
BUG=webrtc:5024
R=henrik.lundin@webrtc.org, henrikg@webrtc.org, perkj@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, tina.legrand@webrtc.org
Review URL: https://codereview.webrtc.org/1362503003 .
Cr-Commit-Position: refs/heads/master@{#10196}
Diffstat (limited to 'talk/app/webrtc/webrtcsession.cc')
-rw-r--r-- | talk/app/webrtc/webrtcsession.cc | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/talk/app/webrtc/webrtcsession.cc b/talk/app/webrtc/webrtcsession.cc index 15ddc28c7f..2ab9a1e696 100644 --- a/talk/app/webrtc/webrtcsession.cc +++ b/talk/app/webrtc/webrtcsession.cc @@ -265,9 +265,9 @@ static void UpdateSessionDescriptionSecurePolicy(cricket::CryptoType type, } } -static bool GetAudioSsrcByTrackId( - const SessionDescription* session_description, - const std::string& track_id, uint32 *ssrc) { +static bool GetAudioSsrcByTrackId(const SessionDescription* session_description, + const std::string& track_id, + uint32_t* ssrc) { const cricket::ContentInfo* audio_info = cricket::GetFirstAudioContent(session_description); if (!audio_info) { @@ -289,7 +289,8 @@ static bool GetAudioSsrcByTrackId( } static bool GetTrackIdBySsrc(const SessionDescription* session_description, - uint32 ssrc, std::string* track_id) { + uint32_t ssrc, + std::string* track_id) { ASSERT(track_id != NULL); const cricket::ContentInfo* audio_info = @@ -461,7 +462,7 @@ static void SetOptionFromOptionalConstraint( } } -uint32 ConvertIceTransportTypeToCandidateFilter( +uint32_t ConvertIceTransportTypeToCandidateFilter( PeerConnectionInterface::IceTransportsType type) { switch (type) { case PeerConnectionInterface::kNone: @@ -1212,13 +1213,15 @@ bool WebRtcSession::SetIceTransports( ConvertIceTransportTypeToCandidateFilter(type)); } -bool WebRtcSession::GetLocalTrackIdBySsrc(uint32 ssrc, std::string* track_id) { +bool WebRtcSession::GetLocalTrackIdBySsrc(uint32_t ssrc, + std::string* track_id) { if (!base_local_description()) return false; return webrtc::GetTrackIdBySsrc(base_local_description(), ssrc, track_id); } -bool WebRtcSession::GetRemoteTrackIdBySsrc(uint32 ssrc, std::string* track_id) { +bool WebRtcSession::GetRemoteTrackIdBySsrc(uint32_t ssrc, + std::string* track_id) { if (!base_remote_description()) return false; return webrtc::GetTrackIdBySsrc(base_remote_description(), ssrc, track_id); @@ -1230,7 +1233,8 @@ std::string WebRtcSession::BadStateErrMsg(State state) { return desc.str(); } -void WebRtcSession::SetAudioPlayout(uint32 ssrc, bool enable, +void WebRtcSession::SetAudioPlayout(uint32_t ssrc, + bool enable, cricket::AudioRenderer* renderer) { ASSERT(signaling_thread()->IsCurrent()); if (!voice_channel_) { @@ -1250,7 +1254,8 @@ void WebRtcSession::SetAudioPlayout(uint32 ssrc, bool enable, } } -void WebRtcSession::SetAudioSend(uint32 ssrc, bool enable, +void WebRtcSession::SetAudioSend(uint32_t ssrc, + bool enable, const cricket::AudioOptions& options, cricket::AudioRenderer* renderer) { ASSERT(signaling_thread()->IsCurrent()); @@ -1263,7 +1268,7 @@ void WebRtcSession::SetAudioSend(uint32 ssrc, bool enable, } } -void WebRtcSession::SetAudioPlayoutVolume(uint32 ssrc, double volume) { +void WebRtcSession::SetAudioPlayoutVolume(uint32_t ssrc, double volume) { ASSERT(signaling_thread()->IsCurrent()); ASSERT(volume >= 0 && volume <= 10); if (!voice_channel_) { @@ -1276,7 +1281,7 @@ void WebRtcSession::SetAudioPlayoutVolume(uint32 ssrc, double volume) { } } -bool WebRtcSession::SetCaptureDevice(uint32 ssrc, +bool WebRtcSession::SetCaptureDevice(uint32_t ssrc, cricket::VideoCapturer* camera) { ASSERT(signaling_thread()->IsCurrent()); @@ -1296,7 +1301,7 @@ bool WebRtcSession::SetCaptureDevice(uint32 ssrc, return true; } -void WebRtcSession::SetVideoPlayout(uint32 ssrc, +void WebRtcSession::SetVideoPlayout(uint32_t ssrc, bool enable, cricket::VideoRenderer* renderer) { ASSERT(signaling_thread()->IsCurrent()); @@ -1312,7 +1317,8 @@ void WebRtcSession::SetVideoPlayout(uint32 ssrc, } } -void WebRtcSession::SetVideoSend(uint32 ssrc, bool enable, +void WebRtcSession::SetVideoSend(uint32_t ssrc, + bool enable, const cricket::VideoOptions* options) { ASSERT(signaling_thread()->IsCurrent()); if (!video_channel_) { @@ -1333,7 +1339,7 @@ bool WebRtcSession::CanInsertDtmf(const std::string& track_id) { LOG(LS_ERROR) << "CanInsertDtmf: No audio channel exists."; return false; } - uint32 send_ssrc = 0; + uint32_t send_ssrc = 0; // The Dtmf is negotiated per channel not ssrc, so we only check if the ssrc // exists. if (!GetAudioSsrcByTrackId(base_local_description(), track_id, @@ -1351,7 +1357,7 @@ bool WebRtcSession::InsertDtmf(const std::string& track_id, LOG(LS_ERROR) << "InsertDtmf: No audio channel exists."; return false; } - uint32 send_ssrc = 0; + uint32_t send_ssrc = 0; if (!VERIFY(GetAudioSsrcByTrackId(base_local_description(), track_id, &send_ssrc))) { LOG(LS_ERROR) << "InsertDtmf: Track does not exist: " << track_id; |