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

Unified Diff: media/base/byte_queue.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/byte_queue.cc
diff --git a/media/base/byte_queue.cc b/media/base/byte_queue.cc
index 534b55225ec88f727a5628bf5c037862b0b6f5ae..263f82a1398d776fc1d8c8b939967be455cccc3b 100644
--- a/media/base/byte_queue.cc
+++ b/media/base/byte_queue.cc
@@ -12,11 +12,10 @@ namespace media {
enum { kDefaultQueueSize = 1024 };
ByteQueue::ByteQueue()
- : buffer_(new uint8[kDefaultQueueSize]),
+ : buffer_(new uint8_t[kDefaultQueueSize]),
size_(kDefaultQueueSize),
offset_(0),
- used_(0) {
-}
+ used_(0) {}
ByteQueue::~ByteQueue() {}
@@ -25,7 +24,7 @@ void ByteQueue::Reset() {
used_ = 0;
}
-void ByteQueue::Push(const uint8* data, int size) {
+void ByteQueue::Push(const uint8_t* data, int size) {
DCHECK(data);
DCHECK_GT(size, 0);
@@ -40,7 +39,7 @@ void ByteQueue::Push(const uint8* data, int size) {
// Sanity check to make sure we didn't overflow.
CHECK_GT(new_size, size_);
- scoped_ptr<uint8[]> new_buffer(new uint8[new_size]);
+ scoped_ptr<uint8_t[]> new_buffer(new uint8_t[new_size]);
// Copy the data from the old buffer to the start of the new one.
if (used_ > 0)
@@ -59,7 +58,7 @@ void ByteQueue::Push(const uint8* data, int size) {
used_ += size;
}
-void ByteQueue::Peek(const uint8** data, int* size) const {
+void ByteQueue::Peek(const uint8_t** data, int* size) const {
DCHECK(data);
DCHECK(size);
*data = front();
@@ -79,6 +78,8 @@ void ByteQueue::Pop(int count) {
}
}
-uint8* ByteQueue::front() const { return buffer_.get() + offset_; }
+uint8_t* ByteQueue::front() const {
+ return buffer_.get() + offset_;
+}
} // namespace media

Powered by Google App Engine
This is Rietveld 408576698