| Index: talk/app/webrtc/mediastreamhandler.cc
|
| diff --git a/talk/app/webrtc/mediastreamhandler.cc b/talk/app/webrtc/mediastreamhandler.cc
|
| index ded603b12a5da6a684ec84036978d611f8ffc643..5bd6d11aa7d63776f5247d6fd5e69423085cb7ef 100644
|
| --- a/talk/app/webrtc/mediastreamhandler.cc
|
| +++ b/talk/app/webrtc/mediastreamhandler.cc
|
| @@ -33,7 +33,7 @@
|
|
|
| namespace webrtc {
|
|
|
| -TrackHandler::TrackHandler(MediaStreamTrackInterface* track, uint32 ssrc)
|
| +TrackHandler::TrackHandler(MediaStreamTrackInterface* track, uint32_t ssrc)
|
| : track_(track),
|
| ssrc_(ssrc),
|
| state_(track->state()),
|
| @@ -82,10 +82,9 @@ void LocalAudioSinkAdapter::SetSink(cricket::AudioRenderer::Sink* sink) {
|
| sink_ = sink;
|
| }
|
|
|
| -LocalAudioTrackHandler::LocalAudioTrackHandler(
|
| - AudioTrackInterface* track,
|
| - uint32 ssrc,
|
| - AudioProviderInterface* provider)
|
| +LocalAudioTrackHandler::LocalAudioTrackHandler(AudioTrackInterface* track,
|
| + uint32_t ssrc,
|
| + AudioProviderInterface* provider)
|
| : TrackHandler(track, ssrc),
|
| audio_track_(track),
|
| provider_(provider),
|
| @@ -126,11 +125,9 @@ void LocalAudioTrackHandler::OnEnabledChanged() {
|
|
|
| RemoteAudioTrackHandler::RemoteAudioTrackHandler(
|
| AudioTrackInterface* track,
|
| - uint32 ssrc,
|
| + uint32_t ssrc,
|
| AudioProviderInterface* provider)
|
| - : TrackHandler(track, ssrc),
|
| - audio_track_(track),
|
| - provider_(provider) {
|
| + : TrackHandler(track, ssrc), audio_track_(track), provider_(provider) {
|
| track->GetSource()->RegisterAudioObserver(this);
|
| OnEnabledChanged();
|
| }
|
| @@ -159,10 +156,9 @@ void RemoteAudioTrackHandler::OnSetVolume(double volume) {
|
| provider_->SetAudioPlayoutVolume(ssrc(), volume);
|
| }
|
|
|
| -LocalVideoTrackHandler::LocalVideoTrackHandler(
|
| - VideoTrackInterface* track,
|
| - uint32 ssrc,
|
| - VideoProviderInterface* provider)
|
| +LocalVideoTrackHandler::LocalVideoTrackHandler(VideoTrackInterface* track,
|
| + uint32_t ssrc,
|
| + VideoProviderInterface* provider)
|
| : TrackHandler(track, ssrc),
|
| local_video_track_(track),
|
| provider_(provider) {
|
| @@ -194,7 +190,7 @@ void LocalVideoTrackHandler::OnEnabledChanged() {
|
|
|
| RemoteVideoTrackHandler::RemoteVideoTrackHandler(
|
| VideoTrackInterface* track,
|
| - uint32 ssrc,
|
| + uint32_t ssrc,
|
| VideoProviderInterface* provider)
|
| : TrackHandler(track, ssrc),
|
| remote_video_track_(track),
|
| @@ -284,7 +280,7 @@ LocalMediaStreamHandler::~LocalMediaStreamHandler() {
|
| }
|
|
|
| void LocalMediaStreamHandler::AddAudioTrack(AudioTrackInterface* audio_track,
|
| - uint32 ssrc) {
|
| + uint32_t ssrc) {
|
| ASSERT(!FindTrackHandler(audio_track));
|
|
|
| TrackHandler* handler(new LocalAudioTrackHandler(audio_track, ssrc,
|
| @@ -293,7 +289,7 @@ void LocalMediaStreamHandler::AddAudioTrack(AudioTrackInterface* audio_track,
|
| }
|
|
|
| void LocalMediaStreamHandler::AddVideoTrack(VideoTrackInterface* video_track,
|
| - uint32 ssrc) {
|
| + uint32_t ssrc) {
|
| ASSERT(!FindTrackHandler(video_track));
|
|
|
| TrackHandler* handler(new LocalVideoTrackHandler(video_track, ssrc,
|
| @@ -312,7 +308,7 @@ RemoteMediaStreamHandler::~RemoteMediaStreamHandler() {
|
| }
|
|
|
| void RemoteMediaStreamHandler::AddAudioTrack(AudioTrackInterface* audio_track,
|
| - uint32 ssrc) {
|
| + uint32_t ssrc) {
|
| ASSERT(!FindTrackHandler(audio_track));
|
| TrackHandler* handler(
|
| new RemoteAudioTrackHandler(audio_track, ssrc, audio_provider_));
|
| @@ -320,7 +316,7 @@ void RemoteMediaStreamHandler::AddAudioTrack(AudioTrackInterface* audio_track,
|
| }
|
|
|
| void RemoteMediaStreamHandler::AddVideoTrack(VideoTrackInterface* video_track,
|
| - uint32 ssrc) {
|
| + uint32_t ssrc) {
|
| ASSERT(!FindTrackHandler(video_track));
|
| TrackHandler* handler(
|
| new RemoteVideoTrackHandler(video_track, ssrc, video_provider_));
|
| @@ -362,7 +358,7 @@ void MediaStreamHandlerContainer::RemoveRemoteStream(
|
| void MediaStreamHandlerContainer::AddRemoteAudioTrack(
|
| MediaStreamInterface* stream,
|
| AudioTrackInterface* audio_track,
|
| - uint32 ssrc) {
|
| + uint32_t ssrc) {
|
| MediaStreamHandler* handler = FindStreamHandler(remote_streams_handlers_,
|
| stream);
|
| if (handler == NULL) {
|
| @@ -374,7 +370,7 @@ void MediaStreamHandlerContainer::AddRemoteAudioTrack(
|
| void MediaStreamHandlerContainer::AddRemoteVideoTrack(
|
| MediaStreamInterface* stream,
|
| VideoTrackInterface* video_track,
|
| - uint32 ssrc) {
|
| + uint32_t ssrc) {
|
| MediaStreamHandler* handler = FindStreamHandler(remote_streams_handlers_,
|
| stream);
|
| if (handler == NULL) {
|
| @@ -404,7 +400,7 @@ void MediaStreamHandlerContainer::RemoveLocalStream(
|
| void MediaStreamHandlerContainer::AddLocalAudioTrack(
|
| MediaStreamInterface* stream,
|
| AudioTrackInterface* audio_track,
|
| - uint32 ssrc) {
|
| + uint32_t ssrc) {
|
| MediaStreamHandler* handler = FindStreamHandler(local_streams_handlers_,
|
| stream);
|
| if (handler == NULL) {
|
| @@ -416,7 +412,7 @@ void MediaStreamHandlerContainer::AddLocalAudioTrack(
|
| void MediaStreamHandlerContainer::AddLocalVideoTrack(
|
| MediaStreamInterface* stream,
|
| VideoTrackInterface* video_track,
|
| - uint32 ssrc) {
|
| + uint32_t ssrc) {
|
| MediaStreamHandler* handler = FindStreamHandler(local_streams_handlers_,
|
| stream);
|
| if (handler == NULL) {
|
|
|