| Index: webrtc/modules/video_coding/test/rtp_player.cc
|
| diff --git a/webrtc/modules/video_coding/test/rtp_player.cc b/webrtc/modules/video_coding/test/rtp_player.cc
|
| index 42cc61f782dc074b1ffd6f0c218cfda140f911eb..a6d8e0e2fba4b716332049ecd136cc25b6e73b9d 100644
|
| --- a/webrtc/modules/video_coding/test/rtp_player.cc
|
| +++ b/webrtc/modules/video_coding/test/rtp_player.cc
|
| @@ -88,7 +88,7 @@ class LostPackets {
|
| ~LostPackets() {
|
| if (debug_file_) {
|
| fclose(debug_file_);
|
| - debug_file_ = NULL;
|
| + debug_file_ = nullptr;
|
| }
|
| while (!packets_.empty()) {
|
| delete packets_.back();
|
| @@ -137,7 +137,7 @@ class LostPackets {
|
| return packet;
|
| }
|
| }
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| int NumberOfPacketsToResend() const {
|
| @@ -215,7 +215,7 @@ class SsrcHandlers {
|
| std::unique_ptr<Handler> handler(
|
| new Handler(ssrc, payload_types_, lost_packets));
|
| handler->payload_sink_.reset(payload_sink_factory_->Create(handler.get()));
|
| - if (handler->payload_sink_.get() == NULL) {
|
| + if (handler->payload_sink_.get() == nullptr) {
|
| return -1;
|
| }
|
|
|
| @@ -223,9 +223,9 @@ class SsrcHandlers {
|
| configuration.clock = clock;
|
| configuration.audio = false;
|
| handler->rtp_module_.reset(RtpReceiver::CreateVideoReceiver(
|
| - configuration.clock, handler->payload_sink_.get(), NULL,
|
| + configuration.clock, handler->payload_sink_.get(), nullptr,
|
| handler->rtp_payload_registry_.get()));
|
| - if (handler->rtp_module_.get() == NULL) {
|
| + if (handler->rtp_module_.get() == nullptr) {
|
| return -1;
|
| }
|
|
|
| @@ -349,7 +349,8 @@ class RtpPlayerImpl : public RtpPlayerInterface {
|
| virtual int NextPacket(int64_t time_now) {
|
| // Send any packets ready to be resent.
|
| for (RawRtpPacket* packet = lost_packets_.NextPacketToResend(time_now);
|
| - packet != NULL; packet = lost_packets_.NextPacketToResend(time_now)) {
|
| + packet != nullptr;
|
| + packet = lost_packets_.NextPacketToResend(time_now)) {
|
| int ret = SendPacket(packet->data(), packet->length());
|
| if (ret > 0) {
|
| printf("Resend: %08x:%u\n", packet->ssrc(), packet->seq_num());
|
| @@ -372,7 +373,7 @@ class RtpPlayerImpl : public RtpPlayerInterface {
|
| first_packet_ = false;
|
| }
|
|
|
| - if (reordering_ && reorder_buffer_.get() == NULL) {
|
| + if (reordering_ && reorder_buffer_.get() == nullptr) {
|
| reorder_buffer_.reset(
|
| new RawRtpPacket(next_packet_.data, next_packet_.length, 0, 0));
|
| return 0;
|
| @@ -380,7 +381,7 @@ class RtpPlayerImpl : public RtpPlayerInterface {
|
| int ret = SendPacket(next_packet_.data, next_packet_.length);
|
| if (reorder_buffer_.get()) {
|
| SendPacket(reorder_buffer_->data(), reorder_buffer_->length());
|
| - reorder_buffer_.reset(NULL);
|
| + reorder_buffer_.reset(nullptr);
|
| }
|
| if (ret < 0) {
|
| return ret;
|
| @@ -476,11 +477,11 @@ RtpPlayerInterface* Create(const std::string& input_filename,
|
| std::unique_ptr<test::RtpFileReader> packet_source(
|
| test::RtpFileReader::Create(test::RtpFileReader::kRtpDump,
|
| input_filename));
|
| - if (packet_source.get() == NULL) {
|
| + if (packet_source.get() == nullptr) {
|
| packet_source.reset(test::RtpFileReader::Create(test::RtpFileReader::kPcap,
|
| input_filename));
|
| - if (packet_source.get() == NULL) {
|
| - return NULL;
|
| + if (packet_source.get() == nullptr) {
|
| + return nullptr;
|
| }
|
| }
|
|
|
|
|