talk/app/webrtc/mediastreamhandler.h - Issue 1362503003: Use suffixed {uint,int}{8,16,32,64}_t types.

Unified Diff: talk/app/webrtc/mediastreamhandler.h

Issue 1362503003: Use suffixed {uint,int}{8,16,32,64}_t types. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: google::int32 Created 5 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: talk/app/webrtc/mediastreamhandler.h

diff --git a/talk/app/webrtc/mediastreamhandler.h b/talk/app/webrtc/mediastreamhandler.h

index 1782f26e73f5ec5b16390af76fc1cb58d256762c..c9ef18d886d0bf54b821f4a880837cf595685cc2 100644

--- a/talk/app/webrtc/mediastreamhandler.h

+++ b/talk/app/webrtc/mediastreamhandler.h

@@ -48,14 +48,14 @@ namespace webrtc {

// connected to a certain PeerConnection.

class TrackHandler : public ObserverInterface {

public:

- TrackHandler(MediaStreamTrackInterface* track, uint32 ssrc);

+ TrackHandler(MediaStreamTrackInterface* track, uint32_t ssrc);

virtual ~TrackHandler();

virtual void OnChanged();

// Stop using |track_| on this PeerConnection.

virtual void Stop() = 0;

MediaStreamTrackInterface* track() { return track_; }

- uint32 ssrc() const { return ssrc_; }

+ uint32_t ssrc() const { return ssrc_; }

protected:

virtual void OnStateChanged() = 0;

@@ -63,7 +63,7 @@ class TrackHandler : public ObserverInterface {

private:

rtc::scoped_refptr<MediaStreamTrackInterface> track_;

- uint32 ssrc_;

+ uint32_t ssrc_;

MediaStreamTrackInterface::TrackState state_;

bool enabled_;

};

@@ -98,7 +98,7 @@ class LocalAudioSinkAdapter : public AudioTrackSinkInterface,

class LocalAudioTrackHandler : public TrackHandler {

public:

LocalAudioTrackHandler(AudioTrackInterface* track,

- uint32 ssrc,

+ uint32_t ssrc,

AudioProviderInterface* provider);

virtual ~LocalAudioTrackHandler();

@@ -124,7 +124,7 @@ class RemoteAudioTrackHandler : public AudioSourceInterface::AudioObserver,

public TrackHandler {

public:

RemoteAudioTrackHandler(AudioTrackInterface* track,

- uint32 ssrc,

+ uint32_t ssrc,

AudioProviderInterface* provider);

virtual ~RemoteAudioTrackHandler();

void Stop() override;

@@ -147,7 +147,7 @@ class RemoteAudioTrackHandler : public AudioSourceInterface::AudioObserver,

class LocalVideoTrackHandler : public TrackHandler {

public:

LocalVideoTrackHandler(VideoTrackInterface* track,

- uint32 ssrc,

+ uint32_t ssrc,

VideoProviderInterface* provider);

virtual ~LocalVideoTrackHandler();

void Stop() override;

@@ -167,7 +167,7 @@ class LocalVideoTrackHandler : public TrackHandler {

class RemoteVideoTrackHandler : public TrackHandler {

public:

RemoteVideoTrackHandler(VideoTrackInterface* track,

- uint32 ssrc,

+ uint32_t ssrc,

VideoProviderInterface* provider);

virtual ~RemoteVideoTrackHandler();

void Stop() override;

@@ -190,8 +190,10 @@ class MediaStreamHandler : public ObserverInterface {

MediaStreamInterface* stream();

void Stop();

- virtual void AddAudioTrack(AudioTrackInterface* audio_track, uint32 ssrc) = 0;

- virtual void AddVideoTrack(VideoTrackInterface* video_track, uint32 ssrc) = 0;

+ virtual void AddAudioTrack(AudioTrackInterface* audio_track,

+ uint32_t ssrc) = 0;

+ virtual void AddVideoTrack(VideoTrackInterface* video_track,

+ uint32_t ssrc) = 0;

virtual void RemoveTrack(MediaStreamTrackInterface* track);

void OnChanged() override;

@@ -212,8 +214,8 @@ class LocalMediaStreamHandler : public MediaStreamHandler {

VideoProviderInterface* video_provider);

~LocalMediaStreamHandler();

- void AddAudioTrack(AudioTrackInterface* audio_track, uint32 ssrc) override;

- void AddVideoTrack(VideoTrackInterface* video_track, uint32 ssrc) override;

+ void AddAudioTrack(AudioTrackInterface* audio_track, uint32_t ssrc) override;

+ void AddVideoTrack(VideoTrackInterface* video_track, uint32_t ssrc) override;

};

class RemoteMediaStreamHandler : public MediaStreamHandler {

@@ -222,8 +224,8 @@ class RemoteMediaStreamHandler : public MediaStreamHandler {

AudioProviderInterface* audio_provider,

VideoProviderInterface* video_provider);

~RemoteMediaStreamHandler();

- void AddAudioTrack(AudioTrackInterface* audio_track, uint32 ssrc) override;

- void AddVideoTrack(VideoTrackInterface* video_track, uint32 ssrc) override;

+ void AddAudioTrack(AudioTrackInterface* audio_track, uint32_t ssrc) override;

+ void AddVideoTrack(VideoTrackInterface* video_track, uint32_t ssrc) override;

};

// Container for MediaStreamHandlers of currently known local and remote

@@ -247,11 +249,11 @@ class MediaStreamHandlerContainer {

// Create a RemoteAudioTrackHandler and associate |audio_track| with |ssrc|.

void AddRemoteAudioTrack(MediaStreamInterface* stream,

AudioTrackInterface* audio_track,

- uint32 ssrc);

+ uint32_t ssrc);

// Create a RemoteVideoTrackHandler and associate |video_track| with |ssrc|.

void AddRemoteVideoTrack(MediaStreamInterface* stream,

VideoTrackInterface* video_track,

- uint32 ssrc);

+ uint32_t ssrc);

// Remove the TrackHandler for |track|.

void RemoveRemoteTrack(MediaStreamInterface* stream,

MediaStreamTrackInterface* track);

@@ -264,11 +266,11 @@ class MediaStreamHandlerContainer {

// Create a LocalAudioTrackHandler and associate |audio_track| with |ssrc|.

void AddLocalAudioTrack(MediaStreamInterface* stream,

AudioTrackInterface* audio_track,

- uint32 ssrc);

+ uint32_t ssrc);

// Create a LocalVideoTrackHandler and associate |video_track| with |ssrc|.

void AddLocalVideoTrack(MediaStreamInterface* stream,

VideoTrackInterface* video_track,

- uint32 ssrc);

+ uint32_t ssrc);

// Remove the TrackHandler for |track|.

void RemoveLocalTrack(MediaStreamInterface* stream,

MediaStreamTrackInterface* track);

« no previous file with comments | « talk/app/webrtc/java/jni/peerconnection_jni.cc ('k') | talk/app/webrtc/mediastreamhandler.cc » ('j') | webrtc/base/basictypes_unittest.cc » ('J')