| Index: talk/app/webrtc/mediastreamsignaling.cc
|
| diff --git a/talk/app/webrtc/mediastreamsignaling.cc b/talk/app/webrtc/mediastreamsignaling.cc
|
| index 1f5f14fd7b55a3e6641349058f03ed1c38bfdb4a..be70face691fca6a66f69b7ad33d589a5b342e53 100644
|
| --- a/talk/app/webrtc/mediastreamsignaling.cc
|
| +++ b/talk/app/webrtc/mediastreamsignaling.cc
|
| @@ -612,7 +612,7 @@ void MediaStreamSignaling::UpdateRemoteStreamsList(
|
| // track id.
|
| const std::string& stream_label = it->sync_label;
|
| const std::string& track_id = it->id;
|
| - uint32 ssrc = it->first_ssrc();
|
| + uint32_t ssrc = it->first_ssrc();
|
|
|
| rtc::scoped_refptr<MediaStreamInterface> stream =
|
| remote_streams_->find(stream_label);
|
| @@ -634,7 +634,7 @@ void MediaStreamSignaling::UpdateRemoteStreamsList(
|
|
|
| void MediaStreamSignaling::OnRemoteTrackSeen(const std::string& stream_label,
|
| const std::string& track_id,
|
| - uint32 ssrc,
|
| + uint32_t ssrc,
|
| cricket::MediaType media_type) {
|
| MediaStreamInterface* stream = remote_streams_->find(stream_label);
|
|
|
| @@ -801,7 +801,7 @@ void MediaStreamSignaling::UpdateLocalTracks(
|
| // track id.
|
| const std::string& stream_label = it->sync_label;
|
| const std::string& track_id = it->id;
|
| - uint32 ssrc = it->first_ssrc();
|
| + uint32_t ssrc = it->first_ssrc();
|
| const TrackInfo* track_info = FindTrackInfo(*current_tracks,
|
| stream_label,
|
| track_id);
|
| @@ -813,11 +813,10 @@ void MediaStreamSignaling::UpdateLocalTracks(
|
| }
|
| }
|
|
|
| -void MediaStreamSignaling::OnLocalTrackSeen(
|
| - const std::string& stream_label,
|
| - const std::string& track_id,
|
| - uint32 ssrc,
|
| - cricket::MediaType media_type) {
|
| +void MediaStreamSignaling::OnLocalTrackSeen(const std::string& stream_label,
|
| + const std::string& track_id,
|
| + uint32_t ssrc,
|
| + cricket::MediaType media_type) {
|
| MediaStreamInterface* stream = local_streams_->find(stream_label);
|
| if (!stream) {
|
| LOG(LS_WARNING) << "An unknown local MediaStream with label "
|
| @@ -846,11 +845,10 @@ void MediaStreamSignaling::OnLocalTrackSeen(
|
| }
|
| }
|
|
|
| -void MediaStreamSignaling::OnLocalTrackRemoved(
|
| - const std::string& stream_label,
|
| - const std::string& track_id,
|
| - uint32 ssrc,
|
| - cricket::MediaType media_type) {
|
| +void MediaStreamSignaling::OnLocalTrackRemoved(const std::string& stream_label,
|
| + const std::string& track_id,
|
| + uint32_t ssrc,
|
| + cricket::MediaType media_type) {
|
| MediaStreamInterface* stream = local_streams_->find(stream_label);
|
| if (!stream) {
|
| // This is the normal case. Ie RemoveLocalStream has been called and the
|
| @@ -955,7 +953,7 @@ void MediaStreamSignaling::UpdateClosingDataChannels(
|
| }
|
|
|
| void MediaStreamSignaling::CreateRemoteDataChannel(const std::string& label,
|
| - uint32 remote_ssrc) {
|
| + uint32_t remote_ssrc) {
|
| if (!data_channel_factory_) {
|
| LOG(LS_WARNING) << "Remote peer requested a DataChannel but DataChannels "
|
| << "are not supported.";
|
| @@ -993,8 +991,7 @@ void MediaStreamSignaling::OnDtlsRoleReadyForSctp(rtc::SSLRole role) {
|
| }
|
| }
|
|
|
| -
|
| -void MediaStreamSignaling::OnRemoteSctpDataChannelClosed(uint32 sid) {
|
| +void MediaStreamSignaling::OnRemoteSctpDataChannelClosed(uint32_t sid) {
|
| int index = FindDataChannelBySid(sid);
|
| if (index < 0) {
|
| LOG(LS_WARNING) << "Unexpected sid " << sid
|
|
|