Remove webrtc/base/scoped_ptr.h

This is a re-land of https://codereview.webrtc.org/1942823002

TBR=tommi@webrtc.org
BUG=webrtc:5520

Review-Url: https://codereview.webrtc.org/1966423002
Cr-Commit-Position: refs/heads/master@{#12750}
This commit is contained in:
kwiberg
2016-05-14 19:44:11 -07:00
committed by Commit bot
parent c06b133b29
commit fd8be3468a
77 changed files with 33 additions and 139 deletions

View File

@ -14,7 +14,6 @@
#include <vector>
#include "webrtc/base/criticalsection.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/thread_annotations.h"
#include "webrtc/modules/include/module_common_types.h"
#include "webrtc/modules/video_coding/packet.h"

View File

@ -13,12 +13,12 @@
#include <array>
#include <map>
#include <memory>
#include <queue>
#include <set>
#include <utility>
#include "webrtc/base/criticalsection.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/thread_annotations.h"
#include "webrtc/modules/include/module_common_types.h"
#include "webrtc/modules/video_coding/sequence_number_util.h"

View File

@ -12,6 +12,7 @@
#include <stdio.h>
#include <cstdlib>
#include <map>
#include <memory>
@ -341,7 +342,7 @@ class RtpPlayerImpl : public RtpPlayerInterface {
assert(packet_source);
assert(packet_source->get());
packet_source_.swap(*packet_source);
srand(321);
std::srand(321);
}
virtual ~RtpPlayerImpl() {}
@ -434,7 +435,8 @@ class RtpPlayerImpl : public RtpPlayerInterface {
if (no_loss_startup_ > 0) {
no_loss_startup_--;
} else if ((rand() + 1.0) / (RAND_MAX + 1.0) < loss_rate_) { // NOLINT
} else if ((std::rand() + 1.0) / (RAND_MAX + 1.0) <
loss_rate_) { // NOLINT
uint16_t seq_num = header.sequenceNumber;
lost_packets_.AddPacket(new RawRtpPacket(data, length, ssrc, seq_num));
DEBUG_LOG1("Dropped packet: %d!", header.header.sequenceNumber);