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

Side by Side Diff: webrtc/modules/audio_coding/acm2/audio_coding_module.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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 expected_codec_ts_(0xD87F3F9F), 448 expected_codec_ts_(0xD87F3F9F),
449 expected_in_ts_(0xD87F3F9F), 449 expected_in_ts_(0xD87F3F9F),
450 receiver_(config), 450 receiver_(config),
451 bitrate_logger_("WebRTC.Audio.TargetBitrateInKbps"), 451 bitrate_logger_("WebRTC.Audio.TargetBitrateInKbps"),
452 encoder_factory_(new EncoderFactory), 452 encoder_factory_(new EncoderFactory),
453 encoder_stack_(nullptr), 453 encoder_stack_(nullptr),
454 previous_pltype_(255), 454 previous_pltype_(255),
455 receiver_initialized_(false), 455 receiver_initialized_(false),
456 first_10ms_data_(false), 456 first_10ms_data_(false),
457 first_frame_(true), 457 first_frame_(true),
458 packetization_callback_(NULL), 458 packetization_callback_(nullptr),
459 vad_callback_(NULL), 459 vad_callback_(nullptr),
460 codec_histogram_bins_log_(), 460 codec_histogram_bins_log_(),
461 number_of_consecutive_empty_packets_(0) { 461 number_of_consecutive_empty_packets_(0) {
462 if (InitializeReceiverSafe() < 0) { 462 if (InitializeReceiverSafe() < 0) {
463 WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, id_, 463 WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, id_,
464 "Cannot initialize receiver"); 464 "Cannot initialize receiver");
465 } 465 }
466 WEBRTC_TRACE(webrtc::kTraceMemory, webrtc::kTraceAudioCoding, id_, "Created"); 466 WEBRTC_TRACE(webrtc::kTraceMemory, webrtc::kTraceAudioCoding, id_, "Created");
467 } 467 }
468 468
469 AudioCodingModuleImpl::~AudioCodingModuleImpl() = default; 469 AudioCodingModuleImpl::~AudioCodingModuleImpl() = default;
(...skipping 906 matching lines...) Expand 10 before | Expand all | Expand 10 after
1376 // Checks the validity of the parameters of the given codec 1376 // Checks the validity of the parameters of the given codec
1377 bool AudioCodingModule::IsCodecValid(const CodecInst& codec) { 1377 bool AudioCodingModule::IsCodecValid(const CodecInst& codec) {
1378 bool valid = acm2::RentACodec::IsCodecValid(codec); 1378 bool valid = acm2::RentACodec::IsCodecValid(codec);
1379 if (!valid) 1379 if (!valid)
1380 WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, -1, 1380 WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceAudioCoding, -1,
1381 "Invalid codec setting"); 1381 "Invalid codec setting");
1382 return valid; 1382 return valid;
1383 } 1383 }
1384 1384
1385 } // namespace webrtc 1385 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698