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

Unified Diff: content/common/gpu/media/vt_video_decode_accelerator.cc

Issue 649533003: C++11 declares a type safe null pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Presubmit errors Created 6 years, 2 months 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: content/common/gpu/media/vt_video_decode_accelerator.cc
diff --git a/content/common/gpu/media/vt_video_decode_accelerator.cc b/content/common/gpu/media/vt_video_decode_accelerator.cc
index 8fb0b834bbfc0649e20ebf486f5a40964ea7035b..9f3ee3de73732476cabf3042ffc10bc290addf8c 100644
--- a/content/common/gpu/media/vt_video_decode_accelerator.cc
+++ b/content/common/gpu/media/vt_video_decode_accelerator.cc
@@ -68,9 +68,9 @@ VTVideoDecodeAccelerator::PendingAction::~PendingAction() {
VTVideoDecodeAccelerator::VTVideoDecodeAccelerator(CGLContextObj cgl_context)
: cgl_context_(cgl_context),
- client_(NULL),
- format_(NULL),
- session_(NULL),
+ client_(nullptr),
+ format_(nullptr),
+ session_(nullptr),
gpu_task_runner_(base::ThreadTaskRunnerHandle::Get()),
weak_this_factory_(this),
decoder_thread_("VTDecoderThread") {
@@ -253,7 +253,7 @@ void VTVideoDecodeAccelerator::DecodeTask(
gpu_task_runner_->PostTask(FROM_HERE, base::Bind(
&VTVideoDecodeAccelerator::OutputTask,
weak_this_factory_.GetWeakPtr(),
- DecodedFrame(bitstream.id(), NULL)));
+ DecodedFrame(bitstream.id(), nullptr)));
return;
}
@@ -261,10 +261,10 @@ void VTVideoDecodeAccelerator::DecodeTask(
base::ScopedCFTypeRef<CMBlockBufferRef> data;
CHECK(!CMBlockBufferCreateWithMemoryBlock(
kCFAllocatorDefault,
- NULL, // &memory_block
+ nullptr, // &memory_block
data_size, // block_length
kCFAllocatorDefault, // block_allocator
- NULL, // &custom_block_source
+ nullptr, // &custom_block_source
0, // offset_to_data
data_size, // data_length
0, // flags
@@ -288,14 +288,14 @@ void VTVideoDecodeAccelerator::DecodeTask(
kCFAllocatorDefault,
data, // data_buffer
true, // data_ready
- NULL, // make_data_ready_callback
- NULL, // make_data_ready_refcon
+ nullptr, // make_data_ready_callback
+ nullptr, // make_data_ready_refcon
format_, // format_description
1, // num_samples
0, // num_sample_timing_entries
- NULL, // &sample_timing_array
+ nullptr, // &sample_timing_array
0, // num_sample_size_entries
- NULL, // &sample_size_array
+ nullptr, // &sample_size_array
frame.InitializeInto()));
// Asynchronous Decompression allows for parallel submission of frames
@@ -311,7 +311,7 @@ void VTVideoDecodeAccelerator::DecodeTask(
frame, // sample_buffer
decode_flags, // decode_flags
reinterpret_cast<void*>(bitstream_id), // source_frame_refcon
- NULL)); // &info_flags_out
+ nullptr)); // &info_flags_out
}
// This method may be called on any VideoToolbox thread.
« no previous file with comments | « content/common/gpu/media/video_encode_accelerator_unittest.cc ('k') | content/common/gpu/stream_texture_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698