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

Unified Diff: content/common/gpu/media/android_video_encode_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/android_video_encode_accelerator.cc
diff --git a/content/common/gpu/media/android_video_encode_accelerator.cc b/content/common/gpu/media/android_video_encode_accelerator.cc
index 2507ea41c1f9b3c6782adc3681186827433da991..bbfde2e083d08e540015d03eda8c44ffe02ce8ed 100644
--- a/content/common/gpu/media/android_video_encode_accelerator.cc
+++ b/content/common/gpu/media/android_video_encode_accelerator.cc
@@ -287,7 +287,7 @@ void AndroidVideoEncodeAccelerator::QueueInput() {
}
scoped_refptr<VideoFrame> frame = input.a;
- uint8* buffer = NULL;
+ uint8* buffer = nullptr;
size_t capacity = 0;
media_codec_->GetInputBuffer(input_buf_index, &buffer, &capacity);
@@ -320,7 +320,7 @@ void AndroidVideoEncodeAccelerator::QueueInput() {
fake_input_timestamp_ += base::TimeDelta::FromMicroseconds(1);
status = media_codec_->QueueInputBuffer(
- input_buf_index, NULL, queued_size, fake_input_timestamp_);
+ input_buf_index, nullptr, queued_size, fake_input_timestamp_);
UMA_HISTOGRAM_TIMES("Media.AVEA.InputQueueTime", base::Time::Now() - input.c);
RETURN_ON_FAILURE(status == media::MEDIA_CODEC_OK,
"Failed to QueueInputBuffer: " << status,
@@ -356,7 +356,8 @@ void AndroidVideoEncodeAccelerator::DequeueOutput() {
bool key_frame = false;
do {
media::MediaCodecStatus status = media_codec_->DequeueOutputBuffer(
- NoWaitTimeOut(), &buf_index, &offset, &size, NULL, NULL, &key_frame);
+ NoWaitTimeOut(), &buf_index, &offset, &size, nullptr, nullptr,
+ &key_frame);
switch (status) {
case media::MEDIA_CODEC_DEQUEUE_OUTPUT_AGAIN_LATER:
return;

Powered by Google App Engine
This is Rietveld 408576698