| Index: talk/app/webrtc/webrtcsession.cc
|
| diff --git a/talk/app/webrtc/webrtcsession.cc b/talk/app/webrtc/webrtcsession.cc
|
| index 0c0e44d0e07b5dd6a6325cc4aa4be812a765cd68..ac2da0c02b79211fd212aa7f66458cd24be19d84 100644
|
| --- a/talk/app/webrtc/webrtcsession.cc
|
| +++ b/talk/app/webrtc/webrtcsession.cc
|
| @@ -263,9 +263,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) {
|
| @@ -287,7 +287,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 =
|
| @@ -459,7 +460,7 @@ static void SetOptionFromOptionalConstraint(
|
| }
|
| }
|
|
|
| -uint32 ConvertIceTransportTypeToCandidateFilter(
|
| +uint32_t ConvertIceTransportTypeToCandidateFilter(
|
| PeerConnectionInterface::IceTransportsType type) {
|
| switch (type) {
|
| case PeerConnectionInterface::kNone:
|
| @@ -1139,13 +1140,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);
|
| @@ -1157,7 +1160,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_) {
|
| @@ -1177,7 +1181,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());
|
| @@ -1190,7 +1195,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_) {
|
| @@ -1203,7 +1208,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());
|
|
|
| @@ -1223,7 +1228,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());
|
| @@ -1239,7 +1244,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_) {
|
| @@ -1260,7 +1266,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,
|
| @@ -1278,7 +1284,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;
|
|
|