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

Unified Diff: media/cast/logging/log_deserializer.cc

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more Created 5 years 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: media/cast/logging/log_deserializer.cc
diff --git a/media/cast/logging/log_deserializer.cc b/media/cast/logging/log_deserializer.cc
index 5e5b189115c805996d7e8b3bdb74038cb5924fdd..09f74c761c7faf43eaa6cfcd2472056010a588a2 100644
--- a/media/cast/logging/log_deserializer.cc
+++ b/media/cast/logging/log_deserializer.cc
@@ -72,7 +72,7 @@ bool PopulateDeserializedLog(base::BigEndianReader* reader,
int num_frame_events = log->metadata.num_frame_events();
RtpTimestamp relative_rtp_timestamp = 0;
- uint16 proto_size = 0;
+ uint16_t proto_size = 0;
for (int i = 0; i < num_frame_events; i++) {
if (!reader->ReadU16(&proto_size))
return false;
@@ -146,7 +146,7 @@ bool DoDeserializeEvents(const char* data,
base::BigEndianReader reader(data, data_bytes);
LogMetadata metadata;
- uint16 proto_size = 0;
+ uint16_t proto_size = 0;
while (reader.remaining() > 0) {
if (!reader.ReadU16(&proto_size))
return false;
@@ -186,9 +186,9 @@ bool Uncompress(const char* data,
int* uncompressed_bytes) {
z_stream stream = {0};
- stream.next_in = reinterpret_cast<uint8*>(const_cast<char*>(data));
+ stream.next_in = reinterpret_cast<uint8_t*>(const_cast<char*>(data));
stream.avail_in = data_bytes;
- stream.next_out = reinterpret_cast<uint8*>(uncompressed);
+ stream.next_out = reinterpret_cast<uint8_t*>(uncompressed);
stream.avail_out = max_uncompressed_bytes;
bool success = false;

Powered by Google App Engine
This is Rietveld 408576698