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

Unified Diff: media/base/seekable_buffer.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/base/seekable_buffer.cc
diff --git a/media/base/seekable_buffer.cc b/media/base/seekable_buffer.cc
index 60edb59101c7126cb4b1814fe75086ad74dfa957..1494559b4f682c331df3706195122a47cd1d088b 100644
--- a/media/base/seekable_buffer.cc
+++ b/media/base/seekable_buffer.cc
@@ -34,17 +34,17 @@ void SeekableBuffer::Clear() {
current_time_ = kNoTimestamp();
}
-int SeekableBuffer::Read(uint8* data, int size) {
+int SeekableBuffer::Read(uint8_t* data, int size) {
DCHECK(data);
return InternalRead(data, size, true, 0);
}
-int SeekableBuffer::Peek(uint8* data, int size, int forward_offset) {
+int SeekableBuffer::Peek(uint8_t* data, int size, int forward_offset) {
DCHECK(data);
return InternalRead(data, size, false, forward_offset);
}
-bool SeekableBuffer::GetCurrentChunk(const uint8** data, int* size) const {
+bool SeekableBuffer::GetCurrentChunk(const uint8_t** data, int* size) const {
BufferQueue::iterator current_buffer = current_buffer_;
int current_buffer_offset = current_buffer_offset_;
// Advance position if we are in the end of the current buffer.
@@ -87,7 +87,7 @@ bool SeekableBuffer::Append(const scoped_refptr<DataBuffer>& buffer_in) {
return true;
}
-bool SeekableBuffer::Append(const uint8* data, int size) {
+bool SeekableBuffer::Append(const uint8_t* data, int size) {
if (size > 0) {
scoped_refptr<DataBuffer> data_buffer = DataBuffer::CopyFrom(data, size);
return Append(data_buffer);
@@ -97,7 +97,7 @@ bool SeekableBuffer::Append(const uint8* data, int size) {
}
}
-bool SeekableBuffer::Seek(int32 offset) {
+bool SeekableBuffer::Seek(int32_t offset) {
if (offset > 0)
return SeekForward(offset);
else if (offset < 0)
@@ -180,7 +180,8 @@ void SeekableBuffer::EvictBackwardBuffers() {
}
}
-int SeekableBuffer::InternalRead(uint8* data, int size,
+int SeekableBuffer::InternalRead(uint8_t* data,
+ int size,
bool advance_position,
int forward_offset) {
// Counts how many bytes are actually read from the buffer queue.
@@ -267,8 +268,8 @@ void SeekableBuffer::UpdateCurrentTime(BufferQueue::iterator buffer,
// Garbage values are unavoidable, so this check will remain.
if (buffer != buffers_.end() &&
(*buffer)->timestamp() != kNoTimestamp()) {
- int64 time_offset = ((*buffer)->duration().InMicroseconds() * offset) /
- (*buffer)->data_size();
+ int64_t time_offset = ((*buffer)->duration().InMicroseconds() * offset) /
+ (*buffer)->data_size();
current_time_ = (*buffer)->timestamp() +
base::TimeDelta::FromMicroseconds(time_offset);

Powered by Google App Engine
This is Rietveld 408576698