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

Unified Diff: media/formats/webm/webm_parser.h

Issue 1498003003: Remove kint64max. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: INT64_MAX 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
« no previous file with comments | « media/filters/chunk_demuxer.cc ('k') | media/formats/webm/webm_parser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/formats/webm/webm_parser.h
diff --git a/media/formats/webm/webm_parser.h b/media/formats/webm/webm_parser.h
index 854db685f8812c156c66fcab38787e324b2f2600..3af81ea1bbaa025af721969a503c3d0092f93ee7 100644
--- a/media/formats/webm/webm_parser.h
+++ b/media/formats/webm/webm_parser.h
@@ -5,10 +5,12 @@
#ifndef MEDIA_FORMATS_WEBM_WEBM_PARSER_H_
#define MEDIA_FORMATS_WEBM_WEBM_PARSER_H_
+#include <stdint.h>
+
#include <string>
#include <vector>
-#include "base/basictypes.h"
+#include "base/macros.h"
#include "media/base/media_export.h"
namespace media {
@@ -31,9 +33,9 @@ class MEDIA_EXPORT WebMParserClient {
virtual WebMParserClient* OnListStart(int id);
virtual bool OnListEnd(int id);
- virtual bool OnUInt(int id, int64 val);
+ virtual bool OnUInt(int id, int64_t val);
virtual bool OnFloat(int id, double val);
- virtual bool OnBinary(int id, const uint8* data, int size);
+ virtual bool OnBinary(int id, const uint8_t* data, int size);
virtual bool OnString(int id, const std::string& str);
protected:
@@ -64,7 +66,7 @@ class MEDIA_EXPORT WebMListParser {
// Returns < 0 if the parse fails.
// Returns 0 if more data is needed.
// Returning > 0 indicates success & the number of bytes parsed.
- int Parse(const uint8* buf, int size);
+ int Parse(const uint8_t* buf, int size);
// Returns true if the entire list has been parsed.
bool IsParsingComplete() const;
@@ -79,8 +81,8 @@ class MEDIA_EXPORT WebMListParser {
struct ListState {
int id_;
- int64 size_;
- int64 bytes_parsed_;
+ int64_t size_;
+ int64_t bytes_parsed_;
const ListElementInfo* element_info_;
WebMParserClient* client_;
};
@@ -100,8 +102,10 @@ class MEDIA_EXPORT WebMListParser {
// Returns 0 if more data is needed.
// Returning > 0 indicates success & the number of bytes parsed.
int ParseListElement(int header_size,
- int id, int64 element_size,
- const uint8* data, int size);
+ int id,
+ int64_t element_size,
+ const uint8_t* data,
+ int size);
// Called when starting to parse a new list.
//
@@ -111,7 +115,7 @@ class MEDIA_EXPORT WebMListParser {
//
// Returns true if this list can be started in the current context. False
// if starting this list causes some sort of parse error.
- bool OnListStart(int id, int64 size);
+ bool OnListStart(int id, int64_t size);
// Called when the end of the current list has been reached. This may also
// signal the end of the current list's ancestors if the current list happens
@@ -150,8 +154,10 @@ class MEDIA_EXPORT WebMListParser {
// |*id| contains the element ID on success and is undefined otherwise.
// |*element_size| contains the element size on success and is undefined
// otherwise.
-int MEDIA_EXPORT WebMParseElementHeader(const uint8* buf, int size,
- int* id, int64* element_size);
+int MEDIA_EXPORT WebMParseElementHeader(const uint8_t* buf,
+ int size,
+ int* id,
+ int64_t* element_size);
} // namespace media
« no previous file with comments | « media/filters/chunk_demuxer.cc ('k') | media/formats/webm/webm_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698