| Index: media/formats/common/offset_byte_queue.cc
|
| diff --git a/media/formats/common/offset_byte_queue.cc b/media/formats/common/offset_byte_queue.cc
|
| index 0bbff80c7cf242ced75c0ae20cf3f74e797ecd6e..032ac1f2463f7d28447d6c5b5117c2bb039fe56b 100644
|
| --- a/media/formats/common/offset_byte_queue.cc
|
| +++ b/media/formats/common/offset_byte_queue.cc
|
| @@ -18,13 +18,13 @@ void OffsetByteQueue::Reset() {
|
| head_ = 0;
|
| }
|
|
|
| -void OffsetByteQueue::Push(const uint8* buf, int size) {
|
| +void OffsetByteQueue::Push(const uint8_t* buf, int size) {
|
| queue_.Push(buf, size);
|
| Sync();
|
| DVLOG(4) << "Buffer pushed. head=" << head() << " tail=" << tail();
|
| }
|
|
|
| -void OffsetByteQueue::Peek(const uint8** buf, int* size) {
|
| +void OffsetByteQueue::Peek(const uint8_t** buf, int* size) {
|
| *buf = size_ > 0 ? buf_ : NULL;
|
| *size = size_;
|
| }
|
| @@ -35,7 +35,7 @@ void OffsetByteQueue::Pop(int count) {
|
| Sync();
|
| }
|
|
|
| -void OffsetByteQueue::PeekAt(int64 offset, const uint8** buf, int* size) {
|
| +void OffsetByteQueue::PeekAt(int64_t offset, const uint8_t** buf, int* size) {
|
| DCHECK(offset >= head());
|
| if (offset < head() || offset >= tail()) {
|
| *buf = NULL;
|
| @@ -46,7 +46,7 @@ void OffsetByteQueue::PeekAt(int64 offset, const uint8** buf, int* size) {
|
| *size = tail() - offset;
|
| }
|
|
|
| -bool OffsetByteQueue::Trim(int64 max_offset) {
|
| +bool OffsetByteQueue::Trim(int64_t max_offset) {
|
| if (max_offset < head_) return true;
|
| if (max_offset > tail()) {
|
| Pop(size_);
|
|
|