Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2250)

Unified Diff: talk/media/base/rtpdataengine.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: rebase + revert basictypes.h (to be landed separately just in case of a revert due to unexpected us… Created 5 years, 2 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
« no previous file with comments | « talk/media/base/mediachannel.h ('k') | talk/media/base/rtpdataengine.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/media/base/rtpdataengine.h
diff --git a/talk/media/base/rtpdataengine.h b/talk/media/base/rtpdataengine.h
index 211b0dc91d839eb52bb176a013aa47e2c4947c46..c0449c9f796ff0d0f171bd75c9161e2901ad19ed 100644
--- a/talk/media/base/rtpdataengine.h
+++ b/talk/media/base/rtpdataengine.h
@@ -66,21 +66,20 @@ class RtpDataEngine : public DataEngineInterface {
// according to the clockrate.
class RtpClock {
public:
- RtpClock(int clockrate, uint16 first_seq_num, uint32 timestamp_offset)
+ RtpClock(int clockrate, uint16_t first_seq_num, uint32_t timestamp_offset)
: clockrate_(clockrate),
last_seq_num_(first_seq_num),
- timestamp_offset_(timestamp_offset) {
- }
+ timestamp_offset_(timestamp_offset) {}
// Given the current time (in number of seconds which must be
// monotonically increasing), Return the next sequence number and
// timestamp.
- void Tick(double now, int* seq_num, uint32* timestamp);
+ void Tick(double now, int* seq_num, uint32_t* timestamp);
private:
int clockrate_;
- uint16 last_seq_num_;
- uint32 timestamp_offset_;
+ uint16_t last_seq_num_;
+ uint32_t timestamp_offset_;
};
class RtpDataMediaChannel : public DataMediaChannel {
@@ -99,9 +98,9 @@ class RtpDataMediaChannel : public DataMediaChannel {
virtual bool SetSendParameters(const DataSendParameters& params);
virtual bool SetRecvParameters(const DataRecvParameters& params);
virtual bool AddSendStream(const StreamParams& sp);
- virtual bool RemoveSendStream(uint32 ssrc);
+ virtual bool RemoveSendStream(uint32_t ssrc);
virtual bool AddRecvStream(const StreamParams& sp);
- virtual bool RemoveRecvStream(uint32 ssrc);
+ virtual bool RemoveRecvStream(uint32_t ssrc);
virtual bool SetSend(bool send) {
sending_ = send;
return true;
@@ -133,7 +132,7 @@ class RtpDataMediaChannel : public DataMediaChannel {
std::vector<DataCodec> recv_codecs_;
std::vector<StreamParams> send_streams_;
std::vector<StreamParams> recv_streams_;
- std::map<uint32, RtpClock*> rtp_clock_by_send_ssrc_;
+ std::map<uint32_t, RtpClock*> rtp_clock_by_send_ssrc_;
rtc::scoped_ptr<rtc::RateLimiter> send_limiter_;
};
« no previous file with comments | « talk/media/base/mediachannel.h ('k') | talk/media/base/rtpdataengine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698