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

Unified Diff: media/formats/webm/webm_tracks_parser.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/formats/webm/webm_tracks_parser.cc
diff --git a/media/formats/webm/webm_tracks_parser.cc b/media/formats/webm/webm_tracks_parser.cc
index 1f2ca69afd414f2e3391cd63e7c6991faa7a733f..464a77ff1e66eab49ff8a43358508f76e509bad9 100644
--- a/media/formats/webm/webm_tracks_parser.cc
+++ b/media/formats/webm/webm_tracks_parser.cc
@@ -30,11 +30,12 @@ static TextKind CodecIdToTextKind(const std::string& codec_id) {
}
static base::TimeDelta PrecisionCappedDefaultDuration(
- const double timecode_scale_in_us, const int64 duration_in_ns) {
+ const double timecode_scale_in_us,
+ const int64_t duration_in_ns) {
if (duration_in_ns <= 0)
return kNoTimestamp();
- int64 mult = duration_in_ns / 1000;
+ int64_t mult = duration_in_ns / 1000;
mult /= timecode_scale_in_us;
if (mult == 0)
return kNoTimestamp();
@@ -62,7 +63,7 @@ WebMTracksParser::WebMTracksParser(const scoped_refptr<MediaLog>& media_log,
WebMTracksParser::~WebMTracksParser() {}
-int WebMTracksParser::Parse(const uint8* buf, int size) {
+int WebMTracksParser::Parse(const uint8_t* buf, int size) {
track_type_ =-1;
track_num_ = -1;
default_duration_ = -1;
@@ -267,8 +268,8 @@ bool WebMTracksParser::OnListEnd(int id) {
return true;
}
-bool WebMTracksParser::OnUInt(int id, int64 val) {
- int64* dst = NULL;
+bool WebMTracksParser::OnUInt(int id, int64_t val) {
+ int64_t* dst = NULL;
switch (id) {
case kWebMIdTrackNumber:
@@ -304,7 +305,7 @@ bool WebMTracksParser::OnFloat(int id, double val) {
return true;
}
-bool WebMTracksParser::OnBinary(int id, const uint8* data, int size) {
+bool WebMTracksParser::OnBinary(int id, const uint8_t* data, int size) {
if (id == kWebMIdCodecPrivate) {
if (!codec_private_.empty()) {
MEDIA_LOG(ERROR, media_log_)

Powered by Google App Engine
This is Rietveld 408576698