Index: media/video/gpu_memory_buffer_video_frame_pool.cc |
diff --git a/media/video/gpu_memory_buffer_video_frame_pool.cc b/media/video/gpu_memory_buffer_video_frame_pool.cc |
index 4b23aada39c40c49110f39fe84888c67ad34d227..1e6f1fc791e7564de62dd00e41a7a58e2b3b98a0 100644 |
--- a/media/video/gpu_memory_buffer_video_frame_pool.cc |
+++ b/media/video/gpu_memory_buffer_video_frame_pool.cc |
@@ -225,9 +225,9 @@ int RowsPerCopy(size_t plane, VideoPixelFormat format, int width) { |
void CopyRowsToI420Buffer(int first_row, |
int rows, |
int bytes_per_row, |
- const uint8* source, |
+ const uint8_t* source, |
int source_stride, |
- uint8* output, |
+ uint8_t* output, |
int dest_stride, |
const base::Closure& done) { |
TRACE_EVENT2("media", "CopyRowsToI420Buffer", "bytes_per_row", bytes_per_row, |
@@ -248,9 +248,9 @@ void CopyRowsToNV12Buffer(int first_row, |
int rows, |
int bytes_per_row, |
const scoped_refptr<VideoFrame>& source_frame, |
- uint8* dest_y, |
+ uint8_t* dest_y, |
int dest_stride_y, |
- uint8* dest_uv, |
+ uint8_t* dest_uv, |
int dest_stride_uv, |
const base::Closure& done) { |
TRACE_EVENT2("media", "CopyRowsToNV12Buffer", "bytes_per_row", bytes_per_row, |
@@ -283,7 +283,7 @@ void CopyRowsToUYVYBuffer(int first_row, |
int rows, |
int width, |
const scoped_refptr<VideoFrame>& source_frame, |
- uint8* output, |
+ uint8_t* output, |
int dest_stride, |
const base::Closure& done) { |
TRACE_EVENT2("media", "CopyRowsToUYVYBuffer", "bytes_per_row", width * 2, |
@@ -391,7 +391,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHardwareFrame( |
bool GpuMemoryBufferVideoFramePool::PoolImpl::OnMemoryDump( |
const base::trace_event::MemoryDumpArgs& args, |
base::trace_event::ProcessMemoryDump* pmd) { |
- const uint64 tracing_process_id = |
+ const uint64_t tracing_process_id = |
base::trace_event::MemoryDumpManager::GetInstance() |
->GetTracingProcessId(); |
const int kImportance = 2; |