Index: webrtc/video_engine/vie_encoder.h |
diff --git a/webrtc/video_engine/vie_encoder.h b/webrtc/video_engine/vie_encoder.h |
index 43bedb0d91c48b72afd4fc65800e7cce21083a3c..26dd810f9ac5b6e73b49b12dceccd8c23399fe8c 100644 |
--- a/webrtc/video_engine/vie_encoder.h |
+++ b/webrtc/video_engine/vie_encoder.h |
@@ -15,16 +15,16 @@ |
#include <vector> |
#include "webrtc/base/scoped_ptr.h" |
+#include "webrtc/base/scoped_ref_ptr.h" |
#include "webrtc/base/thread_annotations.h" |
#include "webrtc/common_types.h" |
+#include "webrtc/frame_callback.h" |
#include "webrtc/modules/bitrate_controller/include/bitrate_allocator.h" |
#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" |
#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" |
#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" |
#include "webrtc/modules/video_processing/main/interface/video_processing.h" |
#include "webrtc/typedefs.h" |
-#include "webrtc/frame_callback.h" |
-#include "webrtc/system_wrappers/interface/scoped_refptr.h" |
#include "webrtc/video_engine/vie_capturer.h" |
#include "webrtc/video_engine/vie_defines.h" |
@@ -89,7 +89,7 @@ class ViEEncoder |
// Ideally this would be done in Init, but the dependencies between ViEEncoder |
// and ViEChannel makes it really hard to do in a good way. |
void StartThreadsAndSetSharedMembers( |
- scoped_refptr<PayloadRouter> send_payload_router, |
+ rtc::scoped_refptr<PayloadRouter> send_payload_router, |
VCMProtectionCallback* vcm_protection_callback); |
// This function must be called before the corresponding ViEChannel is |
@@ -200,7 +200,7 @@ class ViEEncoder |
const rtc::scoped_ptr<VideoProcessingModule> vpm_; |
const rtc::scoped_ptr<QMVideoSettingsCallback> qm_callback_; |
const rtc::scoped_ptr<VideoCodingModule> vcm_; |
- scoped_refptr<PayloadRouter> send_payload_router_; |
+ rtc::scoped_refptr<PayloadRouter> send_payload_router_; |
rtc::scoped_ptr<CriticalSectionWrapper> callback_cs_; |
rtc::scoped_ptr<CriticalSectionWrapper> data_cs_; |