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

Side by Side Diff: webrtc/video/video_decoder.cc

Issue 1855433002: Replace NULL with nullptr in webrtc/video. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: replace x == nullptr with !x Created 4 years, 8 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 unified diff | Download patch
« no previous file with comments | « webrtc/video/video_capture_input_unittest.cc ('k') | webrtc/video/video_quality_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 RTC_CHECK(decoder_type_ != kUnsupportedCodec) 67 RTC_CHECK(decoder_type_ != kUnsupportedCodec)
68 << "Decoder requesting fallback to codec not supported in software."; 68 << "Decoder requesting fallback to codec not supported in software.";
69 LOG(LS_WARNING) << "Decoder falling back to software decoding."; 69 LOG(LS_WARNING) << "Decoder falling back to software decoding.";
70 fallback_decoder_.reset(VideoDecoder::Create(decoder_type_)); 70 fallback_decoder_.reset(VideoDecoder::Create(decoder_type_));
71 if (fallback_decoder_->InitDecode(&codec_settings_, number_of_cores_) != 71 if (fallback_decoder_->InitDecode(&codec_settings_, number_of_cores_) !=
72 WEBRTC_VIDEO_CODEC_OK) { 72 WEBRTC_VIDEO_CODEC_OK) {
73 LOG(LS_ERROR) << "Failed to initialize software-decoder fallback."; 73 LOG(LS_ERROR) << "Failed to initialize software-decoder fallback.";
74 fallback_decoder_.reset(); 74 fallback_decoder_.reset();
75 return false; 75 return false;
76 } 76 }
77 if (callback_ != nullptr) 77 if (callback_)
78 fallback_decoder_->RegisterDecodeCompleteCallback(callback_); 78 fallback_decoder_->RegisterDecodeCompleteCallback(callback_);
79 fallback_implementation_name_ = 79 fallback_implementation_name_ =
80 std::string(fallback_decoder_->ImplementationName()) + 80 std::string(fallback_decoder_->ImplementationName()) +
81 " (fallback from: " + decoder_->ImplementationName() + ")"; 81 " (fallback from: " + decoder_->ImplementationName() + ")";
82 return true; 82 return true;
83 } 83 }
84 84
85 int32_t VideoDecoderSoftwareFallbackWrapper::Decode( 85 int32_t VideoDecoderSoftwareFallbackWrapper::Decode(
86 const EncodedImage& input_image, 86 const EncodedImage& input_image,
87 bool missing_frames, 87 bool missing_frames,
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 166
167 int32_t NullVideoDecoder::Release() { 167 int32_t NullVideoDecoder::Release() {
168 return WEBRTC_VIDEO_CODEC_OK; 168 return WEBRTC_VIDEO_CODEC_OK;
169 } 169 }
170 170
171 const char* NullVideoDecoder::ImplementationName() const { 171 const char* NullVideoDecoder::ImplementationName() const {
172 return "NullVideoDecoder"; 172 return "NullVideoDecoder";
173 } 173 }
174 174
175 } // namespace webrtc 175 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/video_capture_input_unittest.cc ('k') | webrtc/video/video_quality_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698