| Index: webrtc/modules/audio_coding/test/insert_packet_with_timing.cc
|
| diff --git a/webrtc/modules/audio_coding/test/insert_packet_with_timing.cc b/webrtc/modules/audio_coding/test/insert_packet_with_timing.cc
|
| index 44ef9df7d9fa94f03461b57077560dcf298fe0dd..d4ab0286c7cd0722d689479e755e82ac418008aa 100644
|
| --- a/webrtc/modules/audio_coding/test/insert_packet_with_timing.cc
|
| +++ b/webrtc/modules/audio_coding/test/insert_packet_with_timing.cc
|
| @@ -74,18 +74,18 @@ class InsertPacketWithTiming {
|
| playout_timing_fid_(fopen("playout_timing.txt", "wt")) {}
|
|
|
| void SetUp() {
|
| - ASSERT_TRUE(sender_clock_ != NULL);
|
| - ASSERT_TRUE(receiver_clock_ != NULL);
|
| + ASSERT_TRUE(sender_clock_ != nullptr);
|
| + ASSERT_TRUE(receiver_clock_ != nullptr);
|
|
|
| - ASSERT_TRUE(send_acm_.get() != NULL);
|
| - ASSERT_TRUE(receive_acm_.get() != NULL);
|
| - ASSERT_TRUE(channel_ != NULL);
|
| + ASSERT_TRUE(send_acm_.get() != nullptr);
|
| + ASSERT_TRUE(receive_acm_.get() != nullptr);
|
| + ASSERT_TRUE(channel_ != nullptr);
|
|
|
| - ASSERT_TRUE(seq_num_fid_ != NULL);
|
| - ASSERT_TRUE(send_ts_fid_ != NULL);
|
| - ASSERT_TRUE(receive_ts_fid_ != NULL);
|
| + ASSERT_TRUE(seq_num_fid_ != nullptr);
|
| + ASSERT_TRUE(send_ts_fid_ != nullptr);
|
| + ASSERT_TRUE(receive_ts_fid_ != nullptr);
|
|
|
| - ASSERT_TRUE(playout_timing_fid_ != NULL);
|
| + ASSERT_TRUE(playout_timing_fid_ != nullptr);
|
|
|
| next_receive_ts_ = ReceiveTimestamp();
|
|
|
| @@ -119,7 +119,7 @@ class InsertPacketWithTiming {
|
| pcm_in_fid_.ReadStereo(FLAGS_input_stereo);
|
| }
|
|
|
| - ASSERT_TRUE(pcm_out_fid_ != NULL);
|
| + ASSERT_TRUE(pcm_out_fid_ != nullptr);
|
| std::cout << "Output file " << FLAGS_output << " at " << FLAGS_output_fs_hz
|
| << " Hz." << std::endl;
|
|
|
| @@ -283,10 +283,10 @@ int main(int argc, char* argv[]) {
|
| webrtc::InsertPacketWithTiming test;
|
| test.SetUp();
|
|
|
| - FILE* delay_log = NULL;
|
| + FILE* delay_log = nullptr;
|
| if (FLAGS_delay.size() > 0) {
|
| delay_log = fopen(FLAGS_delay.c_str(), "wt");
|
| - if (delay_log == NULL) {
|
| + if (delay_log == nullptr) {
|
| std::cout << "Cannot open the file to log delay values." << std::endl;
|
| exit(1);
|
| }
|
| @@ -300,13 +300,13 @@ int main(int argc, char* argv[]) {
|
|
|
| if (action_taken != 0) {
|
| test.Delay(&optimal_delay_ms, ¤t_delay_ms);
|
| - if (delay_log != NULL) {
|
| + if (delay_log != nullptr) {
|
| fprintf(delay_log, "%3d %3d\n", optimal_delay_ms, current_delay_ms);
|
| }
|
| }
|
| }
|
| std::cout << std::endl;
|
| test.TearDown();
|
| - if (delay_log != NULL)
|
| + if (delay_log != nullptr)
|
| fclose(delay_log);
|
| }
|
|
|