zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use base/scoped_ptr.h; system_wrappers/interface/scoped_ptr.h is going away

Browse Source 
BUG=
R=andrew@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/36229004

Cr-Commit-Position: refs/heads/master@{#8517}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8517 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kwiberg@webrtc.org
2015-02-26 14:34:55 +00:00
parent ac2d27d9ae
commit 00b8f6b364
391 changed files with 1427 additions and 1402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
webrtc/modules/video_coding/main/test/rtp_player.cc
View File

@ -14,6 +14,7 @@
#include <map>
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h"
#include "webrtc/modules/rtp_rtcp/interface/rtp_payload_registry.h"
#include "webrtc/modules/rtp_rtcp/interface/rtp_receiver.h"
@ -22,7 +23,6 @@
#include "webrtc/modules/video_coding/main/test/test_util.h"
#include "webrtc/system_wrappers/interface/clock.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/test/rtp_file_reader.h"
#if 1
@ -60,7 +60,7 @@ class RawRtpPacket {
uint16_t seq_num() const { return seq_num_; }
private:
scoped_ptr<uint8_t[]> data_;
rtc::scoped_ptr<uint8_t[]> data_;
size_t length_;
int64_t resend_time_ms_;
uint32_t ssrc_;
@ -175,7 +175,7 @@ class LostPackets {
typedef RtpPacketList::iterator RtpPacketIterator;
typedef RtpPacketList::const_iterator ConstRtpPacketIterator;
scoped_ptr<CriticalSectionWrapper> crit_sect_;
rtc::scoped_ptr<CriticalSectionWrapper> crit_sect_;
FILE* debug_file_;
int loss_count_;
RtpPacketList packets_;
@ -208,7 +208,7 @@ class SsrcHandlers {
}
DEBUG_LOG1("Registering handler for ssrc=%08x", ssrc);
scoped_ptr<Handler> handler(
rtc::scoped_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) {
@ -295,10 +295,10 @@ class SsrcHandlers {
return payload_types_;
}
scoped_ptr<RtpHeaderParser> rtp_header_parser_;
scoped_ptr<RTPPayloadRegistry> rtp_payload_registry_;
scoped_ptr<RtpReceiver> rtp_module_;
scoped_ptr<PayloadSinkInterface> payload_sink_;
rtc::scoped_ptr<RtpHeaderParser> rtp_header_parser_;
rtc::scoped_ptr<RTPPayloadRegistry> rtp_payload_registry_;
rtc::scoped_ptr<RtpReceiver> rtp_module_;
rtc::scoped_ptr<PayloadSinkInterface> payload_sink_;
private:
uint32_t ssrc_;
@ -321,22 +321,25 @@ class SsrcHandlers {
class RtpPlayerImpl : public RtpPlayerInterface {
public:
RtpPlayerImpl(PayloadSinkFactoryInterface* payload_sink_factory,
const PayloadTypes& payload_types, Clock* clock,
scoped_ptr<test::RtpFileReader>* packet_source,
float loss_rate, int64_t rtt_ms, bool reordering)
: ssrc_handlers_(payload_sink_factory, payload_types),
clock_(clock),
next_rtp_time_(0),
first_packet_(true),
first_packet_rtp_time_(0),
first_packet_time_ms_(0),
loss_rate_(loss_rate),
lost_packets_(clock, rtt_ms),
resend_packet_count_(0),
no_loss_startup_(100),
end_of_file_(false),
reordering_(false),
reorder_buffer_() {
const PayloadTypes& payload_types,
Clock* clock,
rtc::scoped_ptr<test::RtpFileReader>* packet_source,
float loss_rate,
int64_t rtt_ms,
bool reordering)
: ssrc_handlers_(payload_sink_factory, payload_types),
clock_(clock),
next_rtp_time_(0),
first_packet_(true),
first_packet_rtp_time_(0),
first_packet_time_ms_(0),
loss_rate_(loss_rate),
lost_packets_(clock, rtt_ms),
resend_packet_count_(0),
no_loss_startup_(100),
end_of_file_(false),
reordering_(false),
reorder_buffer_() {
assert(clock);
assert(packet_source);
assert(packet_source->get());
@ -421,7 +424,8 @@ class RtpPlayerImpl : public RtpPlayerInterface {
assert(data);
assert(length > 0);
scoped_ptr<RtpHeaderParser> rtp_header_parser(RtpHeaderParser::Create());
rtc::scoped_ptr<RtpHeaderParser> rtp_header_parser(
RtpHeaderParser::Create());
if (!rtp_header_parser->IsRtcp(data, length)) {
RTPHeader header;
if (!rtp_header_parser->Parse(data, length, &header)) {
@ -449,7 +453,7 @@ class RtpPlayerImpl : public RtpPlayerInterface {
SsrcHandlers ssrc_handlers_;
Clock* clock_;
scoped_ptr<test::RtpFileReader> packet_source_;
rtc::scoped_ptr<test::RtpFileReader> packet_source_;
test::RtpPacket next_packet_;
uint32_t next_rtp_time_;
bool first_packet_;
@ -461,7 +465,7 @@ class RtpPlayerImpl : public RtpPlayerInterface {
uint32_t no_loss_startup_;
bool end_of_file_;
bool reordering_;
scoped_ptr<RawRtpPacket> reorder_buffer_;
rtc::scoped_ptr<RawRtpPacket> reorder_buffer_;
DISALLOW_IMPLICIT_CONSTRUCTORS(RtpPlayerImpl);
};
@ -470,8 +474,9 @@ RtpPlayerInterface* Create(const std::string& input_filename,
PayloadSinkFactoryInterface* payload_sink_factory, Clock* clock,
const PayloadTypes& payload_types, float loss_rate, int64_t rtt_ms,
bool reordering) {
scoped_ptr<test::RtpFileReader> packet_source(test::RtpFileReader::Create(
test::RtpFileReader::kRtpDump, input_filename));
rtc::scoped_ptr<test::RtpFileReader> packet_source(
test::RtpFileReader::Create(test::RtpFileReader::kRtpDump,
input_filename));
if (packet_source.get() == NULL) {
packet_source.reset(test::RtpFileReader::Create(test::RtpFileReader::kPcap,
input_filename));
@ -480,8 +485,9 @@ RtpPlayerInterface* Create(const std::string& input_filename,
}
}
scoped_ptr<RtpPlayerImpl> impl(new RtpPlayerImpl(payload_sink_factory,
payload_types, clock, &packet_source, loss_rate, rtt_ms, reordering));
rtc::scoped_ptr<RtpPlayerImpl> impl(
new RtpPlayerImpl(payload_sink_factory, payload_types, clock,
&packet_source, loss_rate, rtt_ms, reordering));
return impl.release();
}
} // namespace rtpplayer