Use base/scoped_ptr.h; system_wrappers/interface/scoped_ptr.h is going away
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
diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor.cc b/webrtc/modules/video_coding/codecs/test/videoprocessor.cc
index df04ba5..d6d8946 100644
--- a/webrtc/modules/video_coding/codecs/test/videoprocessor.cc
+++ b/webrtc/modules/video_coding/codecs/test/videoprocessor.cc
@@ -271,7 +271,7 @@
assert(false);
}
}
- scoped_ptr<uint8_t[]> copied_buffer(new uint8_t[encoded_image._length]);
+ rtc::scoped_ptr<uint8_t[]> copied_buffer(new uint8_t[encoded_image._length]);
memcpy(copied_buffer.get(), encoded_image._buffer, encoded_image._length);
EncodedImage copied_image;
memcpy(&copied_image, &encoded_image, sizeof(copied_image));
@@ -337,7 +337,7 @@
}
// TODO(mikhal): Extracting the buffer for now - need to update test.
size_t length = CalcBufferSize(kI420, up_image.width(), up_image.height());
- scoped_ptr<uint8_t[]> image_buffer(new uint8_t[length]);
+ rtc::scoped_ptr<uint8_t[]> image_buffer(new uint8_t[length]);
int extracted_length = ExtractBuffer(up_image, length, image_buffer.get());
assert(extracted_length > 0);
// Update our copy of the last successful frame:
@@ -351,7 +351,7 @@
// Update our copy of the last successful frame:
// TODO(mikhal): Add as a member function, so won't be allocated per frame.
size_t length = CalcBufferSize(kI420, image.width(), image.height());
- scoped_ptr<uint8_t[]> image_buffer(new uint8_t[length]);
+ rtc::scoped_ptr<uint8_t[]> image_buffer(new uint8_t[length]);
int extracted_length = ExtractBuffer(image, length, image_buffer.get());
assert(extracted_length > 0);
memcpy(last_successful_frame_buffer_, image_buffer.get(), extracted_length);
diff --git a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc b/webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
index 5c7b70a..fdf378f 100644
--- a/webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
+++ b/webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
@@ -11,10 +11,10 @@
#include "gtest/gtest.h"
#include "vpx/vpx_encoder.h"
#include "vpx/vp8cx.h"
+#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h"
#include "webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h"
#include "webrtc/modules/video_coding/utility/include/mock/mock_frame_dropper.h"
-#include "webrtc/system_wrappers/interface/scoped_ptr.h"
using ::testing::_;
using ::testing::NiceMock;
@@ -93,7 +93,7 @@
NiceMock<MockFrameDropper> tl0_frame_dropper_;
NiceMock<MockFrameDropper> tl1_frame_dropper_;
- scoped_ptr<ScreenshareLayersFT> layers_;
+ rtc::scoped_ptr<ScreenshareLayersFT> layers_;
};
TEST_F(ScreenshareLayerTest, 1Layer) {
diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h
index ca900e0..2d8a47d 100644
--- a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h
+++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h
@@ -14,8 +14,8 @@
#include <vector>
+#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
-#include "webrtc/system_wrappers/interface/scoped_ptr.h"
namespace webrtc {
@@ -97,8 +97,8 @@
bool Initialized() const;
- scoped_ptr<VideoEncoderFactory> factory_;
- scoped_ptr<Config> screensharing_extra_options_;
+ rtc::scoped_ptr<VideoEncoderFactory> factory_;
+ rtc::scoped_ptr<Config> screensharing_extra_options_;
VideoCodec codec_;
std::vector<StreamInfo> streaminfos_;
EncodedImageCallback* encoded_complete_callback_;
diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc
index 36a30a3..762c507 100644
--- a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc
+++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc
@@ -281,8 +281,8 @@
}
protected:
- scoped_ptr<TestSimulcastEncoderAdapterFakeHelper> helper_;
- scoped_ptr<VP8Encoder> adapter_;
+ rtc::scoped_ptr<TestSimulcastEncoderAdapterFakeHelper> helper_;
+ rtc::scoped_ptr<VP8Encoder> adapter_;
VideoCodec codec_;
};
diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h b/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h
index a4b982d..b2029b1 100644
--- a/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h
+++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h
@@ -14,6 +14,7 @@
#include <algorithm>
#include <vector>
+#include "webrtc/base/scoped_ptr.h"
#include "webrtc/common.h"
#include "webrtc/experiments.h"
#include "webrtc/common_video/interface/i420_video_frame.h"
@@ -21,7 +22,6 @@
#include "webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h"
#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h"
-#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "gtest/gtest.h"
@@ -987,9 +987,9 @@
}
}
- scoped_ptr<VP8Encoder> encoder_;
+ rtc::scoped_ptr<VP8Encoder> encoder_;
MockEncodedImageCallback encoder_callback_;
- scoped_ptr<VP8Decoder> decoder_;
+ rtc::scoped_ptr<VP8Decoder> decoder_;
MockDecodedImageCallback decoder_callback_;
VideoCodec settings_;
I420VideoFrame input_frame_;
diff --git a/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc b/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
index 5d44b48..e2e56e4 100644
--- a/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
+++ b/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
@@ -11,9 +11,9 @@
#include <stdio.h>
#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/base/scoped_ptr.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
-#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/system_wrappers/interface/tick_util.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/test/testsupport/gtest_disable.h"
@@ -41,7 +41,7 @@
private:
EncodedImage* const encoded_frame_;
- scoped_ptr<uint8_t[]> frame_buffer_;
+ rtc::scoped_ptr<uint8_t[]> frame_buffer_;
bool encode_complete_;
};
@@ -177,13 +177,13 @@
const int kWidth = 172;
const int kHeight = 144;
- scoped_ptr<Vp8UnitTestEncodeCompleteCallback> encode_complete_callback_;
- scoped_ptr<Vp8UnitTestDecodeCompleteCallback> decode_complete_callback_;
- scoped_ptr<uint8_t[]> source_buffer_;
+ rtc::scoped_ptr<Vp8UnitTestEncodeCompleteCallback> encode_complete_callback_;
+ rtc::scoped_ptr<Vp8UnitTestDecodeCompleteCallback> decode_complete_callback_;
+ rtc::scoped_ptr<uint8_t[]> source_buffer_;
FILE* source_file_;
I420VideoFrame input_frame_;
- scoped_ptr<VideoEncoder> encoder_;
- scoped_ptr<VideoDecoder> decoder_;
+ rtc::scoped_ptr<VideoEncoder> encoder_;
+ rtc::scoped_ptr<VideoDecoder> decoder_;
EncodedImage encoded_frame_;
I420VideoFrame decoded_frame_;
size_t length_source_frame_;
@@ -257,13 +257,13 @@
EXPECT_EQ(0, encoder_->Encode(input_frame_, NULL, NULL));
EXPECT_EQ(0, decoder_->Decode(encoded_frame_, false, NULL));
size_t length = CalcBufferSize(kI420, kWidth, kHeight);
- scoped_ptr<uint8_t[]> first_frame_buffer(new uint8_t[length]);
+ rtc::scoped_ptr<uint8_t[]> first_frame_buffer(new uint8_t[length]);
ExtractBuffer(decoded_frame_, length, first_frame_buffer.get());
EXPECT_EQ(0, decoder_->Reset());
EXPECT_EQ(0, decoder_->Decode(encoded_frame_, false, NULL));
- scoped_ptr<uint8_t[]> second_frame_buffer(new uint8_t[length]);
+ rtc::scoped_ptr<uint8_t[]> second_frame_buffer(new uint8_t[length]);
ExtractBuffer(decoded_frame_, length, second_frame_buffer.get());
EXPECT_EQ(
diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc b/webrtc/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc
index 39da34b..84b17e4 100644
--- a/webrtc/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc
+++ b/webrtc/modules/video_coding/codecs/vp8/vp8_sequence_coder.cc
@@ -9,11 +9,11 @@
*/
#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/base/scoped_ptr.h"
#include "webrtc/common_video/interface/i420_video_frame.h"
#include "webrtc/common_video/interface/video_image.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
-#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/system_wrappers/interface/tick_util.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/test/testsupport/metrics/video_metrics.h"
@@ -142,7 +142,7 @@
EXPECT_EQ(0, decoder->InitDecode(&inst, 1));
webrtc::I420VideoFrame input_frame;
size_t length = webrtc::CalcBufferSize(webrtc::kI420, width, height);
- webrtc::scoped_ptr<uint8_t[]> frame_buffer(new uint8_t[length]);
+ rtc::scoped_ptr<uint8_t[]> frame_buffer(new uint8_t[length]);
int half_width = (width + 1) / 2;
// Set and register callbacks.
diff --git a/webrtc/modules/video_coding/main/source/codec_database.h b/webrtc/modules/video_coding/main/source/codec_database.h
index 1aa8f4d..762a909 100644
--- a/webrtc/modules/video_coding/main/source/codec_database.h
+++ b/webrtc/modules/video_coding/main/source/codec_database.h
@@ -13,11 +13,11 @@
#include <map>
+#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h"
#include "webrtc/modules/video_coding/main/interface/video_coding.h"
#include "webrtc/modules/video_coding/main/source/generic_decoder.h"
#include "webrtc/modules/video_coding/main/source/generic_encoder.h"
-#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/typedefs.h"
namespace webrtc {
@@ -28,7 +28,7 @@
int number_of_cores,
bool require_key_frame);
- scoped_ptr<VideoCodec> settings;
+ rtc::scoped_ptr<VideoCodec> settings;
int number_of_cores;
bool require_key_frame;
};
diff --git a/webrtc/modules/video_coding/main/source/generic_encoder.h b/webrtc/modules/video_coding/main/source/generic_encoder.h
index e547a47..1fefc40 100644
--- a/webrtc/modules/video_coding/main/source/generic_encoder.h
+++ b/webrtc/modules/video_coding/main/source/generic_encoder.h
@@ -16,7 +16,7 @@
#include <stdio.h>
-#include "webrtc/system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/base/scoped_ptr.h"
namespace webrtc {
class CriticalSectionWrapper;
diff --git a/webrtc/modules/video_coding/main/source/jitter_buffer.h b/webrtc/modules/video_coding/main/source/jitter_buffer.h
index 7857aaa..d2cbc27 100644
--- a/webrtc/modules/video_coding/main/source/jitter_buffer.h
+++ b/webrtc/modules/video_coding/main/source/jitter_buffer.h
@@ -293,7 +293,7 @@
bool running_;
CriticalSectionWrapper* crit_sect_;
// Event to signal when we have a frame ready for decoder.
- scoped_ptr<EventWrapper> frame_event_;
+ rtc::scoped_ptr<EventWrapper> frame_event_;
// Number of allocated frames.
int max_number_of_frames_;
UnorderedFrameList free_frames_ GUARDED_BY(crit_sect_);
diff --git a/webrtc/modules/video_coding/main/source/jitter_buffer_unittest.cc b/webrtc/modules/video_coding/main/source/jitter_buffer_unittest.cc
index 8ebd587..42523e9 100644
--- a/webrtc/modules/video_coding/main/source/jitter_buffer_unittest.cc
+++ b/webrtc/modules/video_coding/main/source/jitter_buffer_unittest.cc
@@ -111,10 +111,10 @@
uint32_t timestamp_;
int size_;
uint8_t data_[1500];
- scoped_ptr<VCMPacket> packet_;
- scoped_ptr<SimulatedClock> clock_;
+ rtc::scoped_ptr<VCMPacket> packet_;
+ rtc::scoped_ptr<SimulatedClock> clock_;
NullEventFactory event_factory_;
- scoped_ptr<VCMJitterBuffer> jitter_buffer_;
+ rtc::scoped_ptr<VCMJitterBuffer> jitter_buffer_;
};
@@ -218,7 +218,7 @@
VCMJitterBuffer* jitter_buffer_;
StreamGenerator* stream_generator_;
- scoped_ptr<SimulatedClock> clock_;
+ rtc::scoped_ptr<SimulatedClock> clock_;
NullEventFactory event_factory_;
size_t max_nack_list_size_;
int oldest_packet_to_nack_;
diff --git a/webrtc/modules/video_coding/main/source/media_optimization.h b/webrtc/modules/video_coding/main/source/media_optimization.h
index aa21921..3083342 100644
--- a/webrtc/modules/video_coding/main/source/media_optimization.h
+++ b/webrtc/modules/video_coding/main/source/media_optimization.h
@@ -13,12 +13,12 @@
#include <list>
+#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/interface/module_common_types.h"
#include "webrtc/modules/video_coding/main/interface/video_coding.h"
#include "webrtc/modules/video_coding/main/source/media_opt_util.h"
#include "webrtc/modules/video_coding/main/source/qm_select.h"
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
-#include "webrtc/system_wrappers/interface/scoped_ptr.h"
namespace webrtc {
@@ -140,7 +140,7 @@
uint32_t SentFrameRateInternal() EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
// Protect all members.
- scoped_ptr<CriticalSectionWrapper> crit_sect_;
+ rtc::scoped_ptr<CriticalSectionWrapper> crit_sect_;
Clock* clock_ GUARDED_BY(crit_sect_);
int32_t max_bit_rate_ GUARDED_BY(crit_sect_);
@@ -148,8 +148,9 @@
uint16_t codec_width_ GUARDED_BY(crit_sect_);
uint16_t codec_height_ GUARDED_BY(crit_sect_);
float user_frame_rate_ GUARDED_BY(crit_sect_);
- scoped_ptr<FrameDropper> frame_dropper_ GUARDED_BY(crit_sect_);
- scoped_ptr<VCMLossProtectionLogic> loss_prot_logic_ GUARDED_BY(crit_sect_);
+ rtc::scoped_ptr<FrameDropper> frame_dropper_ GUARDED_BY(crit_sect_);
+ rtc::scoped_ptr<VCMLossProtectionLogic> loss_prot_logic_
+ GUARDED_BY(crit_sect_);
uint8_t fraction_lost_ GUARDED_BY(crit_sect_);
uint32_t send_statistics_[4] GUARDED_BY(crit_sect_);
uint32_t send_statistics_zero_encode_ GUARDED_BY(crit_sect_);
@@ -163,8 +164,8 @@
uint32_t avg_sent_framerate_ GUARDED_BY(crit_sect_);
uint32_t key_frame_cnt_ GUARDED_BY(crit_sect_);
uint32_t delta_frame_cnt_ GUARDED_BY(crit_sect_);
- scoped_ptr<VCMContentMetricsProcessing> content_ GUARDED_BY(crit_sect_);
- scoped_ptr<VCMQmResolution> qm_resolution_ GUARDED_BY(crit_sect_);
+ rtc::scoped_ptr<VCMContentMetricsProcessing> content_ GUARDED_BY(crit_sect_);
+ rtc::scoped_ptr<VCMQmResolution> qm_resolution_ GUARDED_BY(crit_sect_);
int64_t last_qm_update_time_ GUARDED_BY(crit_sect_);
int64_t last_change_time_ GUARDED_BY(crit_sect_); // Content/user triggered.
int num_layers_ GUARDED_BY(crit_sect_);
diff --git a/webrtc/modules/video_coding/main/source/receiver.h b/webrtc/modules/video_coding/main/source/receiver.h
index 0e1f01a..b27e35c 100644
--- a/webrtc/modules/video_coding/main/source/receiver.h
+++ b/webrtc/modules/video_coding/main/source/receiver.h
@@ -90,7 +90,7 @@
Clock* const clock_;
VCMJitterBuffer jitter_buffer_;
VCMTiming* timing_;
- scoped_ptr<EventWrapper> render_wait_event_;
+ rtc::scoped_ptr<EventWrapper> render_wait_event_;
VCMReceiverState state_;
int max_video_delay_ms_;
diff --git a/webrtc/modules/video_coding/main/source/receiver_unittest.cc b/webrtc/modules/video_coding/main/source/receiver_unittest.cc
index 6135a93..e5b6804 100644
--- a/webrtc/modules/video_coding/main/source/receiver_unittest.cc
+++ b/webrtc/modules/video_coding/main/source/receiver_unittest.cc
@@ -89,11 +89,11 @@
return true;
}
- scoped_ptr<SimulatedClock> clock_;
+ rtc::scoped_ptr<SimulatedClock> clock_;
VCMTiming timing_;
NullEventFactory event_factory_;
VCMReceiver receiver_;
- scoped_ptr<StreamGenerator> stream_generator_;
+ rtc::scoped_ptr<StreamGenerator> stream_generator_;
uint8_t data_buffer_[kDataBufferSize];
};
diff --git a/webrtc/modules/video_coding/main/source/video_coding_impl.cc b/webrtc/modules/video_coding/main/source/video_coding_impl.cc
index eab45f0..ff2ab93 100644
--- a/webrtc/modules/video_coding/main/source/video_coding_impl.cc
+++ b/webrtc/modules/video_coding/main/source/video_coding_impl.cc
@@ -65,7 +65,7 @@
}
private:
- scoped_ptr<CriticalSectionWrapper> cs_;
+ rtc::scoped_ptr<CriticalSectionWrapper> cs_;
EncodedImageCallback* callback_ GUARDED_BY(cs_);
};
@@ -362,9 +362,9 @@
EncodedImageCallbackWrapper post_encode_callback_;
// TODO(tommi): Change sender_ and receiver_ to be non pointers
// (construction is 1 alloc instead of 3).
- scoped_ptr<vcm::VideoSender> sender_;
- scoped_ptr<vcm::VideoReceiver> receiver_;
- scoped_ptr<EventFactory> own_event_factory_;
+ rtc::scoped_ptr<vcm::VideoSender> sender_;
+ rtc::scoped_ptr<vcm::VideoReceiver> receiver_;
+ rtc::scoped_ptr<EventFactory> own_event_factory_;
};
} // namespace
diff --git a/webrtc/modules/video_coding/main/source/video_coding_impl.h b/webrtc/modules/video_coding/main/source/video_coding_impl.h
index 8faa1e4..df38ad7 100644
--- a/webrtc/modules/video_coding/main/source/video_coding_impl.h
+++ b/webrtc/modules/video_coding/main/source/video_coding_impl.h
@@ -127,9 +127,9 @@
private:
Clock* clock_;
- scoped_ptr<DebugRecorder> recorder_;
+ rtc::scoped_ptr<DebugRecorder> recorder_;
- scoped_ptr<CriticalSectionWrapper> process_crit_sect_;
+ rtc::scoped_ptr<CriticalSectionWrapper> process_crit_sect_;
CriticalSectionWrapper* _sendCritSect;
VCMGenericEncoder* _encoder;
VCMEncodedFrameCallback _encodedFrameCallback;
@@ -221,7 +221,7 @@
};
Clock* const clock_;
- scoped_ptr<CriticalSectionWrapper> process_crit_sect_;
+ rtc::scoped_ptr<CriticalSectionWrapper> process_crit_sect_;
CriticalSectionWrapper* _receiveCritSect;
bool _receiverInited GUARDED_BY(_receiveCritSect);
VCMTiming _timing;
diff --git a/webrtc/modules/video_coding/main/source/video_coding_robustness_unittest.cc b/webrtc/modules/video_coding/main/source/video_coding_robustness_unittest.cc
index a7f909e..40a754e 100644
--- a/webrtc/modules/video_coding/main/source/video_coding_robustness_unittest.cc
+++ b/webrtc/modules/video_coding/main/source/video_coding_robustness_unittest.cc
@@ -80,7 +80,7 @@
MockPacketRequestCallback request_callback_;
NiceMock<MockVideoDecoder> decoder_;
NiceMock<MockVideoDecoder> decoderCopy_;
- scoped_ptr<SimulatedClock> clock_;
+ rtc::scoped_ptr<SimulatedClock> clock_;
NullEventFactory event_factory_;
};
diff --git a/webrtc/modules/video_coding/main/source/video_receiver_unittest.cc b/webrtc/modules/video_coding/main/source/video_receiver_unittest.cc
index ec5ba93..209a45c 100644
--- a/webrtc/modules/video_coding/main/source/video_receiver_unittest.cc
+++ b/webrtc/modules/video_coding/main/source/video_receiver_unittest.cc
@@ -11,13 +11,13 @@
#include <vector>
#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h"
#include "webrtc/modules/video_coding/main/interface/mock/mock_vcm_callbacks.h"
#include "webrtc/modules/video_coding/main/interface/video_coding.h"
#include "webrtc/modules/video_coding/main/source/video_coding_impl.h"
#include "webrtc/modules/video_coding/main/test/test_util.h"
#include "webrtc/system_wrappers/interface/clock.h"
-#include "webrtc/system_wrappers/interface/scoped_ptr.h"
using ::testing::_;
using ::testing::NiceMock;
@@ -79,7 +79,7 @@
NiceMock<MockVideoDecoder> decoder_;
NiceMock<MockPacketRequestCallback> packet_request_callback_;
- scoped_ptr<VideoReceiver> receiver_;
+ rtc::scoped_ptr<VideoReceiver> receiver_;
};
TEST_F(TestVideoReceiver, PaddingOnlyFrames) {
diff --git a/webrtc/modules/video_coding/main/source/video_sender.cc b/webrtc/modules/video_coding/main/source/video_sender.cc
index a805045..684a1a4 100644
--- a/webrtc/modules/video_coding/main/source/video_sender.cc
+++ b/webrtc/modules/video_coding/main/source/video_sender.cc
@@ -55,7 +55,7 @@
}
private:
- scoped_ptr<CriticalSectionWrapper> cs_;
+ rtc::scoped_ptr<CriticalSectionWrapper> cs_;
FILE* file_ GUARDED_BY(cs_);
};
diff --git a/webrtc/modules/video_coding/main/source/video_sender_unittest.cc b/webrtc/modules/video_coding/main/source/video_sender_unittest.cc
index 4be71ab..6666e4b 100644
--- a/webrtc/modules/video_coding/main/source/video_sender_unittest.cc
+++ b/webrtc/modules/video_coding/main/source/video_sender_unittest.cc
@@ -11,6 +11,7 @@
#include <vector>
#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/base/scoped_ptr.h"
#include "webrtc/common.h"
#include "webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h"
#include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h"
@@ -20,7 +21,6 @@
#include "webrtc/modules/video_coding/main/source/video_coding_impl.h"
#include "webrtc/modules/video_coding/main/test/test_util.h"
#include "webrtc/system_wrappers/interface/clock.h"
-#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/test/frame_generator.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/test/testsupport/gtest_disable.h"
@@ -76,7 +76,7 @@
}
private:
- scoped_ptr<I420VideoFrame> frame_;
+ rtc::scoped_ptr<I420VideoFrame> frame_;
};
class PacketizationCallback : public VCMPacketizationCallback {
@@ -185,8 +185,8 @@
SimulatedClock clock_;
PacketizationCallback packetization_callback_;
MockEncodedImageCallback post_encode_callback_;
- scoped_ptr<VideoSender> sender_;
- scoped_ptr<FrameGenerator> generator_;
+ rtc::scoped_ptr<VideoSender> sender_;
+ rtc::scoped_ptr<FrameGenerator> generator_;
};
class TestVideoSenderWithMockEncoder : public TestVideoSender {
diff --git a/webrtc/modules/video_coding/main/test/mt_rx_tx_test.cc b/webrtc/modules/video_coding/main/test/mt_rx_tx_test.cc
index acbc5c9..e78fedc 100644
--- a/webrtc/modules/video_coding/main/test/mt_rx_tx_test.cc
+++ b/webrtc/modules/video_coding/main/test/mt_rx_tx_test.cc
@@ -156,11 +156,10 @@
configuration.audio = false;
configuration.outgoing_transport = outgoingTransport;
RtpRtcp* rtp = RtpRtcp::CreateRtpRtcp(configuration);
- scoped_ptr<RTPPayloadRegistry> registry(new RTPPayloadRegistry(
- RTPPayloadStrategy::CreateStrategy(false)));
- scoped_ptr<RtpReceiver> rtp_receiver(
- RtpReceiver::CreateVideoReceiver(-1, Clock::GetRealTimeClock(),
- &dataCallback, NULL, registry.get()));
+ rtc::scoped_ptr<RTPPayloadRegistry> registry(
+ new RTPPayloadRegistry(RTPPayloadStrategy::CreateStrategy(false)));
+ rtc::scoped_ptr<RtpReceiver> rtp_receiver(RtpReceiver::CreateVideoReceiver(
+ -1, Clock::GetRealTimeClock(), &dataCallback, NULL, registry.get()));
// registering codecs for the RTP module
VideoCodec video_codec;
diff --git a/webrtc/modules/video_coding/main/test/mt_test_common.cc b/webrtc/modules/video_coding/main/test/mt_test_common.cc
index dec649f..5d84696 100644
--- a/webrtc/modules/video_coding/main/test/mt_test_common.cc
+++ b/webrtc/modules/video_coding/main/test/mt_test_common.cc
@@ -92,7 +92,7 @@
_rtpPackets.pop_front();
// Send to receive side
RTPHeader header;
- scoped_ptr<RtpHeaderParser> parser(RtpHeaderParser::Create());
+ rtc::scoped_ptr<RtpHeaderParser> parser(RtpHeaderParser::Create());
if (!parser->Parse(packet->data, packet->length, &header)) {
delete packet;
return -1;
diff --git a/webrtc/modules/video_coding/main/test/rtp_player.cc b/webrtc/modules/video_coding/main/test/rtp_player.cc
index 5057f7d..c7a2f66 100644
--- a/webrtc/modules/video_coding/main/test/rtp_player.cc
+++ b/webrtc/modules/video_coding/main/test/rtp_player.cc
@@ -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 @@
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 @@
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 @@
}
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 @@
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 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 @@
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 @@
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 @@
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 @@
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 @@
}
}
- 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
diff --git a/webrtc/modules/video_coding/main/test/test_callbacks.cc b/webrtc/modules/video_coding/main/test/test_callbacks.cc
index 58468b2..8a17a69 100644
--- a/webrtc/modules/video_coding/main/test/test_callbacks.cc
+++ b/webrtc/modules/video_coding/main/test/test_callbacks.cc
@@ -292,7 +292,7 @@
assert(_rtp); // We must have a configured RTP module for this test.
// Send to receive side
RTPHeader header;
- scoped_ptr<RtpHeaderParser> parser(RtpHeaderParser::Create());
+ rtc::scoped_ptr<RtpHeaderParser> parser(RtpHeaderParser::Create());
if (!parser->Parse(packet->data, packet->length, &header)) {
delete packet;
return -1;
diff --git a/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc b/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc
index 76d5478..3f2d609 100644
--- a/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc
+++ b/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.cc
@@ -28,12 +28,9 @@
public:
VcmPayloadSink(VcmPayloadSinkFactory* factory,
RtpStreamInterface* stream,
- scoped_ptr<VideoCodingModule>* vcm,
- scoped_ptr<FileOutputFrameReceiver>* frame_receiver)
- : factory_(factory),
- stream_(stream),
- vcm_(),
- frame_receiver_() {
+ rtc::scoped_ptr<VideoCodingModule>* vcm,
+ rtc::scoped_ptr<FileOutputFrameReceiver>* frame_receiver)
+ : factory_(factory), stream_(stream), vcm_(), frame_receiver_() {
assert(factory);
assert(stream);
assert(vcm);
@@ -97,8 +94,8 @@
private:
VcmPayloadSinkFactory* factory_;
RtpStreamInterface* stream_;
- scoped_ptr<VideoCodingModule> vcm_;
- scoped_ptr<FileOutputFrameReceiver> frame_receiver_;
+ rtc::scoped_ptr<VideoCodingModule> vcm_;
+ rtc::scoped_ptr<FileOutputFrameReceiver> frame_receiver_;
DISALLOW_IMPLICIT_CONSTRUCTORS(VcmPayloadSink);
};
@@ -134,7 +131,7 @@
assert(stream);
CriticalSectionScoped cs(crit_sect_.get());
- scoped_ptr<VideoCodingModule> vcm(
+ rtc::scoped_ptr<VideoCodingModule> vcm(
VideoCodingModule::Create(clock_, null_event_factory_.get()));
if (vcm.get() == NULL) {
return NULL;
@@ -165,9 +162,9 @@
vcm->SetMinimumPlayoutDelay(min_playout_delay_ms_);
vcm->SetNackSettings(kMaxNackListSize, kMaxPacketAgeToNack, 0);
- scoped_ptr<FileOutputFrameReceiver> frame_receiver(
+ rtc::scoped_ptr<FileOutputFrameReceiver> frame_receiver(
new FileOutputFrameReceiver(base_out_filename_, stream->ssrc()));
- scoped_ptr<VcmPayloadSink> sink(
+ rtc::scoped_ptr<VcmPayloadSink> sink(
new VcmPayloadSink(this, stream, &vcm, &frame_receiver));
sinks_.push_back(sink.get());
diff --git a/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.h b/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.h
index 0817423..ca0ed56 100644
--- a/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.h
+++ b/webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.h
@@ -12,9 +12,9 @@
#include <vector>
#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h"
#include "webrtc/modules/video_coding/main/test/rtp_player.h"
-#include "webrtc/system_wrappers/interface/scoped_ptr.h"
class NullEventFactory;
@@ -53,8 +53,8 @@
int64_t rtt_ms_;
uint32_t render_delay_ms_;
uint32_t min_playout_delay_ms_;
- scoped_ptr<NullEventFactory> null_event_factory_;
- scoped_ptr<CriticalSectionWrapper> crit_sect_;
+ rtc::scoped_ptr<NullEventFactory> null_event_factory_;
+ rtc::scoped_ptr<CriticalSectionWrapper> crit_sect_;
Sinks sinks_;
DISALLOW_IMPLICIT_CONSTRUCTORS(VcmPayloadSinkFactory);
diff --git a/webrtc/modules/video_coding/main/test/video_rtp_play.cc b/webrtc/modules/video_coding/main/test/video_rtp_play.cc
index 5f8ea35..1cf27c7 100644
--- a/webrtc/modules/video_coding/main/test/video_rtp_play.cc
+++ b/webrtc/modules/video_coding/main/test/video_rtp_play.cc
@@ -50,9 +50,10 @@
webrtc::rtpplayer::VcmPayloadSinkFactory factory(output_file, &clock,
kConfigProtectionEnabled, kConfigProtectionMethod, kConfigRttMs,
kConfigRenderDelayMs, kConfigMinPlayoutDelayMs);
- webrtc::scoped_ptr<webrtc::rtpplayer::RtpPlayerInterface> rtp_player(
+ rtc::scoped_ptr<webrtc::rtpplayer::RtpPlayerInterface> rtp_player(
webrtc::rtpplayer::Create(args.inputFile, &factory, &clock, payload_types,
- kConfigLossRate, kConfigRttMs, kConfigReordering));
+ kConfigLossRate, kConfigRttMs,
+ kConfigReordering));
if (rtp_player.get() == NULL) {
return -1;
}
diff --git a/webrtc/modules/video_coding/main/test/video_rtp_play_mt.cc b/webrtc/modules/video_coding/main/test/video_rtp_play_mt.cc
index f334db5..41ae349 100644
--- a/webrtc/modules/video_coding/main/test/video_rtp_play_mt.cc
+++ b/webrtc/modules/video_coding/main/test/video_rtp_play_mt.cc
@@ -38,7 +38,7 @@
assert(obj);
RtpPlayerInterface* rtp_player = static_cast<RtpPlayerInterface*>(obj);
- webrtc::scoped_ptr<webrtc::EventWrapper> wait_event(
+ rtc::scoped_ptr<webrtc::EventWrapper> wait_event(
webrtc::EventWrapper::Create());
if (wait_event.get() == NULL) {
return false;
@@ -82,7 +82,7 @@
VcmPayloadSinkFactory factory(output_file, clock, kConfigProtectionEnabled,
kConfigProtectionMethod, kConfigRttMs, kConfigRenderDelayMs,
kConfigMinPlayoutDelayMs);
- webrtc::scoped_ptr<RtpPlayerInterface> rtp_player(webrtc::rtpplayer::Create(
+ rtc::scoped_ptr<RtpPlayerInterface> rtp_player(webrtc::rtpplayer::Create(
args.inputFile, &factory, clock, payload_types, kConfigLossRate,
kConfigRttMs, kConfigReordering));
if (rtp_player.get() == NULL) {
@@ -90,31 +90,33 @@
}
{
- webrtc::scoped_ptr<webrtc::ThreadWrapper> player_thread(
+ rtc::scoped_ptr<webrtc::ThreadWrapper> player_thread(
webrtc::ThreadWrapper::CreateThread(PlayerThread, rtp_player.get(),
- webrtc::kNormalPriority, "PlayerThread"));
+ webrtc::kNormalPriority,
+ "PlayerThread"));
if (player_thread.get() == NULL) {
printf("Unable to start RTP reader thread\n");
return -1;
}
- webrtc::scoped_ptr<webrtc::ThreadWrapper> processing_thread(
+ rtc::scoped_ptr<webrtc::ThreadWrapper> processing_thread(
webrtc::ThreadWrapper::CreateThread(ProcessingThread, &factory,
- webrtc::kNormalPriority, "ProcessingThread"));
+ webrtc::kNormalPriority,
+ "ProcessingThread"));
if (processing_thread.get() == NULL) {
printf("Unable to start processing thread\n");
return -1;
}
- webrtc::scoped_ptr<webrtc::ThreadWrapper> decode_thread(
- webrtc::ThreadWrapper::CreateThread(DecodeThread, &factory,
- webrtc::kNormalPriority, "DecodeThread"));
+ rtc::scoped_ptr<webrtc::ThreadWrapper> decode_thread(
+ webrtc::ThreadWrapper::CreateThread(
+ DecodeThread, &factory, webrtc::kNormalPriority, "DecodeThread"));
if (decode_thread.get() == NULL) {
printf("Unable to start decode thread\n");
return -1;
}
- webrtc::scoped_ptr<webrtc::EventWrapper> wait_event(
+ rtc::scoped_ptr<webrtc::EventWrapper> wait_event(
webrtc::EventWrapper::Create());
if (wait_event.get() == NULL) {
printf("Unable to create wait event\n");