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

12
webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc
View File

@ -205,8 +205,8 @@ TEST_P(BweSimulation, SelfFairnessTest) {
VerboseLogging(true);
const int kAllFlowIds[] = {0, 1, 2};
const size_t kNumFlows = sizeof(kAllFlowIds) / sizeof(kAllFlowIds[0]);
scoped_ptr<AdaptiveVideoSource> sources[kNumFlows];
scoped_ptr<PacketSender> senders[kNumFlows];
rtc::scoped_ptr<AdaptiveVideoSource> sources[kNumFlows];
rtc::scoped_ptr<PacketSender> senders[kNumFlows];
for (size_t i = 0; i < kNumFlows; ++i) {
// Streams started 20 seconds apart to give them different advantage when
// competing for the bandwidth.
@ -218,7 +218,7 @@ TEST_P(BweSimulation, SelfFairnessTest) {
ChokeFilter choke(&uplink_, CreateFlowIds(kAllFlowIds, kNumFlows));
choke.SetCapacity(1000);
scoped_ptr<RateCounterFilter> rate_counters[kNumFlows];
rtc::scoped_ptr<RateCounterFilter> rate_counters[kNumFlows];
for (size_t i = 0; i < kNumFlows; ++i) {
rate_counters[i].reset(new RateCounterFilter(
&uplink_, CreateFlowIds(&kAllFlowIds[i], 1), "receiver_input"));
@ -240,8 +240,8 @@ TEST_P(BweSimulation, PacedSelfFairnessTest) {
VerboseLogging(true);
const int kAllFlowIds[] = {0, 1, 2};
const size_t kNumFlows = sizeof(kAllFlowIds) / sizeof(kAllFlowIds[0]);
scoped_ptr<PeriodicKeyFrameSource> sources[kNumFlows];
scoped_ptr<PacedVideoSender> senders[kNumFlows];
rtc::scoped_ptr<PeriodicKeyFrameSource> sources[kNumFlows];
rtc::scoped_ptr<PacedVideoSender> senders[kNumFlows];
for (size_t i = 0; i < kNumFlows; ++i) {
// Streams started 20 seconds apart to give them different advantage when
@ -255,7 +255,7 @@ TEST_P(BweSimulation, PacedSelfFairnessTest) {
ChokeFilter choke(&uplink_, CreateFlowIds(kAllFlowIds, kNumFlows));
choke.SetCapacity(1000);
scoped_ptr<RateCounterFilter> rate_counters[kNumFlows];
rtc::scoped_ptr<RateCounterFilter> rate_counters[kNumFlows];
for (size_t i = 0; i < kNumFlows; ++i) {
rate_counters[i].reset(new RateCounterFilter(
&uplink_, CreateFlowIds(&kAllFlowIds[i], 1), "receiver_input"));

6
webrtc/modules/remote_bitrate_estimator/inter_arrival_unittest.cc
View File

@ -10,9 +10,9 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/remote_bitrate_estimator/inter_arrival.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
namespace webrtc {
namespace testing {
@ -199,8 +199,8 @@ class InterArrivalTest : public ::testing::Test {
EXPECT_EQ(expected_packet_size_delta, delta_packet_size);
}
scoped_ptr<InterArrival> inter_arrival_rtp_;
scoped_ptr<InterArrival> inter_arrival_ast_;
rtc::scoped_ptr<InterArrival> inter_arrival_rtp_;
rtc::scoped_ptr<InterArrival> inter_arrival_ast_;
};
TEST_F(InterArrivalTest, FirstPacket) {

8
webrtc/modules/remote_bitrate_estimator/overuse_detector_unittest.cc
View File

@ -14,11 +14,11 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/remote_bitrate_estimator/inter_arrival.h"
#include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h"
#include "webrtc/modules/remote_bitrate_estimator/overuse_estimator.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/test/testsupport/gtest_disable.h"
namespace webrtc {
@ -112,9 +112,9 @@ class OveruseDetectorTest : public ::testing::Test {
int64_t receive_time_ms_;
uint32_t rtp_timestamp_;
OverUseDetectorOptions options_;
scoped_ptr<OveruseDetector> overuse_detector_;
scoped_ptr<OveruseEstimator> overuse_estimator_;
scoped_ptr<InterArrival> inter_arrival_;
rtc::scoped_ptr<OveruseDetector> overuse_detector_;
rtc::scoped_ptr<OveruseEstimator> overuse_estimator_;
rtc::scoped_ptr<InterArrival> inter_arrival_;
};
TEST_F(OveruseDetectorTest, GaussianRandom) {

4
webrtc/modules/remote_bitrate_estimator/rate_statistics.h
View File

@ -11,7 +11,7 @@
#ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_RATE_STATISTICS_H_
#define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_RATE_STATISTICS_H_
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/typedefs.h"
namespace webrtc {
@ -34,7 +34,7 @@ class RateStatistics {
// Counters are kept in buckets (circular buffer), with one bucket
// per millisecond.
const int num_buckets_;
scoped_ptr<size_t[]> buckets_;
rtc::scoped_ptr<size_t[]> buckets_;
// Total count recorded in buckets.
size_t accumulated_count_;

8
webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc
View File

@ -12,6 +12,7 @@
#include <map>
#include "webrtc/base/constructormagic.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/thread_annotations.h"
#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
#include "webrtc/modules/remote_bitrate_estimator/inter_arrival.h"
@ -22,7 +23,6 @@
#include "webrtc/system_wrappers/interface/clock.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/logging.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/typedefs.h"
namespace webrtc {
@ -179,15 +179,15 @@ class RemoteBitrateEstimatorAbsSendTimeImpl : public RemoteBitrateEstimator {
bool IsBitrateImproving(int probe_bitrate_bps) const
EXCLUSIVE_LOCKS_REQUIRED(crit_sect_.get());
scoped_ptr<CriticalSectionWrapper> crit_sect_;
rtc::scoped_ptr<CriticalSectionWrapper> crit_sect_;
RemoteBitrateObserver* observer_ GUARDED_BY(crit_sect_.get());
Clock* clock_;
Ssrcs ssrcs_ GUARDED_BY(crit_sect_.get());
scoped_ptr<InterArrival> inter_arrival_ GUARDED_BY(crit_sect_.get());
rtc::scoped_ptr<InterArrival> inter_arrival_ GUARDED_BY(crit_sect_.get());
OveruseEstimator estimator_ GUARDED_BY(crit_sect_.get());
OveruseDetector detector_ GUARDED_BY(crit_sect_.get());
RateStatistics incoming_bitrate_ GUARDED_BY(crit_sect_.get());
scoped_ptr<RemoteRateControl> remote_rate_ GUARDED_BY(crit_sect_.get());
rtc::scoped_ptr<RemoteRateControl> remote_rate_ GUARDED_BY(crit_sect_.get());
int64_t last_process_time_;
std::vector<int> recent_propagation_delta_ms_ GUARDED_BY(crit_sect_.get());
std::vector<int64_t> recent_update_time_ms_ GUARDED_BY(crit_sect_.get());

6
webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc
View File

@ -10,6 +10,7 @@
#include <map>
#include "webrtc/base/constructormagic.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/thread_annotations.h"
#include "webrtc/modules/remote_bitrate_estimator/rate_statistics.h"
#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
@ -20,7 +21,6 @@
#include "webrtc/system_wrappers/interface/clock.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include "webrtc/system_wrappers/interface/logging.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/typedefs.h"
namespace webrtc {
@ -75,9 +75,9 @@ class RemoteBitrateEstimatorImpl : public RemoteBitrateEstimator {
Clock* clock_;
SsrcOveruseEstimatorMap overuse_detectors_ GUARDED_BY(crit_sect_.get());
RateStatistics incoming_bitrate_ GUARDED_BY(crit_sect_.get());
scoped_ptr<RemoteRateControl> remote_rate_ GUARDED_BY(crit_sect_.get());
rtc::scoped_ptr<RemoteRateControl> remote_rate_ GUARDED_BY(crit_sect_.get());
RemoteBitrateObserver* observer_ GUARDED_BY(crit_sect_.get());
scoped_ptr<CriticalSectionWrapper> crit_sect_;
rtc::scoped_ptr<CriticalSectionWrapper> crit_sect_;
int64_t last_process_time_;
int64_t process_interval_ms_ GUARDED_BY(crit_sect_.get());

8
webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h
View File

@ -17,9 +17,9 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/base/constructormagic.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
#include "webrtc/system_wrappers/interface/clock.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
namespace webrtc {
namespace testing {
@ -207,9 +207,9 @@ class RemoteBitrateEstimatorTest : public ::testing::Test {
static const int kArrivalTimeClockOffsetMs = 60000;
SimulatedClock clock_; // Time at the receiver.
scoped_ptr<testing::TestBitrateObserver> bitrate_observer_;
scoped_ptr<RemoteBitrateEstimator> bitrate_estimator_;
scoped_ptr<testing::StreamGenerator> stream_generator_;
rtc::scoped_ptr<testing::TestBitrateObserver> bitrate_observer_;
rtc::scoped_ptr<RemoteBitrateEstimator> bitrate_estimator_;
rtc::scoped_ptr<testing::StreamGenerator> stream_generator_;
DISALLOW_COPY_AND_ASSIGN(RemoteBitrateEstimatorTest);
};

2
webrtc/modules/remote_bitrate_estimator/test/bwe_test.cc
View File

@ -11,12 +11,12 @@
#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test.h"
#include "webrtc/base/common.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/interface/module_common_types.h"
#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h"
#include "webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h"
#include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h"
#include "webrtc/system_wrappers/interface/clock.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
using std::string;
using std::vector;

12
webrtc/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc
View File

@ -16,9 +16,9 @@
#include <vector>
#include "webrtc/base/constructormagic.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h"
#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {
@ -44,7 +44,7 @@ class BaseLineFileVerify : public BaseLineFileInterface {
BaseLineFileVerify(const std::string& filepath, bool allow_missing_file)
: reader_(),
fail_to_read_response_(false) {
scoped_ptr<ResourceFileReader> reader;
rtc::scoped_ptr<ResourceFileReader> reader;
reader.reset(ResourceFileReader::Create(filepath, "bin"));
if (!reader.get()) {
printf("WARNING: Missing baseline file for BWE test: %s.bin\n",
@ -91,7 +91,7 @@ class BaseLineFileVerify : public BaseLineFileInterface {
}
private:
scoped_ptr<ResourceFileReader> reader_;
rtc::scoped_ptr<ResourceFileReader> reader_;
bool fail_to_read_response_;
DISALLOW_IMPLICIT_CONSTRUCTORS(BaseLineFileVerify);
@ -122,7 +122,7 @@ class BaseLineFileUpdate : public BaseLineFileInterface {
printf("WARNING: Cannot create output dir: %s\n", dir_path.c_str());
return false;
}
scoped_ptr<OutputFileWriter> writer;
rtc::scoped_ptr<OutputFileWriter> writer;
writer.reset(OutputFileWriter::Create(filepath_, "bin"));
if (!writer.get()) {
printf("WARNING: Cannot create output file: %s.bin\n",
@ -142,7 +142,7 @@ class BaseLineFileUpdate : public BaseLineFileInterface {
}
private:
scoped_ptr<BaseLineFileInterface> verifier_;
rtc::scoped_ptr<BaseLineFileInterface> verifier_;
std::vector<uint32_t> output_content_;
std::string filepath_;
@ -155,7 +155,7 @@ BaseLineFileInterface* BaseLineFileInterface::Create(
std::replace(filepath.begin(), filepath.end(), '/', '_');
filepath = std::string(kResourceSubDir) + "/" + filepath;
scoped_ptr<BaseLineFileInterface> result;
rtc::scoped_ptr<BaseLineFileInterface> result;
result.reset(new BaseLineFileVerify(filepath, !write_output_file));
if (write_output_file) {
// Takes ownership of the |verifier| instance.

2
webrtc/modules/remote_bitrate_estimator/test/bwe_test_fileutils.cc
View File

@ -17,8 +17,8 @@
#endif
#include <assert.h>
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/test/testsupport/fileutils.h"
namespace webrtc {

10
webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h
View File

@ -21,6 +21,7 @@
#include <string>
#include <vector>
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
#include "webrtc/modules/interface/module_common_types.h"
#include "webrtc/modules/pacing/include/paced_sender.h"
@ -29,7 +30,6 @@
#include "webrtc/modules/remote_bitrate_estimator/test/packet.h"
#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
#include "webrtc/system_wrappers/interface/clock.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
namespace webrtc {
@ -224,7 +224,7 @@ class RateCounterFilter : public PacketProcessor {
virtual void RunFor(int64_t time_ms, Packets* in_out);
private:
scoped_ptr<RateCounter> rate_counter_;
rtc::scoped_ptr<RateCounter> rate_counter_;
Stats<double> packets_per_second_stats_;
Stats<double> kbps_stats_;
std::string name_;
@ -314,7 +314,7 @@ class ChokeFilter : public PacketProcessor {
private:
uint32_t kbps_;
int64_t last_send_time_us_;
scoped_ptr<DelayCapHelper> delay_cap_helper_;
rtc::scoped_ptr<DelayCapHelper> delay_cap_helper_;
DISALLOW_IMPLICIT_CONSTRUCTORS(ChokeFilter);
};
@ -348,9 +348,9 @@ class TraceBasedDeliveryFilter : public PacketProcessor {
TimeList delivery_times_us_;
TimeList::const_iterator next_delivery_it_;
int64_t local_time_us_;
scoped_ptr<RateCounter> rate_counter_;
rtc::scoped_ptr<RateCounter> rate_counter_;
std::string name_;
scoped_ptr<DelayCapHelper> delay_cap_helper_;
rtc::scoped_ptr<DelayCapHelper> delay_cap_helper_;
Stats<double> packets_per_second_stats_;
Stats<double> kbps_stats_;

4
webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h
View File

@ -99,8 +99,8 @@
#include <string>
#include "webrtc/base/constructormagic.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/common_types.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#define BWE_TEST_LOGGING_GLOBAL_CONTEXT(name) \
do { \
@ -212,7 +212,7 @@ class Logging {
void PopState();
static Logging g_Logging;
scoped_ptr<CriticalSectionWrapper> crit_sect_;
rtc::scoped_ptr<CriticalSectionWrapper> crit_sect_;
ThreadMap thread_map_;
DISALLOW_COPY_AND_ASSIGN(Logging);

2
webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h
View File

@ -32,7 +32,7 @@ class NadaBweReceiver : public BweReceiver {
private:
SimulatedClock clock_;
int64_t last_feedback_ms_;
scoped_ptr<ReceiveStatistics> recv_stats_;
rtc::scoped_ptr<ReceiveStatistics> recv_stats_;
int64_t baseline_delay_ms_;
int64_t delay_signal_ms_;
int64_t last_congestion_signal_ms_;

8
webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h
View File

@ -37,8 +37,8 @@ class RembBweSender : public BweSender {
int Process() override;
protected:
scoped_ptr<BitrateController> bitrate_controller_;
scoped_ptr<RtcpBandwidthObserver> feedback_observer_;
rtc::scoped_ptr<BitrateController> bitrate_controller_;
rtc::scoped_ptr<RtcpBandwidthObserver> feedback_observer_;
private:
Clock* clock_;
@ -67,9 +67,9 @@ class RembReceiver : public BweReceiver, public RemoteBitrateObserver {
std::string estimate_log_prefix_;
bool plot_estimate_;
SimulatedClock clock_;
scoped_ptr<ReceiveStatistics> recv_stats_;
rtc::scoped_ptr<ReceiveStatistics> recv_stats_;
int64_t latest_estimate_bps_;
scoped_ptr<RemoteBitrateEstimator> estimator_;
rtc::scoped_ptr<RemoteBitrateEstimator> estimator_;
DISALLOW_IMPLICIT_CONSTRUCTORS(RembReceiver);
};

6
webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h
View File

@ -32,9 +32,9 @@ class FullBweSender : public BweSender, public RemoteBitrateObserver {
int Process() override;
protected:
scoped_ptr<BitrateController> bitrate_controller_;
scoped_ptr<RemoteBitrateEstimator> rbe_;
scoped_ptr<RtcpBandwidthObserver> feedback_observer_;
rtc::scoped_ptr<BitrateController> bitrate_controller_;
rtc::scoped_ptr<RemoteBitrateEstimator> rbe_;
rtc::scoped_ptr<RtcpBandwidthObserver> feedback_observer_;
private:
Clock* const clock_;

4
webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h
View File

@ -14,9 +14,9 @@
#include <string>
#include "webrtc/base/constructormagic.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/remote_bitrate_estimator/test/bwe.h"
#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
namespace webrtc {
namespace testing {
@ -43,7 +43,7 @@ class PacketReceiver : public PacketProcessor {
std::string delay_log_prefix_;
int64_t last_delay_plot_ms_;
bool plot_delay_;
scoped_ptr<BweReceiver> bwe_receiver_;
rtc::scoped_ptr<BweReceiver> bwe_receiver_;
private:
DISALLOW_IMPLICIT_CONSTRUCTORS(PacketReceiver);

4
webrtc/modules/remote_bitrate_estimator/test/packet_sender.h
View File

@ -15,10 +15,10 @@
#include <string>
#include "webrtc/base/constructormagic.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/interface/module.h"
#include "webrtc/modules/remote_bitrate_estimator/test/bwe.h"
#include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
namespace webrtc {
namespace testing {
@ -55,7 +55,7 @@ class PacketSender : public PacketProcessor, public BitrateObserver {
SimulatedClock clock_;
VideoSource* source_;
scoped_ptr<BweSender> bwe_;
rtc::scoped_ptr<BweSender> bwe_;
int64_t start_of_run_ms_;
std::list<Module*> modules_;

8
webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp_play.cc
View File

@ -11,11 +11,11 @@
#include <stdio.h>
#include "webrtc/base/format_macros.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
#include "webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp.h"
#include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h"
#include "webrtc/modules/rtp_rtcp/interface/rtp_payload_registry.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/test/rtp_file_reader.h"
class Observer : public webrtc::RemoteBitrateObserver {
@ -57,9 +57,9 @@ int main(int argc, char** argv) {
&parser, &estimator, &estimator_used)) {
return -1;
}
webrtc::scoped_ptr<webrtc::test::RtpFileReader> rtp_reader(reader);
webrtc::scoped_ptr<webrtc::RtpHeaderParser> rtp_parser(parser);
webrtc::scoped_ptr<webrtc::RemoteBitrateEstimator> rbe(estimator);
rtc::scoped_ptr<webrtc::test::RtpFileReader> rtp_reader(reader);
rtc::scoped_ptr<webrtc::RtpHeaderParser> rtp_parser(parser);
rtc::scoped_ptr<webrtc::RemoteBitrateEstimator> rbe(estimator);
// Process the file.
int packet_counter = 0;

6
webrtc/modules/remote_bitrate_estimator/tools/rtp_to_text.cc
View File

@ -12,10 +12,10 @@
#include <sstream>
#include "webrtc/base/format_macros.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp.h"
#include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h"
#include "webrtc/modules/rtp_rtcp/interface/rtp_payload_registry.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/test/rtp_file_reader.h"
int main(int argc, char** argv) {
@ -37,8 +37,8 @@ int main(int argc, char** argv) {
return -1;
}
bool arrival_time_only = (argc >= 5 && strncmp(argv[4], "-t", 2) == 0);
webrtc::scoped_ptr<webrtc::test::RtpFileReader> rtp_reader(reader);
webrtc::scoped_ptr<webrtc::RtpHeaderParser> rtp_parser(parser);
rtc::scoped_ptr<webrtc::test::RtpFileReader> rtp_reader(reader);
rtc::scoped_ptr<webrtc::RtpHeaderParser> rtp_parser(parser);
fprintf(stdout, "seqnum timestamp ts_offset abs_sendtime recvtime "
"markerbit ssrc size original_size\n");
int packet_counter = 0;