Index: media/formats/common/offset_byte_queue.h |
diff --git a/media/formats/common/offset_byte_queue.h b/media/formats/common/offset_byte_queue.h |
index 0996f073463fbfee22267fe581e650284d9f9190..326609d47acf80b1e63f0c6a8ec0b9e5c481091b 100644 |
--- a/media/formats/common/offset_byte_queue.h |
+++ b/media/formats/common/offset_byte_queue.h |
@@ -5,7 +5,6 @@ |
#ifndef MEDIA_FORMATS_COMMON_OFFSET_BYTE_QUEUE_H_ |
#define MEDIA_FORMATS_COMMON_OFFSET_BYTE_QUEUE_H_ |
-#include "base/basictypes.h" |
#include "media/base/byte_queue.h" |
#include "media/base/media_export.h" |
@@ -22,8 +21,8 @@ class MEDIA_EXPORT OffsetByteQueue { |
// These work like their underlying ByteQueue counterparts. |
void Reset(); |
- void Push(const uint8* buf, int size); |
- void Peek(const uint8** buf, int* size); |
+ void Push(const uint8_t* buf, int size); |
+ void Peek(const uint8_t** buf, int* size); |
void Pop(int count); |
// Sets |buf| to point at the first buffered byte corresponding to |offset|, |
@@ -32,7 +31,7 @@ class MEDIA_EXPORT OffsetByteQueue { |
// It is an error if the offset is before the current head. It's not an error |
// if the current offset is beyond tail(), but you will of course get back |
// a null |buf| and a |size| of zero. |
- void PeekAt(int64 offset, const uint8** buf, int* size); |
+ void PeekAt(int64_t offset, const uint8_t** buf, int* size); |
// Marks the bytes up to (but not including) |max_offset| as ready for |
// deletion. This is relatively inexpensive, but will not necessarily reduce |
@@ -42,21 +41,21 @@ class MEDIA_EXPORT OffsetByteQueue { |
// including the case where |max_offset| is less than the current head. |
// Returns false if |max_offset| > tail() (although all bytes currently |
// buffered are still cleared). |
- bool Trim(int64 max_offset); |
+ bool Trim(int64_t max_offset); |
// The head and tail positions, in terms of the file's absolute offsets. |
// tail() is an exclusive bound. |
- int64 head() { return head_; } |
- int64 tail() { return head_ + size_; } |
+ int64_t head() { return head_; } |
+ int64_t tail() { return head_ + size_; } |
private: |
// Synchronize |buf_| and |size_| with |queue_|. |
void Sync(); |
ByteQueue queue_; |
- const uint8* buf_; |
+ const uint8_t* buf_; |
int size_; |
- int64 head_; |
+ int64_t head_; |
DISALLOW_COPY_AND_ASSIGN(OffsetByteQueue); |
}; |