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

Unified Diff: webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc

Issue 2685783014: Replace NULL with nullptr in all C++ files. (Closed)
Patch Set: Fixing android. Created 3 years, 10 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: webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc
diff --git a/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc b/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc
index c89f902a62a449703c396223a97a78872eeae29e..30d2b8c508b7edde01482674fda9917374656534 100644
--- a/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc
+++ b/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc
@@ -74,11 +74,11 @@ class MediaCodecVideoDecoder : public webrtc::VideoDecoder,
int32_t InitDecode(const VideoCodec* codecSettings, int32_t numberOfCores)
override;
- int32_t Decode(
- const EncodedImage& inputImage, bool missingFrames,
- const RTPFragmentationHeader* fragmentation,
- const CodecSpecificInfo* codecSpecificInfo = NULL,
- int64_t renderTimeMs = -1) override;
+ int32_t Decode(const EncodedImage& inputImage,
+ bool missingFrames,
+ const RTPFragmentationHeader* fragmentation,
+ const CodecSpecificInfo* codecSpecificInfo = nullptr,
+ int64_t renderTimeMs = -1) override;
int32_t RegisterDecodeCompleteCallback(DecodedImageCallback* callback)
override;
@@ -195,7 +195,7 @@ MediaCodecVideoDecoder::MediaCodecVideoDecoder(
"<init>",
"()V"))) {
ScopedLocalRefFrame local_ref_frame(jni);
- codec_thread_->SetName("MediaCodecVideoDecoder", NULL);
+ codec_thread_->SetName("MediaCodecVideoDecoder", nullptr);
RTC_CHECK(codec_thread_->Start()) << "Failed to start MediaCodecVideoDecoder";
j_init_decode_method_ = GetMethodID(
@@ -272,7 +272,7 @@ MediaCodecVideoDecoder::MediaCodecVideoDecoder(
jni, j_decoded_output_buffer_class, "decodeTimeMs", "J");
CHECK_EXCEPTION(jni) << "MediaCodecVideoDecoder ctor failed";
- use_surface_ = (render_egl_context_ != NULL);
+ use_surface_ = (render_egl_context_ != nullptr);
ALOGD << "MediaCodecVideoDecoder ctor. Use surface: " << use_surface_;
memset(&codec_, 0, sizeof(codec_));
AllowBlockingCalls();
@@ -286,8 +286,8 @@ MediaCodecVideoDecoder::~MediaCodecVideoDecoder() {
int32_t MediaCodecVideoDecoder::InitDecode(const VideoCodec* inst,
int32_t numberOfCores) {
ALOGD << "InitDecode.";
- if (inst == NULL) {
- ALOGE << "NULL VideoCodec instance";
+ if (inst == nullptr) {
+ ALOGE << "null VideoCodec instance";
return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
}
// Factory should guard against other codecs being used with us.
@@ -514,11 +514,11 @@ int32_t MediaCodecVideoDecoder::Decode(
ALOGE << "Decode() - fallback to SW codec";
return WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE;
}
- if (callback_ == NULL) {
- ALOGE << "Decode() - callback_ is NULL";
+ if (callback_ == nullptr) {
+ ALOGE << "Decode() - callback_ is null";
return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
}
- if (inputImage._buffer == NULL && inputImage._length > 0) {
+ if (inputImage._buffer == nullptr && inputImage._length > 0) {
ALOGE << "Decode() - inputImage is incorrect";
return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
}

Powered by Google App Engine
This is Rietveld 408576698